--- a/hgext/convert/darcs.py Tue Oct 02 18:04:18 2007 -0500
+++ b/hgext/convert/darcs.py Wed Oct 03 16:50:32 2007 -0500
@@ -58,7 +58,7 @@
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 @@
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 Tue Oct 02 18:04:18 2007 -0500
+++ b/tests/test-convert-cvs Wed Oct 03 16:50:32 2007 -0500
@@ -38,7 +38,8 @@
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 Tue Oct 02 18:04:18 2007 -0500
+++ b/tests/test-convert-cvs.out Wed Oct 03 16:50:32 2007 -0500
@@ -21,10 +21,8 @@
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