Mercurial > hg
changeset 6870:974f5263f546
merge with crew-stable
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Fri, 08 Aug 2008 18:49:55 +0200 |
| parents | e64f5abb8a88 (current diff) b49e01863202 (diff) |
| children | 13fe85fe396b |
| files | hgext/convert/common.py |
| diffstat | 3 files changed, 14 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/convert/common.py Thu Aug 07 09:53:57 2008 +0200 +++ b/hgext/convert/common.py Fri Aug 08 18:49:55 2008 +0200 @@ -224,11 +224,11 @@ cmdline = [util.shellquote(arg) for arg in cmdline] cmdline += ['2>', util.nulldev, '<', util.nulldev] cmdline = ' '.join(cmdline) - self.ui.debug(cmdline, '\n') return cmdline def _run(self, cmd, *args, **kwargs): cmdline = self._cmdline(cmd, *args, **kwargs) + self.ui.debug('running: %s\n' % (cmdline,)) self.prerun() try: return util.popen(cmdline)
--- a/tests/test-hardlinks-safety Thu Aug 07 09:53:57 2008 +0200 +++ b/tests/test-hardlinks-safety Fri Aug 08 18:49:55 2008 +0200 @@ -9,6 +9,8 @@ cd a hg qimport -n foo - << EOF +# HG changeset patch +# Date 1 0 diff -r 2588a8b53d66 a --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/a Wed Jul 23 15:54:29 2008 +0200 @@ -23,6 +25,8 @@ cd b hg qimport -n bar - << EOF +# HG changeset patch +# Date 2 0 diff -r 2588a8b53d66 a --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/b Wed Jul 23 15:54:29 2008 +0200
--- a/tests/test-hardlinks-safety.out Thu Aug 07 09:53:57 2008 +0200 +++ b/tests/test-hardlinks-safety.out Fri Aug 08 18:49:55 2008 +0200 @@ -5,22 +5,22 @@ adding bar to series file applying bar Now at: bar -9373c9d7b61ff62edc4685b85115a54aa92cd6fa:foo -6dd08b80614ae7ed7f9224fb089e90deb999ae76:bar +430ed4828a74fa4047bc816a25500f7472ab4bfe:foo +4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c:bar % foo bar %%% -9373c9d7b61ff62edc4685b85115a54aa92cd6fa:foo +430ed4828a74fa4047bc816a25500f7472ab4bfe:foo % foo %%% -6dd08b80614ae7ed7f9224fb089e90deb999ae76 foo -9373c9d7b61ff62edc4685b85115a54aa92cd6fa bar +4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c foo +430ed4828a74fa4047bc816a25500f7472ab4bfe bar % -6dd08b80614ae7ed7f9224fb089e90deb999ae76 lfoo -9373c9d7b61ff62edc4685b85115a54aa92cd6fa lbar +4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c lfoo +430ed4828a74fa4047bc816a25500f7472ab4bfe lbar %%% -6dd08b80614ae7ed7f9224fb089e90deb999ae76 foo +4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c foo % -6dd08b80614ae7ed7f9224fb089e90deb999ae76 lfoo +4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c lfoo