[PATCH] expand paths in aliases

Alexander Solovyov piranha at piranha.org.ua
Wed Mar 31 05:43:27 CDT 2010


# HG changeset patch
# User Alexander Solovyov <piranha at piranha.org.ua>
# Date 1269689985 -7200
# Node ID c22ad90084bd5f13465533fe87c1a9cb189cbeee
# Parent  3152f2732ef501fef5dbcbb46acaf528726e2cb9
expand paths in aliases

diff --git a/mercurial/dispatch.py b/mercurial/dispatch.py
--- a/mercurial/dispatch.py
+++ b/mercurial/dispatch.py
@@ -194,6 +194,7 @@ class cmdalias(object):
 
         args = shlex.split(self.definition)
         cmd = args.pop(0)
+        args = map(util.expandpath, args)
 
         try:
             tableentry = cmdutil.findcmd(cmd, cmdtable, False)[1]
diff --git a/tests/test-alias b/tests/test-alias
--- a/tests/test-alias
+++ b/tests/test-alias
@@ -13,6 +13,7 @@ lognull = log -r null
 shortlog = log --template '{rev} {node|short} | {date|isodate}\n'
 dln = lognull --debug
 nousage = rollback
+put = export -r 0 -o "\$PWD/%R.diff"
 
 [defaults]
 mylog = -q
@@ -59,3 +60,7 @@ hg lognull
 
 echo '% properly recursive'
 hg dln
+
+echo '% path expanding'
+hg put
+cat 0.diff
diff --git a/tests/test-alias.out b/tests/test-alias.out
--- a/tests/test-alias.out
+++ b/tests/test-alias.out
@@ -30,3 +30,16 @@ user:
 date:        Thu Jan 01 00:00:00 1970 +0000
 extra:       branch=default
 
+% path expanding
+# HG changeset patch
+# User test
+# Date 0 0
+# Node ID e63c23eaa88ae77967edcf4ea194d31167c478b0
+# Parent  0000000000000000000000000000000000000000
+foo
+
+diff -r 000000000000 -r e63c23eaa88a foo
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/foo	Thu Jan 01 00:00:00 1970 +0000
+@@ -0,0 +1,1 @@
++foo


More information about the Mercurial-devel mailing list