changeset 10813:fa635eb0b6f2

Merge with i18n

--- a/hgext/mq.py	Thu Apr 01 11:45:25 2010 -0300
+++ b/hgext/mq.py	Thu Apr 01 17:51:32 2010 -0500
@@ -2643,9 +2643,10 @@
     entry = extensions.wrapcommand(commands.table, 'init', mqinit)
     entry[1].extend(mqopt)
 
+    norepo = commands.norepo.split(" ")
     for cmd in commands.table.keys():
         cmd = cmdutil.parsealiases(cmd)[0]
-        if cmd in commands.norepo:
+        if cmd in norepo:
             continue
         entry = extensions.wrapcommand(commands.table, cmd, mqcommand)
         entry[1].extend(mqopt)

--- a/hgext/share.py	Thu Apr 01 11:45:25 2010 -0300
+++ b/hgext/share.py	Thu Apr 01 17:51:32 2010 -0500
@@ -9,7 +9,7 @@
 from mercurial import hg, commands
 
 def share(ui, source, dest=None, noupdate=False):
-    """create a new shared repository (experimental)
+    """create a new shared repository
 
     Initialize a new repository and working directory that shares its
     history with another repository.

--- a/mercurial/dispatch.py	Thu Apr 01 11:45:25 2010 -0300
+++ b/mercurial/dispatch.py	Thu Apr 01 17:51:32 2010 -0500
@@ -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	Thu Apr 01 11:45:25 2010 -0300
+++ b/mercurial/url.py	Thu Apr 01 17:51:32 2010 -0500
@@ -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	Thu Apr 01 11:45:25 2010 -0300
+++ b/tests/test-alias	Thu Apr 01 17:51:32 2010 -0500
@@ -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	Thu Apr 01 11:45:25 2010 -0300
+++ b/tests/test-alias.out	Thu Apr 01 17:51:32 2010 -0500
@@ -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

--- a/tests/test-subrepo-svn	Thu Apr 01 11:45:25 2010 -0300
+++ b/tests/test-subrepo-svn	Thu Apr 01 17:51:32 2010 -0500
@@ -14,6 +14,7 @@
 if [ $? -ne 0 ]; then
     escapedwd="/$escapedwd"
 fi
+escapedwd=`python -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$escapedwd"`
 filterpath="s|$escapedwd|/root|"
 filtersvn='s/ in transaction.*/ is out of date/;s/Out of date: /File /'
 
@@ -33,7 +34,7 @@
 svn ci -m 'Add alpha'
 svn up
 cat > extdef <<EOF
-externals -r1 "$SVNREPO/externals"
+externals -r1 $SVNREPO/externals
 EOF
 svn propset -F extdef svn:externals src
 svn ci -m 'Setting externals'