Mercurial > hg-stable
changeset 5363:9bdce4a7964c
Merge with crew
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Tue, 02 Oct 2007 21:01:00 -0700 |
parents | b98c377b3c16 (current diff) 4ad2a18aff42 (diff) |
children | ac2ccdcf4539 7cdc896fdcd5 |
files | |
diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/convert/darcs.py Tue Oct 02 13:49:36 2007 -0700 +++ b/hgext/convert/darcs.py Tue Oct 02 21:01:00 2007 -0700 @@ -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)