Mercurial > hg-stable
changeset 10276:6109a02c682b
Merge with stable
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Fri, 22 Jan 2010 17:15:58 +0100 |
| parents | e898bc7810ad (current diff) 3a1f29b63b9f (diff) |
| children | 6134adc1c431 |
| files | hgext/mq.py tests/test-convert-cvs |
| diffstat | 3 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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