This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4380

revert: fix the inconsistency of status msgs in --interactive mode
ClosedPublic

Authored by khanchi97 on Aug 26 2018, 7:06 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGcb70501d8b71: revert: fix the inconsistency of status msgs in --interactive mode
Summary

Before this patch we were priting every action msg before actually
performing that action and that was resulting in inconsistencies;
like in --interactive session if user decided to not revert any
changes in a file foo, still there will be a msg on console saying
"reverting foo".

To fix this, I have made some changes to print status msg just
before the action it is going to perform, no matter if --interactive
or not.

Changes made in test-revert-interactive.t reflect the changed behavior.
There are also some changes in test-revert.t because of change in the
order of messages.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

khanchi97 created this revision.Aug 26 2018, 7:06 PM
yuja added a subscriber: yuja.Aug 28 2018, 9:00 AM
$ hg revert a

+ undeleting a

As you can see, there was no status message if "a" is an explicitly specified
file.

@@ -3021,7 +3021,8 @@

if ui.verbose or not exact:
    if not isinstance(msg, bytes):
        msg = msg(abs)
  • ui.status(msg % rel)

+ if opts.get('dry_run'):
+ ui.status(msg % rel)

Before a relative path was printed, but new code would probably use the
repository-absolute path.

Perhaps we can pass in the matcher m to _performrevert() to translate
abs path to relative, and to test if status message should be printed.

+ repo.ui.status(_("%s") % (actions['forget'][1] % f))

Nit: _("%s") is noop. Just print actions['forget'][1] % f.

@@ -3141,14 +3147,21 @@

    tobackup = set()
# Apply changes
fp = stringio()

+ # fnames keep track of filenames for which we have initiated changes,
+ # to make sure that we print status msg only once for a file.
+ fnames = []

Nit: perhaps set() is better here since we have to test the existence
many times.

FWIW, no idea why revert() has to be such complicated.

khanchi97 edited the summary of this revision. (Show Details)Aug 30 2018, 4:55 PM
khanchi97 updated this revision to Diff 10679.
khanchi97 added a comment.Aug 30 2018, 5:12 PM

Made changes. Ready to review.

In D4380#67537, @yuja wrote:
$ hg revert a

+ undeleting a

As you can see, there was no status message if "a" is an explicitly specified
file.

Oh yes, added exact conditional.

@@ -3021,7 +3021,8 @@

if ui.verbose or not exact:
    if not isinstance(msg, bytes):
        msg = msg(abs)
  • ui.status(msg % rel)

+ if opts.get('dry_run'):
+ ui.status(msg % rel)

Before a relative path was printed, but new code would probably use the
repository-absolute path.
Perhaps we can pass in the matcher m to _performrevert() to translate
abs path to relative, and to test if status message should be printed.

I passed the names dict as it already have the required information.

+ repo.ui.status(_("%s") % (actions['forget'][1] % f))

Nit: _("%s") is noop. Just print actions['forget'][1] % f.

@@ -3141,14 +3147,21 @@

    tobackup = set()
# Apply changes
fp = stringio()

+ # fnames keep track of filenames for which we have initiated changes,
+ # to make sure that we print status msg only once for a file.
+ fnames = []

Nit: perhaps set() is better here since we have to test the existence
many times.
FWIW, no idea why revert() has to be such complicated.

mercurial/cmdutil.py
3026

Does this conditional doing something useful because I don't see any change in the tests if I remove line 3023,3024?

yuja added a comment.Aug 31 2018, 7:53 AM

+ if ui.verbose or not exact:
+ if not isinstance(msg, bytes):
+ msg = msg(abs)

Does this conditional doing something useful because I don't see any change in the tests if I remove line 3023,3024?

Probably no. msg should never be a callable since 0d57bf80c7cb.

yuja added a comment.Aug 31 2018, 7:53 AM

@@ -3034,7 +3035,19 @@

prefetch(repo, [ctx.rev()],
         matchfiles(repo,
                    [f for sublist in oplist for f in sublist]))
  • _performrevert(repo, parents, ctx, actions, interactive, tobackup)

+ # give status messages for actions to be performed
+ acts = "add drop undelete forget remove revert".split()
+ if interactive:
+ # exclude ("forget", "remove", "revert") as status msg for these
+ # actions will be handled in interactive session.
+ acts = acts[:3]
+ for act in acts:
+ for f in actions[act][0]:
+ rel, exact = names[f]
+ if ui.verbose or not exact:
+ ui.status(actions[act][1] % rel)
+ _performrevert(repo, parents, ctx, names, actions, interactive,
+ tobackup)

Looks generally good, but I think the original patch was better in that
status message is printed just before the action, no matter if interactive
or not.

+ rel, exact = names[f]
+ if repo.ui.verbose or not exact:
+ repo.ui.status(actions['forget'][1] % rel)

This can be factored out to a closure function if you think it's too verbose
to copy around.

khanchi97 edited the summary of this revision. (Show Details)Sep 3 2018, 1:53 AM
khanchi97 updated this revision to Diff 10715.
khanchi97 added a comment.Sep 3 2018, 2:23 AM

