Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable
authorMartin Geisler <mg@lazybytes.net>
Fri, 22 Jan 2010 17:15:58 +0100
changeset 10276 6109a02c682b
parent 10273 e898bc7810ad (current diff)
parent 10275 3a1f29b63b9f (diff)
child 10278 6134adc1c431
Merge with stable
hgext/mq.py file | annotate | diff | comparison | revisions
tests/test-convert-cvs file | annotate | diff | comparison | revisions 
--- a/hgext/mq.py	Thu Jan 21 13:26:26 2010 +0100
+++ b/hgext/mq.py	Fri Jan 22 17:15:58 2010 +0100
@@ -643,10 +643,10 @@
 
             message = ph.message
             if not message:
-                message = _("imported patch %s\n") % patchname
+                message = "imported patch %s\n" % patchname
             else:
                 if list:
-                    message.append(_("\nimported patch %s") % patchname)
+                    message.append("\nimported patch %s" % patchname)
                 message = '\n'.join(message)
 
             if ph.haspatch:
--- a/tests/test-convert-cvs	Thu Jan 21 13:26:26 2010 +0100
+++ b/tests/test-convert-cvs	Fri Jan 22 17:15:58 2010 +0100
@@ -23,7 +23,7 @@
 def cvschangesets(ui,repo,hooktype,changesets):
     print "%s hook: %d changesets"%(hooktype,len(changesets))
 EOF
-hookpath=$PWD
+hookpath=`pwd`
 
 echo "[hooks]" >> $HGRCPATH
 echo "cvslog=python:$hookpath/cvshooks.py:cvslog" >> $HGRCPATH
@@ -32,7 +32,7 @@
 echo % create cvs repository
 mkdir cvsrepo
 cd cvsrepo
-CVSROOT=$PWD
+CVSROOT=`pwd`
 export CVSROOT
 CVS_OPTIONS=-f
 export CVS_OPTIONS
--- a/tests/test-convert-p4-filetypes	Thu Jan 21 13:26:26 2010 +0100
+++ b/tests/test-convert-p4-filetypes	Fri Jan 22 17:15:58 2010 +0100
@@ -6,7 +6,7 @@
 echo "convert = " >> $HGRCPATH
 
 echo % create p4 depot
-P4ROOT=$PWD/depot; export P4ROOT
+P4ROOT=`pwd`/depot; export P4ROOT
 P4AUDIT=$P4ROOT/audit; export P4AUDIT
 P4JOURNAL=$P4ROOT/journal; export P4JOURNAL
 P4LOG=$P4ROOT/log; export P4LOG
Mercurial