--- a/mercurial/hg.py	Sat Jul 02 18:31:13 2005 -0800
+++ b/mercurial/hg.py	Sat Jul 02 18:57:59 2005 -0800
@@ -520,7 +520,8 @@
             ds = ""
         self.opener("undo.dirstate", "w").write(ds)
 
-        return transaction.transaction(self.opener, self.join("journal"),
+        return transaction.transaction(self.ui.warn,
+                                       self.opener, self.join("journal"),
                                        self.join("undo"))
 
     def recover(self):
@@ -1350,7 +1351,7 @@
             try:
                 delta = mdiff.patchtext(self.manifest.delta(n))
             except KeyboardInterrupt:
-                print "aborted"
+                self.ui.warn("aborted")
                 sys.exit(0)
             except Exception, inst:
                 self.ui.warn("unpacking manifest %s: %s\n"
@@ -1392,7 +1393,6 @@
                 if n not in filenodes[f]:
                     self.ui.warn("%s: %d:%s not in manifests\n"
                                  % (f, i, short(n)))
-                    print len(filenodes[f].keys()), fl.count(), f
                     errors += 1
                 else:
                     del filenodes[f][n]