Ready to review.

yuja added a comment.Sep 3 2018, 7:32 AM

Queued, thanks.

Closed by commit rHGcb70501d8b71: revert: fix the inconsistency of status msgs in --interactive mode (authored by khanchi97). · Explain WhySep 3 2018, 8:00 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (30 lines)
Mtests/test-revert-interactive.t (24 lines)
Mtests/test-revert.t (139 lines)

Diff 10578

mercurial/cmdutil.py

if not opts.get('dry_run'): if not opts.get('dry_run'):
if interactive: if interactive:
util.copyfile(target, bakname) util.copyfile(target, bakname)
else: else:
util.rename(target, bakname) util.rename(target, bakname)
if ui.verbose or not exact: if ui.verbose or not exact:
if not isinstance(msg, bytes): if not isinstance(msg, bytes):
msg = msg(abs) msg = msg(abs)
if opts.get('dry_run'):
ui.status(msg % rel) ui.status(msg % rel)
elif exact: elif exact:
khanchi97AuthorUnsubmitted
Not Done

Does this conditional doing something useful because I don't see any change in the tests if I remove line 3023,3024?

khanchi97: Does this conditional doing something useful because I don't see any change in the tests if I…
ui.warn(msg % rel) ui.warn(msg % rel)
break break
if not opts.get('dry_run'): if not opts.get('dry_run'):
needdata = ('revert', 'add', 'undelete') needdata = ('revert', 'add', 'undelete')
oplist = [actions[name][0] for name in needdata] oplist = [actions[name][0] for name in needdata]
prefetch = scmutil.prefetchfiles prefetch = scmutil.prefetchfiles
matchfiles = scmutil.matchfiles matchfiles = scmutil.matchfiles
repo.dirstate.remove(f) repo.dirstate.remove(f)
audit_path = pathutil.pathauditor(repo.root, cached=True) audit_path = pathutil.pathauditor(repo.root, cached=True)
for f in actions['forget'][0]: for f in actions['forget'][0]:
if interactive: if interactive:
choice = repo.ui.promptchoice( choice = repo.ui.promptchoice(
_("forget added file %s (Yn)?$$ &Yes $$ &No") % f) _("forget added file %s (Yn)?$$ &Yes $$ &No") % f)
if choice == 0: if choice == 0:
repo.ui.status(_("%s") % (actions['forget'][1] % f))
repo.dirstate.drop(f) repo.dirstate.drop(f)
else: else:
excluded_files.append(f) excluded_files.append(f)
else: else:
repo.ui.status(_("%s") % (actions['forget'][1] % f))
repo.dirstate.drop(f) repo.dirstate.drop(f)
for f in actions['remove'][0]: for f in actions['remove'][0]:
audit_path(f) audit_path(f)
if interactive: if interactive:
choice = repo.ui.promptchoice( choice = repo.ui.promptchoice(
_("remove added file %s (Yn)?$$ &Yes $$ &No") % f) _("remove added file %s (Yn)?$$ &Yes $$ &No") % f)
if choice == 0: if choice == 0:
repo.ui.status(_("%s") % (actions['remove'][1] % f))
doremove(f) doremove(f)
else: else:
excluded_files.append(f) excluded_files.append(f)
else: else:
repo.ui.status(_("%s") % (actions['remove'][1] % f))
doremove(f) doremove(f)
for f in actions['drop'][0]: for f in actions['drop'][0]:
audit_path(f) audit_path(f)
repo.ui.status(_("%s") % (actions['drop'][1] % f))
repo.dirstate.remove(f) repo.dirstate.remove(f)
normal = None normal = None
if node == parent: if node == parent:
# We're reverting to our parent. If possible, we'd like status # We're reverting to our parent. If possible, we'd like status
# to report the file as clean. We have to use normallookup for # to report the file as clean. We have to use normallookup for
# merges to avoid losing information about merged/dirty files. # merges to avoid losing information about merged/dirty files.
if p2 != nullid: if p2 != nullid:
except error.PatchError as err: except error.PatchError as err:
raise error.Abort(_('error parsing patch: %s') % err) raise error.Abort(_('error parsing patch: %s') % err)
newlyaddedandmodifiedfiles = newandmodified(chunks, originalchunks) newlyaddedandmodifiedfiles = newandmodified(chunks, originalchunks)
if tobackup is None: if tobackup is None:
tobackup = set() tobackup = set()
# Apply changes # Apply changes
fp = stringio() fp = stringio()
# `fnames` keep track of filenames for which we have initiated changes,
# to make sure that we print status msg only once for a file.
fnames = []
for c in chunks: for c in chunks:
# Create a backup file only if this hunk should be backed up if ishunk(c):
if ishunk(c) and c.header.filename() in tobackup:
abs = c.header.filename() abs = c.header.filename()
if abs not in fnames:
fnames.append(abs)
repo.ui.status(_("%s") % (actions['revert'][1] % abs))
# Create a backup file only if this hunk should be backed up
if c.header.filename() in tobackup:
target = repo.wjoin(abs) target = repo.wjoin(abs)
bakname = scmutil.origpath(repo.ui, repo, m.rel(abs)) bakname = scmutil.origpath(repo.ui, repo, m.rel(abs))
util.copyfile(target, bakname) util.copyfile(target, bakname)
tobackup.remove(abs) tobackup.remove(abs)
c.write(fp) c.write(fp)
dopatch = fp.tell() dopatch = fp.tell()
fp.seek(0) fp.seek(0)
if dopatch: if dopatch:
try: try:
patch.internalpatch(repo.ui, repo, fp, 1, eolmode=None) patch.internalpatch(repo.ui, repo, fp, 1, eolmode=None)
except error.PatchError as err: except error.PatchError as err:
raise error.Abort(pycompat.bytestr(err)) raise error.Abort(pycompat.bytestr(err))
del fp del fp
else: else:
for f in actions['revert'][0]: for f in actions['revert'][0]:
repo.ui.status(_("%s") % (actions['revert'][1] % f))
checkout(f) checkout(f)
if normal: if normal:
normal(f) normal(f)
for f in actions['add'][0]: for f in actions['add'][0]:
# Don't checkout modified files, they are already created by the diff # Don't checkout modified files, they are already created by the diff
if f not in newlyaddedandmodifiedfiles: if f not in newlyaddedandmodifiedfiles:
checkout(f) checkout(f)
repo.ui.status(_("%s") % (actions['add'][1] % f))
repo.dirstate.add(f) repo.dirstate.add(f)
normal = repo.dirstate.normallookup normal = repo.dirstate.normallookup
if node == parent and p2 == nullid: if node == parent and p2 == nullid:
normal = repo.dirstate.normal normal = repo.dirstate.normal
for f in actions['undelete'][0]: for f in actions['undelete'][0]:
checkout(f) checkout(f)
repo.ui.status(_("%s") % (actions['undelete'][1] % f))
normal(f) normal(f)
copied = copies.pathcopies(repo[parent], ctx) copied = copies.pathcopies(repo[parent], ctx)
for f in actions['add'][0] + actions['undelete'][0] + actions['revert'][0]: for f in actions['add'][0] + actions['undelete'][0] + actions['revert'][0]:
if f in copied: if f in copied:
repo.dirstate.copy(copied[f], f) repo.dirstate.copy(copied[f], f)

