Mercurial > hg > mercurial-crew-with-dirclash
changeset 5368:ff32b2725651
Merge with crew
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 03 Oct 2007 16:50:32 -0500 |
| parents | adce4d30a6ea (current diff) ac2ccdcf4539 (diff) |
| children | 7530334bf301 |
| files | |
| diffstat | 3 files changed, 7 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/convert/darcs.py +++ b/hgext/convert/darcs.py @@ -58,7 +58,7 @@ class darcs_source(converter_source): def after(self): self.ui.debug('cleaning up %s\n' % self.tmppath) - #shutil.rmtree(self.tmppath, ignore_errors=True) + shutil.rmtree(self.tmppath, ignore_errors=True) def _run(self, cmd, *args, **kwargs): cmdline = 'darcs %s --repodir=%r %s </dev/null' % ( @@ -74,8 +74,8 @@ class darcs_source(converter_source): def checkexit(self, status, output=''): if status: if output: - ui.warn(_('darcs error:\n')) - ui.warn(output) + self.ui.warn(_('darcs error:\n')) + self.ui.warn(output) msg = util.explain_exit(status)[0] raise util.Abort(_('darcs %s') % msg)
--- a/tests/test-convert-cvs +++ b/tests/test-convert-cvs @@ -38,7 +38,8 @@ echo % commit new file revisions cd src echo a >> a echo c >> b/c -cvs -q commit -mci1 . | sed -e 's:.*src/\(.*\),v:src/\1,v:g' +cvs -q commit -mci1 . | grep '<--' |\ + sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g' cd .. echo % convert again
--- a/tests/test-convert-cvs.out +++ b/tests/test-convert-cvs.out @@ -21,10 +21,8 @@ updating tags a c % commit new file revisions -src/a,v <-- a -new revision: 1.2; previous revision: 1.1 -src/b/c,v <-- b/c -new revision: 1.2; previous revision: 1.1 +checking in src/a,v +checking in src/b/c,v % convert again destination src-hg is a Mercurial repository connecting to cvsrepo