This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1763

revert: support reverting to hidden cset if directaccess config is set
ClosedPublic

Authored by pulkit on Dec 26 2017, 2:16 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG31fe397f2bda: revert: support reverting to hidden cset if directaccess config is set
Summary

This patch adds support for reverting files to a hidden changeset if
experimental.directacess=True is set.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Dec 26 2017, 2:16 PM
yuja accepted this revision.Dec 27 2017, 7:20 AM
This revision is now accepted and ready to land.Dec 27 2017, 7:20 AM
Closed by commit rHG31fe397f2bda: revert: support reverting to hidden cset if directaccess config is set (authored by pulkit). · Explain WhyJan 4 2018, 4:06 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (5 lines)
Mtests/test-directaccess.t (13 lines)

Diff 4686

mercurial/commands.py

opts["rev"] = cmdutil.finddate(ui, repo, opts["date"]) opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
parent, p2 = repo.dirstate.parents() parent, p2 = repo.dirstate.parents()
if not opts.get('rev') and p2 != nullid: if not opts.get('rev') and p2 != nullid:
# revert after merge is a trap for new users (issue2915) # revert after merge is a trap for new users (issue2915)
raise error.Abort(_('uncommitted merge with no revision specified'), raise error.Abort(_('uncommitted merge with no revision specified'),
hint=_("use 'hg update' or see 'hg help revert'")) hint=_("use 'hg update' or see 'hg help revert'"))
ctx = scmutil.revsingle(repo, opts.get('rev')) rev = opts.get('rev')
if rev:
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
ctx = scmutil.revsingle(repo, rev)
if (not (pats or opts.get('include') or opts.get('exclude') or if (not (pats or opts.get('include') or opts.get('exclude') or
opts.get('all') or opts.get('interactive'))): opts.get('all') or opts.get('interactive'))):
msg = _("no files or directories specified") msg = _("no files or directories specified")
if p2 != nullid: if p2 != nullid:
hint = _("uncommitted merge, use --all to discard all changes," hint = _("uncommitted merge, use --all to discard all changes,"
" or 'hg update -C .' to abort the merge") " or 'hg update -C .' to abort the merge")
raise error.Abort(msg, hint=hint) raise error.Abort(msg, hint=hint)

tests/test-directaccess.t

$ hg up 28ad74 $ hg up 28ad74
updating to a hidden changeset 28ad74487de9 updating to a hidden changeset 28ad74487de9
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg up 3 $ hg up 3
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
`hg revert`
$ hg revert -r 28ad74 --all
reverting c
$ hg diff
diff -r 2443a0e66469 c
--- a/c Thu Jan 01 00:00:00 1970 +0000
+++ b/c Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +1,1 @@
foo
-bar
Commands with undefined cmdtype should not work right now Commands with undefined cmdtype should not work right now
$ hg phase -r 28ad74 $ hg phase -r 28ad74
abort: hidden revision '28ad74'! abort: hidden revision '28ad74'!
(use --hidden to access hidden revisions) (use --hidden to access hidden revisions)
[255] [255]
$ hg phase -r 2 $ hg phase -r 2
abort: hidden revision '2'! abort: hidden revision '2'!
(use --hidden to access hidden revisions) (use --hidden to access hidden revisions)
[255] [255]