tests/test-revert-interactive.t

> y > y
> y > y
> y > y
> ? > ?
> y > y
> n > n
> n > n
> EOF > EOF
reverting f
reverting folder1/g
removing folder1/i
reverting folder2/h
remove added file folder1/i (Yn)? y remove added file folder1/i (Yn)? y
removing folder1/i
diff --git a/f b/f diff --git a/f b/f
2 hunks, 2 lines changed 2 hunks, 2 lines changed
examine changes to 'f'? [Ynesfdaq?] y examine changes to 'f'? [Ynesfdaq?] y
@@ -1,6 +1,5 @@ @@ -1,6 +1,5 @@
-a -a
1 1
2 2
5 5
-d -d
apply change 4/6 to 'folder1/g'? [Ynesfdaq?] n apply change 4/6 to 'folder1/g'? [Ynesfdaq?] n
diff --git a/folder2/h b/folder2/h diff --git a/folder2/h b/folder2/h
2 hunks, 2 lines changed 2 hunks, 2 lines changed
examine changes to 'folder2/h'? [Ynesfdaq?] n examine changes to 'folder2/h'? [Ynesfdaq?] n
reverting folder1/g
reverting f
$ cat f $ cat f
1 1
2 2
3 3
4 4
5 5
$ cat folder1/g $ cat folder1/g
1 1
3 3
4 4
5 5
f f
Test that --interactive lift the need for --all Test that --interactive lift the need for --all
$ echo q | hg revert -i -r 2 $ echo q | hg revert -i -r 2
reverting folder1/g
reverting folder2/h
diff --git a/folder1/g b/folder1/g diff --git a/folder1/g b/folder1/g
1 hunks, 1 lines changed 1 hunks, 1 lines changed
examine changes to 'folder1/g'? [Ynesfdaq?] q examine changes to 'folder1/g'? [Ynesfdaq?] q
abort: user quit abort: user quit
[255] [255]
$ ls folder1/ $ ls folder1/
g g
@@ -3,4 +3,3 @@ @@ -3,4 +3,3 @@
3 3
4 4
5 5
-d -d
apply this change to 'folder1/g'? [Ynesfdaq?] y apply this change to 'folder1/g'? [Ynesfdaq?] y
reverting folder1/g
$ ls folder1/ $ ls folder1/
g g
>>> open('folder1/g', 'wb').write(b"1\n2\n3\n4\n5\nd\n") and None >>> open('folder1/g', 'wb').write(b"1\n2\n3\n4\n5\nd\n") and None
$ hg update -C 6 $ hg update -C 6
3 files updated, 0 files merged, 0 files removed, 0 files unresolved 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg revert -i -r 2 --all -- << EOF $ hg revert -i -r 2 --all -- << EOF
> n > n
> y > y
> y > y
> y > y
> y > y
> y > y
> n > n
> n > n
> EOF > EOF
reverting f
reverting folder1/g
removing folder1/i
reverting folder2/h
remove added file folder1/i (Yn)? n remove added file folder1/i (Yn)? n
diff --git a/f b/f diff --git a/f b/f
2 hunks, 2 lines changed 2 hunks, 2 lines changed
examine changes to 'f'? [Ynesfdaq?] y examine changes to 'f'? [Ynesfdaq?] y
@@ -1,6 +1,5 @@ @@ -1,6 +1,5 @@
-a -a
1 1
5 5
-d -d
apply change 4/6 to 'folder1/g'? [Ynesfdaq?] n apply change 4/6 to 'folder1/g'? [Ynesfdaq?] n
diff --git a/folder2/h b/folder2/h diff --git a/folder2/h b/folder2/h
2 hunks, 2 lines changed 2 hunks, 2 lines changed
examine changes to 'folder2/h'? [Ynesfdaq?] n examine changes to 'folder2/h'? [Ynesfdaq?] n
reverting folder1/g
reverting f
$ cat f $ cat f
1 1
2 2
3 3
4 4
5 5
$ cat folder1/g $ cat folder1/g
1 1
1 1
2 2
3 3
4 4
5 5
-b -b
discard change 2/2 to 'f'? [Ynesfdaq?] n discard change 2/2 to 'f'? [Ynesfdaq?] n
reverting f
$ hg st $ hg st
M f M f
M folder1/g M folder1/g
? f.orig ? f.orig
$ cat f $ cat f
a a
1 1
2 2
$ hg commit -m "add k" $ hg commit -m "add k"
3) Use interactive revert with editing (replacing +1 with +42): 3) Use interactive revert with editing (replacing +1 with +42):
$ printf "0\n2\n" > k $ printf "0\n2\n" > k
$ HGEDITOR="\"sh\" \"${TESTTMP}/editor.sh\"" hg revert -i <<EOF $ HGEDITOR="\"sh\" \"${TESTTMP}/editor.sh\"" hg revert -i <<EOF
> y > y
> e > e
> EOF > EOF
reverting k
diff --git a/k b/k diff --git a/k b/k
1 hunks, 2 lines changed 1 hunks, 2 lines changed
examine changes to 'k'? [Ynesfdaq?] y examine changes to 'k'? [Ynesfdaq?] y
@@ -1,1 +1,2 @@ @@ -1,1 +1,2 @@
-1 -1
+0 +0
+2 +2
discard this change to 'k'? [Ynesfdaq?] e discard this change to 'k'? [Ynesfdaq?] e
reverting k
$ cat k $ cat k
42 42
$ hg update -C . $ hg update -C .
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 purge $ hg purge
$ touch newfile $ touch newfile
$ hg add newfile $ hg add newfile
$ hg status $ hg status
A newfile A newfile
$ hg revert -i <<EOF $ hg revert -i <<EOF
> n > n
> EOF > EOF
forgetting newfile
forget added file newfile (Yn)? n forget added file newfile (Yn)? n
$ hg status $ hg status
A newfile A newfile
$ hg revert -i <<EOF $ hg revert -i <<EOF
> y > y
> EOF > EOF
forgetting newfile
forget added file newfile (Yn)? y forget added file newfile (Yn)? y
forgetting newfile
$ hg status $ hg status
? newfile ? newfile
When a line without EOL is selected during "revert -i" (issue5651) When a line without EOL is selected during "revert -i" (issue5651)
$ hg init $TESTTMP/revert-i-eol $ hg init $TESTTMP/revert-i-eol
$ cd $TESTTMP/revert-i-eol $ cd $TESTTMP/revert-i-eol
$ echo 0 > a $ echo 0 > a
$ hg ci -qAm 0 $ hg ci -qAm 0
$ printf 1 >> a $ printf 1 >> a
$ hg ci -qAm 1 $ hg ci -qAm 1
$ cat a $ cat a
0 0
1 (no-eol) 1 (no-eol)
$ hg revert -ir'.^' <<EOF $ hg revert -ir'.^' <<EOF
> y > y
> y > y
> EOF > EOF
reverting a
diff --git a/a b/a diff --git a/a b/a
1 hunks, 1 lines changed 1 hunks, 1 lines changed
examine changes to 'a'? [Ynesfdaq?] y examine changes to 'a'? [Ynesfdaq?] y
@@ -1,2 +1,1 @@ @@ -1,2 +1,1 @@
0 0
-1 -1
\ No newline at end of file \ No newline at end of file
apply this change to 'a'? [Ynesfdaq?] y apply this change to 'a'? [Ynesfdaq?] y
reverting a
$ cat a $ cat a
0 0
When specified pattern does not exist, we should exit early (issue5789). When specified pattern does not exist, we should exit early (issue5789).
$ hg files $ hg files
a a
$ hg rev b $ hg rev b
b: no such file in rev b40d1912accf b: no such file in rev b40d1912accf
$ hg rev -i b $ hg rev -i b
b: no such file in rev b40d1912accf b: no such file in rev b40d1912accf
$ cd .. $ cd ..

