# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Date 1191384060 25200
# Node ID 9bdce4a7964c338f4a337a1667f5dd930662a32c
# Parent  b98c377b3c163d01346f63851710d183c43076da# Parent  4ad2a18aff42266d1821f47f6dbfec6c38d9748c
Merge with crew

diff --git a/hgext/convert/darcs.py b/hgext/convert/darcs.py
--- 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)