Mercurial > hg-stable

changeset 15578:db0e277bdd37

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
status: support revsets with --change
author Patrick Mezard <pmezard@gmail.com>
date Thu, 24 Nov 2011 11:38:16 +0100
parents ad686c818e1c
children 5a7733563c2e
files mercurial/commands.py tests/test-status.t
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Fri Nov 25 02:11:12 2011 +0100
+++ b/mercurial/commands.py	Thu Nov 24 11:38:16 2011 +0100
@@ -5174,7 +5174,7 @@
         msg = _('cannot specify --rev and --change at the same time')
         raise util.Abort(msg)
     elif change:
-        node2 = repo.lookup(change)
+        node2 = scmutil.revsingle(repo, change, None).node()
         node1 = repo[node2].p1().node()
     else:
         node1, node2 = scmutil.revpair(repo, revs)
--- a/tests/test-status.t	Fri Nov 25 02:11:12 2011 +0100
+++ b/tests/test-status.t	Thu Nov 24 11:38:16 2011 +0100
@@ -263,9 +263,9 @@
     modified
   R removed
 
-hg status -A --change 1:
+hg status -A --change 1 and revset:
 
-  $ hg status -A --change 1
+  $ hg status -A --change '1|1'
   M modified
   A added
   A copied