tests/test-revert.t

$ hg status $ hg status
M c M c
A b A b
R a R a
revert removal of a file revert removal of a file
$ hg revert a $ hg revert a
undeleting a
$ hg status $ hg status
M c M c
A b A b
revert addition of a file revert addition of a file
$ hg revert b $ hg revert b
forgetting b
$ hg status $ hg status
M c M c
? b ? b
revert modification of a file (--no-backup) revert modification of a file (--no-backup)
$ hg revert --no-backup c $ hg revert --no-backup c
reverting c
$ hg status $ hg status
? b ? b
revert deletion (! status) of a added file revert deletion (! status) of a added file
------------------------------------------ ------------------------------------------
$ hg add b $ hg add b
$ hg st $ hg st
A z A z
? e.orig ? e.orig
revert to another revision (--rev) revert to another revision (--rev)
---------------------------------- ----------------------------------
$ hg revert --all -r0 $ hg revert --all -r0
adding a
removing d
forgetting z forgetting z
removing d
adding a
revert explicitly to parent (--rev) revert explicitly to parent (--rev)
----------------------------------- -----------------------------------
$ hg revert --all -rtip $ hg revert --all -rtip
forgetting a forgetting a
undeleting d undeleting d
$ rm a *.orig $ rm a *.orig
revert to another revision (--rev) and exact match revert to another revision (--rev) and exact match
-------------------------------------------------- --------------------------------------------------
exact match are more silent exact match are more silent
$ hg revert -r0 a $ hg revert -r0 a
adding a
$ hg st a $ hg st a
A a A a
$ hg rm d $ hg rm d
$ hg st d $ hg st d
R d R d
should keep d removed should keep d removed
> # emulate invoking dirstate.write() via repo.status() > # emulate invoking dirstate.write() via repo.status()
> # at 2000-01-01 00:00 > # at 2000-01-01 00:00
> fakenow = 200001010000 > fakenow = 200001010000
> >
> [extensions] > [extensions]
> fakedirstatewritetime = $TESTDIR/fakedirstatewritetime.py > fakedirstatewritetime = $TESTDIR/fakedirstatewritetime.py
> EOF > EOF
$ hg revert -r 0 e $ hg revert -r 0 e
reverting e
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [extensions] > [extensions]
> fakedirstatewritetime = ! > fakedirstatewritetime = !
> EOF > EOF
$ cat e $ cat e
123 123
$ touch -t 200001010000 e $ touch -t 200001010000 e
$ hg ci -A -m b $ hg ci -A -m b
adding b/b adding b/b
created new head created new head
$ echo foobar > b/b $ echo foobar > b/b
$ mkdir newdir $ mkdir newdir
$ echo foo > newdir/newfile $ echo foo > newdir/newfile
$ hg add newdir/newfile $ hg add newdir/newfile
$ hg revert b newdir $ hg revert b newdir
reverting b/b
forgetting newdir/newfile forgetting newdir/newfile
reverting b/b
$ echo foobar > b/b $ echo foobar > b/b
$ hg revert . $ hg revert .
reverting b/b reverting b/b
reverting a rename target should revert the source reverting a rename target should revert the source
-------------------------------------------------- --------------------------------------------------
$ hg mv a newa $ hg mv a newa
$ hg revert newa $ hg revert newa
forgetting newa
undeleting a
$ hg st a newa $ hg st a newa
? newa ? newa
Also true for move overwriting an existing file Also true for move overwriting an existing file
$ hg mv --force a b/b $ hg mv --force a b/b
$ hg revert b/b $ hg revert b/b
reverting b/b
undeleting a
$ hg status a b/b $ hg status a b/b
$ cd .. $ cd ..
$ hg init ignored $ hg init ignored
$ cd ignored $ cd ignored
$ echo '^ignored$' > .hgignore $ echo '^ignored$' > .hgignore
$ echo '^ignoreddir$' >> .hgignore $ echo '^ignoreddir$' >> .hgignore
$ hg up -qC $ hg up -qC
$ echo >> ignored $ echo >> ignored
$ hg rm removed $ hg rm removed
should silently revert the named files should silently revert the named files
-------------------------------------- --------------------------------------
$ hg revert --no-backup ignored removed $ hg revert --no-backup ignored removed
reverting ignored
undeleting removed
$ hg st -mardi $ hg st -mardi
Reverting copy (issue3920) Reverting copy (issue3920)
-------------------------- --------------------------
someone set up us the copies someone set up us the copies
$ rm .hgignore $ rm .hgignore
$ hg update -C $ hg update -C
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg mv ignored allyour $ hg mv ignored allyour
$ hg copy removed base $ hg copy removed base
$ hg commit -m rename $ hg commit -m rename
copies and renames, you have no chance to survive make your time (issue3920) copies and renames, you have no chance to survive make your time (issue3920)
$ hg update '.^' $ hg update '.^'
1 files updated, 0 files merged, 2 files removed, 0 files unresolved 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ hg revert -rtip -a $ hg revert -rtip -a
removing ignored
adding allyour adding allyour
adding base adding base
removing ignored
$ hg status -C $ hg status -C
A allyour A allyour
ignored ignored
A base A base
removed removed
R ignored R ignored
Test revert of a file added by one side of the merge Test revert of a file added by one side of the merge
(setup from reference repo) (setup from reference repo)
$ cp -R revert-ref revert-parent-all $ cp -R revert-ref revert-parent-all
$ cd revert-parent-all $ cd revert-parent-all
check revert output check revert output
$ hg revert --all $ hg revert --all
undeleting content1_content1_content1-untracked forgetting content1_missing_content1-tracked
forgetting content1_missing_content3-tracked
forgetting content1_missing_missing-tracked
forgetting missing_missing_content3-tracked
forgetting missing_missing_missing-tracked
reverting content1_content1_content3-tracked reverting content1_content1_content3-tracked
undeleting content1_content1_content3-untracked
reverting content1_content1_missing-tracked reverting content1_content1_missing-tracked
undeleting content1_content1_missing-untracked
reverting content1_content2_content1-tracked reverting content1_content2_content1-tracked
reverting content1_content2_content3-tracked
reverting content1_content2_missing-tracked
reverting missing_content2_content3-tracked
reverting missing_content2_missing-tracked
undeleting content1_content1_content1-untracked
undeleting content1_content1_content3-untracked
undeleting content1_content1_missing-untracked
undeleting content1_content2_content1-untracked undeleting content1_content2_content1-untracked
undeleting content1_content2_content2-untracked undeleting content1_content2_content2-untracked
reverting content1_content2_content3-tracked
undeleting content1_content2_content3-untracked undeleting content1_content2_content3-untracked
reverting content1_content2_missing-tracked
undeleting content1_content2_missing-untracked undeleting content1_content2_missing-untracked
forgetting content1_missing_content1-tracked
forgetting content1_missing_content3-tracked
forgetting content1_missing_missing-tracked
undeleting missing_content2_content2-untracked undeleting missing_content2_content2-untracked
reverting missing_content2_content3-tracked
undeleting missing_content2_content3-untracked undeleting missing_content2_content3-untracked
reverting missing_content2_missing-tracked
undeleting missing_content2_missing-untracked undeleting missing_content2_missing-untracked
forgetting missing_missing_content3-tracked
forgetting missing_missing_missing-tracked
Compare resulting directory with revert target. Compare resulting directory with revert target.
The diff is filtered to include change only. The only difference should be The diff is filtered to include change only. The only difference should be
additional `.orig` backup file when applicable. additional `.orig` backup file when applicable.
$ $PYTHON ../dircontent.py > ../content-parent-all.txt $ $PYTHON ../dircontent.py > ../content-parent-all.txt
$ cd .. $ cd ..
(setup from reference repo) (setup from reference repo)
$ cp -R revert-ref revert-base-all $ cp -R revert-ref revert-base-all
$ cd revert-base-all $ cd revert-base-all
check revert output check revert output
$ hg revert --all --rev 'desc(base)' $ hg revert --all --rev 'desc(base)'
undeleting content1_content1_content1-untracked forgetting missing_missing_content3-tracked
forgetting missing_missing_missing-tracked
removing missing_content2_content2-tracked
removing missing_content2_content3-tracked
removing missing_content2_missing-tracked
reverting content1_content1_content3-tracked reverting content1_content1_content3-tracked
undeleting content1_content1_content3-untracked
reverting content1_content1_missing-tracked reverting content1_content1_missing-tracked
undeleting content1_content1_missing-untracked
undeleting content1_content2_content1-untracked
reverting content1_content2_content2-tracked reverting content1_content2_content2-tracked
undeleting content1_content2_content2-untracked
reverting content1_content2_content3-tracked reverting content1_content2_content3-tracked
undeleting content1_content2_content3-untracked
reverting content1_content2_missing-tracked reverting content1_content2_missing-tracked
undeleting content1_content2_missing-untracked
adding content1_missing_content1-untracked
reverting content1_missing_content3-tracked reverting content1_missing_content3-tracked
adding content1_missing_content3-untracked
reverting content1_missing_missing-tracked reverting content1_missing_missing-tracked
adding content1_missing_content1-untracked
adding content1_missing_content3-untracked
adding content1_missing_missing-untracked adding content1_missing_missing-untracked
removing missing_content2_content2-tracked undeleting content1_content1_content1-untracked
removing missing_content2_content3-tracked undeleting content1_content1_content3-untracked
removing missing_content2_missing-tracked undeleting content1_content1_missing-untracked
forgetting missing_missing_content3-tracked undeleting content1_content2_content1-untracked
forgetting missing_missing_missing-tracked undeleting content1_content2_content2-untracked
undeleting content1_content2_content3-untracked
undeleting content1_content2_missing-untracked
Compare resulting directory with revert target. Compare resulting directory with revert target.
The diff is filtered to include change only. The only difference should be The diff is filtered to include change only. The only difference should be
additional `.orig` backup file when applicable. additional `.orig` backup file when applicable.
$ $PYTHON ../dircontent.py > ../content-base-all.txt $ $PYTHON ../dircontent.py > ../content-base-all.txt
$ cd .. $ cd ..
> echo '### revert for:' $file; > echo '### revert for:' $file;
> hg revert $file; > hg revert $file;
> echo > echo
> done > done
### revert for: content1_content1_content1-tracked ### revert for: content1_content1_content1-tracked
no changes needed to content1_content1_content1-tracked no changes needed to content1_content1_content1-tracked
### revert for: content1_content1_content1-untracked ### revert for: content1_content1_content1-untracked
undeleting content1_content1_content1-untracked
### revert for: content1_content1_content3-tracked ### revert for: content1_content1_content3-tracked
reverting content1_content1_content3-tracked
### revert for: content1_content1_content3-untracked ### revert for: content1_content1_content3-untracked
undeleting content1_content1_content3-untracked
### revert for: content1_content1_missing-tracked ### revert for: content1_content1_missing-tracked
reverting content1_content1_missing-tracked
### revert for: content1_content1_missing-untracked ### revert for: content1_content1_missing-untracked
undeleting content1_content1_missing-untracked
### revert for: content1_content2_content1-tracked ### revert for: content1_content2_content1-tracked
reverting content1_content2_content1-tracked
### revert for: content1_content2_content1-untracked ### revert for: content1_content2_content1-untracked
undeleting content1_content2_content1-untracked
### revert for: content1_content2_content2-tracked ### revert for: content1_content2_content2-tracked
no changes needed to content1_content2_content2-tracked no changes needed to content1_content2_content2-tracked
### revert for: content1_content2_content2-untracked ### revert for: content1_content2_content2-untracked
undeleting content1_content2_content2-untracked
### revert for: content1_content2_content3-tracked ### revert for: content1_content2_content3-tracked
reverting content1_content2_content3-tracked
### revert for: content1_content2_content3-untracked ### revert for: content1_content2_content3-untracked
undeleting content1_content2_content3-untracked
### revert for: content1_content2_missing-tracked ### revert for: content1_content2_missing-tracked
reverting content1_content2_missing-tracked
### revert for: content1_content2_missing-untracked ### revert for: content1_content2_missing-untracked
undeleting content1_content2_missing-untracked
### revert for: content1_missing_content1-tracked ### revert for: content1_missing_content1-tracked
forgetting content1_missing_content1-tracked
### revert for: content1_missing_content1-untracked ### revert for: content1_missing_content1-untracked
file not managed: content1_missing_content1-untracked file not managed: content1_missing_content1-untracked
### revert for: content1_missing_content3-tracked ### revert for: content1_missing_content3-tracked
forgetting content1_missing_content3-tracked
### revert for: content1_missing_content3-untracked ### revert for: content1_missing_content3-untracked
file not managed: content1_missing_content3-untracked file not managed: content1_missing_content3-untracked
### revert for: content1_missing_missing-tracked ### revert for: content1_missing_missing-tracked
forgetting content1_missing_missing-tracked
### revert for: content1_missing_missing-untracked ### revert for: content1_missing_missing-untracked
content1_missing_missing-untracked: no such file in rev * (glob) content1_missing_missing-untracked: no such file in rev * (glob)
### revert for: missing_content2_content2-tracked ### revert for: missing_content2_content2-tracked
no changes needed to missing_content2_content2-tracked no changes needed to missing_content2_content2-tracked
### revert for: missing_content2_content2-untracked ### revert for: missing_content2_content2-untracked
undeleting missing_content2_content2-untracked
### revert for: missing_content2_content3-tracked ### revert for: missing_content2_content3-tracked
reverting missing_content2_content3-tracked
### revert for: missing_content2_content3-untracked ### revert for: missing_content2_content3-untracked
undeleting missing_content2_content3-untracked
### revert for: missing_content2_missing-tracked ### revert for: missing_content2_missing-tracked
reverting missing_content2_missing-tracked
### revert for: missing_content2_missing-untracked ### revert for: missing_content2_missing-untracked
undeleting missing_content2_missing-untracked
### revert for: missing_missing_content3-tracked ### revert for: missing_missing_content3-tracked
forgetting missing_missing_content3-tracked
### revert for: missing_missing_content3-untracked ### revert for: missing_missing_content3-untracked
file not managed: missing_missing_content3-untracked file not managed: missing_missing_content3-untracked
### revert for: missing_missing_missing-tracked ### revert for: missing_missing_missing-tracked
forgetting missing_missing_missing-tracked
### revert for: missing_missing_missing-untracked ### revert for: missing_missing_missing-untracked
missing_missing_missing-untracked: no such file in rev * (glob) missing_missing_missing-untracked: no such file in rev * (glob)
check resulting directory against the --all run check resulting directory against the --all run
(There should be no difference) (There should be no difference)
> echo '### revert for:' $file; > echo '### revert for:' $file;
> hg revert $file --rev 'desc(base)'; > hg revert $file --rev 'desc(base)';
> echo > echo
> done > done
### revert for: content1_content1_content1-tracked ### revert for: content1_content1_content1-tracked
no changes needed to content1_content1_content1-tracked no changes needed to content1_content1_content1-tracked
### revert for: content1_content1_content1-untracked ### revert for: content1_content1_content1-untracked
undeleting content1_content1_content1-untracked
### revert for: content1_content1_content3-tracked ### revert for: content1_content1_content3-tracked
reverting content1_content1_content3-tracked
### revert for: content1_content1_content3-untracked ### revert for: content1_content1_content3-untracked
undeleting content1_content1_content3-untracked
### revert for: content1_content1_missing-tracked ### revert for: content1_content1_missing-tracked
reverting content1_content1_missing-tracked
### revert for: content1_content1_missing-untracked ### revert for: content1_content1_missing-untracked
undeleting content1_content1_missing-untracked
### revert for: content1_content2_content1-tracked ### revert for: content1_content2_content1-tracked
no changes needed to content1_content2_content1-tracked no changes needed to content1_content2_content1-tracked
### revert for: content1_content2_content1-untracked ### revert for: content1_content2_content1-untracked
undeleting content1_content2_content1-untracked
### revert for: content1_content2_content2-tracked ### revert for: content1_content2_content2-tracked
reverting content1_content2_content2-tracked
### revert for: content1_content2_content2-untracked ### revert for: content1_content2_content2-untracked
undeleting content1_content2_content2-untracked
### revert for: content1_content2_content3-tracked ### revert for: content1_content2_content3-tracked
reverting content1_content2_content3-tracked
### revert for: content1_content2_content3-untracked ### revert for: content1_content2_content3-untracked
undeleting content1_content2_content3-untracked
### revert for: content1_content2_missing-tracked ### revert for: content1_content2_missing-tracked
reverting content1_content2_missing-tracked
### revert for: content1_content2_missing-untracked ### revert for: content1_content2_missing-untracked
undeleting content1_content2_missing-untracked
### revert for: content1_missing_content1-tracked ### revert for: content1_missing_content1-tracked
no changes needed to content1_missing_content1-tracked no changes needed to content1_missing_content1-tracked
### revert for: content1_missing_content1-untracked ### revert for: content1_missing_content1-untracked
adding content1_missing_content1-untracked
### revert for: content1_missing_content3-tracked ### revert for: content1_missing_content3-tracked
reverting content1_missing_content3-tracked
### revert for: content1_missing_content3-untracked ### revert for: content1_missing_content3-untracked
adding content1_missing_content3-untracked
### revert for: content1_missing_missing-tracked ### revert for: content1_missing_missing-tracked
reverting content1_missing_missing-tracked
### revert for: content1_missing_missing-untracked ### revert for: content1_missing_missing-untracked
adding content1_missing_missing-untracked
### revert for: missing_content2_content2-tracked ### revert for: missing_content2_content2-tracked
removing missing_content2_content2-tracked
### revert for: missing_content2_content2-untracked ### revert for: missing_content2_content2-untracked
no changes needed to missing_content2_content2-untracked no changes needed to missing_content2_content2-untracked
### revert for: missing_content2_content3-tracked ### revert for: missing_content2_content3-tracked
removing missing_content2_content3-tracked
### revert for: missing_content2_content3-untracked ### revert for: missing_content2_content3-untracked
no changes needed to missing_content2_content3-untracked no changes needed to missing_content2_content3-untracked
### revert for: missing_content2_missing-tracked ### revert for: missing_content2_missing-tracked
removing missing_content2_missing-tracked
### revert for: missing_content2_missing-untracked ### revert for: missing_content2_missing-untracked
no changes needed to missing_content2_missing-untracked no changes needed to missing_content2_missing-untracked
### revert for: missing_missing_content3-tracked ### revert for: missing_missing_content3-tracked
forgetting missing_missing_content3-tracked
### revert for: missing_missing_content3-untracked ### revert for: missing_missing_content3-untracked
file not managed: missing_missing_content3-untracked file not managed: missing_missing_content3-untracked
### revert for: missing_missing_missing-tracked ### revert for: missing_missing_missing-tracked
forgetting missing_missing_missing-tracked
### revert for: missing_missing_missing-untracked ### revert for: missing_missing_missing-untracked
missing_missing_missing-untracked: no such file in rev * (glob) missing_missing_missing-untracked: no such file in rev * (glob)
check resulting directory against the --all run check resulting directory against the --all run
(There should be no difference) (There should be no difference)
$ hg status --rev 'p1()' $ hg status --rev 'p1()'
M A M A
$ hg status --rev 'p2()' $ hg status --rev 'p2()'
A B A B
$ hg status --rev '1' $ hg status --rev '1'
M A M A
A B A B
$ hg revert --rev 1 --all $ hg revert --rev 1 --all
reverting A
removing B removing B
reverting A
$ hg status --rev 1 $ hg status --rev 1
From the other parents From the other parents
$ hg up -C 'p2()' $ hg up -C 'p2()'
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 merge $ hg merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg status --rev 'p1()' $ hg status --rev 'p1()'
M B M B
$ hg status --rev 'p2()' $ hg status --rev 'p2()'
A A A A
$ hg status --rev '1' $ hg status --rev '1'
M A M A
A B A B
$ hg revert --rev 1 --all $ hg revert --rev 1 --all
reverting A
removing B removing B
reverting A
$ hg status --rev 1 $ hg status --rev 1
$ cd .. $ cd ..