Mercurial > hg-stable
changeset 10795:8f4c95368313
Merge with stable
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Wed, 31 Mar 2010 17:32:19 +0200 |
| parents | 3152f2732ef5 (current diff) 1148a968a070 (diff) |
| children | e8611ef6bdfb |
| files | mercurial/dispatch.py |
| diffstat | 4 files changed, 21 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/dispatch.py Wed Mar 31 12:09:21 2010 +0200 +++ b/mercurial/dispatch.py Wed Mar 31 17:32:19 2010 +0200 @@ -194,6 +194,7 @@ args = shlex.split(self.definition) cmd = args.pop(0) + args = map(util.expandpath, args) try: tableentry = cmdutil.findcmd(cmd, cmdtable, False)[1]
--- a/mercurial/url.py Wed Mar 31 12:09:21 2010 +0200 +++ b/mercurial/url.py Wed Mar 31 17:32:19 2010 +0200 @@ -145,6 +145,8 @@ continue group, setting = key.split('.', 1) gdict = config.setdefault(group, dict()) + if setting in ('cert', 'key'): + val = util.expandpath(val) gdict[setting] = val # Find the best match
--- a/tests/test-alias Wed Mar 31 12:09:21 2010 +0200 +++ b/tests/test-alias Wed Mar 31 17:32:19 2010 +0200 @@ -13,6 +13,7 @@ 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 @@ echo '% properly recursive' hg dln + +echo '% path expanding' +hg put +cat 0.diff
--- a/tests/test-alias.out Wed Mar 31 12:09:21 2010 +0200 +++ b/tests/test-alias.out Wed Mar 31 17:32:19 2010 +0200 @@ -30,3 +30,16 @@ 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