--- a/mercurial/localrepo.py Mon Apr 12 17:11:14 2010 -0700
+++ b/mercurial/localrepo.py Mon Apr 12 17:21:30 2010 -0700
@@ -609,11 +609,12 @@
try:
args = self.opener("undo.desc", "r").read().splitlines()
if len(args) >= 3 and self.ui.verbose:
- desc = _("rolling back %s (%s) to revision %s\n") % (
- args[1], args[2], args[0])
+ desc = _("rolling back to revision %s"
+ " (undo %s: %s)\n") % (
+ args[0], args[1], args[2])
elif len(args) >= 2:
- desc = _("rolling back %s to revision %s\n") % (
- args[1], args[0])
+ desc = _("rolling back to revision %s (undo %s)\n") % (
+ args[0], args[1])
except IOError:
desc = _("rolling back unknown transaction\n")
self.ui.status(desc)
--- a/tests/test-acl.out Mon Apr 12 17:11:14 2010 -0700
+++ b/tests/test-acl.out Mon Apr 12 17:21:30 2010 -0700
@@ -71,7 +71,7 @@
files: 3/3 chunks (100.00%)
added 3 changesets with 3 changes to 3 files
updating the branch cache
-rolling back push to revision 1
+rolling back to revision 1 (undo push)
0:6675d58eff77
Extension disabled for lack of acl.sources
@@ -143,7 +143,7 @@
calling hook pretxnchangegroup.acl: hgext.acl.hook
acl: changes have source "push" - skipping
updating the branch cache
-rolling back push to revision 1
+rolling back to revision 1 (undo push)
0:6675d58eff77
No [acl.allow]/[acl.deny]
@@ -221,7 +221,7 @@
acl: allowing changeset f9cafe1212c8
acl: allowing changeset 911600dab2ae
updating the branch cache
-rolling back push to revision 1
+rolling back to revision 1 (undo push)
0:6675d58eff77
Empty [acl.allow]
@@ -799,7 +799,7 @@
acl: allowing changeset f9cafe1212c8
acl: allowing changeset 911600dab2ae
updating the branch cache
-rolling back push to revision 1
+rolling back to revision 1 (undo push)
0:6675d58eff77
wilma can change files with a .txt extension
@@ -1160,6 +1160,6 @@
acl: allowing changeset f9cafe1212c8
acl: allowing changeset 911600dab2ae
updating the branch cache
-rolling back push to revision 1
+rolling back to revision 1 (undo push)
0:6675d58eff77
--- a/tests/test-backout.out Mon Apr 12 17:11:14 2010 -0700
+++ b/tests/test-backout.out Mon Apr 12 17:21:30 2010 -0700
@@ -62,7 +62,7 @@
# backout with valid parent should be ok
removing d
changeset 5:10e5328c8435 backs out changeset 4:b2f3bb92043e
-rolling back commit to revision 5
+rolling back to revision 5 (undo commit)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing c
changeset 5:033590168430 backs out changeset 4:b2f3bb92043e
--- a/tests/test-bundle-r.out Mon Apr 12 17:11:14 2010 -0700
+++ b/tests/test-bundle-r.out Mon Apr 12 17:21:30 2010 -0700
@@ -154,7 +154,7 @@
crosschecking files in changesets and manifests
checking files
4 files, 9 changesets, 7 total revisions
-rolling back pull to revision 5
+rolling back to revision 5 (undo pull)
% should fail
abort: --base is incompatible with specifying a destination
abort: repository default-push not found!
@@ -187,7 +187,7 @@
crosschecking files in changesets and manifests
checking files
4 files, 9 changesets, 7 total revisions
-rolling back unbundle to revision 3
+rolling back to revision 3 (undo unbundle)
% 2
2:d62976ca1e50
adding changesets
@@ -202,7 +202,7 @@
crosschecking files in changesets and manifests
checking files
2 files, 5 changesets, 5 total revisions
-rolling back unbundle to revision 3
+rolling back to revision 3 (undo unbundle)
adding changesets
adding manifests
adding file changes
@@ -215,7 +215,7 @@
crosschecking files in changesets and manifests
checking files
3 files, 7 changesets, 6 total revisions
-rolling back unbundle to revision 3
+rolling back to revision 3 (undo unbundle)
adding changesets
adding manifests
adding file changes
--- a/tests/test-bundle.out Mon Apr 12 17:11:14 2010 -0700
+++ b/tests/test-bundle.out Mon Apr 12 17:21:30 2010 -0700
@@ -37,7 +37,7 @@
added 9 changesets with 7 changes to 4 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
====== Rollback empty
-rolling back pull to revision 0
+rolling back to revision 0 (undo pull)
====== Pull full.hg into empty again (using --cwd)
pulling from ../full.hg
requesting all changes
@@ -55,7 +55,7 @@
searching for changes
no changes found
====== Rollback empty
-rolling back pull to revision 0
+rolling back to revision 0 (undo pull)
====== Pull full.hg into empty again (using -R)
pulling from full.hg
requesting all changes
@@ -123,7 +123,7 @@
added 9 changesets with 7 changes to 4 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
====== Rollback empty
-rolling back pull to revision 0
+rolling back to revision 0 (undo pull)
====== Log -R bundle:empty+full.hg
8 7 6 5 4 3 2 1 0
====== Pull full.hg into empty again (using -R; with hook)
--- a/tests/test-convert-cvs.out Mon Apr 12 17:11:14 2010 -0700
+++ b/tests/test-convert-cvs.out Mon Apr 12 17:21:30 2010 -0700
@@ -45,7 +45,7 @@
2 Initial revision
1 import
filtering out empty revision
-rolling back commit to revision 1
+rolling back to revision 1 (undo commit)
0 ci0
updating tags
c
--- a/tests/test-diff-color.out Mon Apr 12 17:11:14 2010 -0700
+++ b/tests/test-diff-color.out Mon Apr 12 17:21:30 2010 -0700
@@ -43,7 +43,7 @@
c
record this change to 'a'? [Ynsfdaq?]
-rolling back commit to revision 1
+rolling back to revision 1 (undo commit)
% qrecord
[0;1mdiff --git a/a b/a[0m
[0;36;1mold mode 100644[0m
--- a/tests/test-hook.out Mon Apr 12 17:11:14 2010 -0700
+++ b/tests/test-hook.out Mon Apr 12 17:21:30 2010 -0700
@@ -101,7 +101,7 @@
adding file changes
added 1 changesets with 1 changes to 1 files
(run 'hg update' to get a working copy)
-rolling back pull to revision 4
+rolling back to revision 4 (undo pull)
preoutgoing hook: HG_SOURCE=pull
preoutgoing.forbid hook: HG_SOURCE=pull
pulling from ../a
--- a/tests/test-import.out Mon Apr 12 17:11:14 2010 -0700
+++ b/tests/test-import.out Mon Apr 12 17:21:30 2010 -0700
@@ -182,7 +182,7 @@
applying ../patch1
applying ../patch2
applied 1d4bd90af0e4
-rolling back commit to revision 2
+rolling back to revision 2 (undo commit)
parent: 1
% hg import in a subdirectory
requesting all changes
--- a/tests/test-keyword.out Mon Apr 12 17:11:14 2010 -0700
+++ b/tests/test-keyword.out Mon Apr 12 17:21:30 2010 -0700
@@ -198,7 +198,7 @@
+do not process $Id:
+xxx $
% rollback
-rolling back commit to revision 2
+rolling back to revision 2 (undo commit)
% status
A c
% update -C
@@ -266,7 +266,7 @@
% status
? c
% rollback
-rolling back commit to revision 3
+rolling back to revision 3 (undo commit)
% status
R a
? c
@@ -308,7 +308,7 @@
ignore $Id$
% rollback
-rolling back commit to revision 3
+rolling back to revision 3 (undo commit)
% clean update
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% kwexpand/kwshrink on selected files
--- a/tests/test-newbranch.out Mon Apr 12 17:11:14 2010 -0700
+++ b/tests/test-newbranch.out Mon Apr 12 17:21:30 2010 -0700
@@ -62,7 +62,7 @@
default
bar
% test for invalid branch cache
-rolling back commit to revision 5
+rolling back to revision 5 (undo commit)
changeset: 4:4909a3732169
branch: foo
tag: tip
--- a/tests/test-notify.out Mon Apr 12 17:11:14 2010 -0700
+++ b/tests/test-notify.out Mon Apr 12 17:21:30 2010 -0700
@@ -95,10 +95,10 @@
+a
(run 'hg update' to get a working copy)
% fail for config file is missing
-rolling back pull to revision 1
+rolling back to revision 1 (undo pull)
pull failed
% pull
-rolling back pull to revision 1
+rolling back to revision 1 (undo pull)
pulling from ../a
searching for changes
adding changesets
@@ -129,7 +129,7 @@
+a
(run 'hg update' to get a working copy)
% pull
-rolling back pull to revision 1
+rolling back to revision 1 (undo pull)
pulling from ../a
searching for changes
adding changesets
--- a/tests/test-pull-r.out Mon Apr 12 17:11:14 2010 -0700
+++ b/tests/test-pull-r.out Mon Apr 12 17:21:30 2010 -0700
@@ -19,7 +19,7 @@
abort: unknown revision 'missing'!
% pull multiple revisions with update
0:bbd179dfa0a7
-rolling back pull to revision 0
+rolling back to revision 0 (undo pull)
% pull -r 0
changeset: 0:bbd179dfa0a7
tag: tip
--- a/tests/test-push-http.out Mon Apr 12 17:11:14 2010 -0700
+++ b/tests/test-push-http.out Mon Apr 12 17:21:30 2010 -0700
@@ -25,7 +25,7 @@
remote: added 1 changesets with 1 changes to 1 files
% serve errors
changegroup hook: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_URL=remote:http
-rolling back serve to revision 1
+rolling back to revision 1 (undo serve)
% expect authorization error: all users denied
abort: authorization failed
pushing to http://localhost:$HGPORT/
--- a/tests/test-rename-after-merge.out Mon Apr 12 17:11:14 2010 -0700
+++ b/tests/test-rename-after-merge.out Mon Apr 12 17:21:30 2010 -0700
@@ -34,7 +34,7 @@
(branch merge, don't forget to commit)
% commit issue 1476
copies: c2 (c1)
-rolling back commit to revision 3
+rolling back to revision 3 (undo commit)
2 files updated, 0 files merged, 2 files removed, 0 files unresolved
% merge heads again
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-rollback.out Mon Apr 12 17:11:14 2010 -0700
+++ b/tests/test-rollback.out Mon Apr 12 17:21:30 2010 -0700
@@ -9,7 +9,7 @@
date: Mon Jan 12 13:46:40 1970 +0000
summary: test
-rolling back commit to revision 0
+rolling back to revision 0 (undo commit)
checking changesets
checking manifests
crosschecking files in changesets and manifests
@@ -18,14 +18,14 @@
A a
% Test issue 902
marked working directory as branch test
-rolling back commit to revision 0
+rolling back to revision 0 (undo commit)
default
% Test issue 1635 (commit message saved)
.hg/last-message.txt:
test2
% Test rollback of hg before issue 902 was fixed
marked working directory as branch test
-rolling back commit to revision 0
+rolling back to revision 0 (undo commit)
Named branch could not be reset, current branch still is: test
test
% rollback by pretxncommit saves commit message (issue 1635)
--- a/tests/test-tags.out Mon Apr 12 17:11:14 2010 -0700
+++ b/tests/test-tags.out Mon Apr 12 17:21:30 2010 -0700
@@ -111,7 +111,7 @@
summary: Removed tag bar
% rollback undoes tag operation
-rolling back commit to revision 5
+rolling back to revision 5 (undo commit)
tip 4:0c192d7d5e6b
bar 1:78391a272241
tip 4:0c192d7d5e6b
--- a/tests/test-url-rev.out Mon Apr 12 17:11:14 2010 -0700
+++ b/tests/test-url-rev.out Mon Apr 12 17:21:30 2010 -0700
@@ -75,7 +75,7 @@
% rolling back
-rolling back push to revision 2
+rolling back to revision 2 (undo push)
% incoming
2:faba9097cad4
% pull
@@ -104,7 +104,7 @@
% no new revs, no update
0:1f0dee641bb7
% rollback
-rolling back pull to revision 2
+rolling back to revision 2 (undo pull)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0:1f0dee641bb7
% pull -u takes us back to branch foo
@@ -116,7 +116,7 @@
summary: new head of branch foo
% rollback
-rolling back pull to revision 2
+rolling back to revision 2 (undo pull)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% parents
0:1f0dee641bb7