localrepo: adjust some imports, remove sys dependency
authormpm@selenic.com
Sat, 27 Aug 2005 15:09:46 -0700
changeset 1097 1f89ccbab6ce
parent 1096 ae4f1f48c569
child 1098 50a0a36dd48a
localrepo: adjust some imports, remove sys dependency
mercurial/localrepo.py
--- a/mercurial/localrepo.py	Sat Aug 27 15:05:59 2005 -0700
+++ b/mercurial/localrepo.py	Sat Aug 27 15:09:46 2005 -0700
@@ -5,14 +5,14 @@
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
-import sys, struct, os, util
+import struct, os, util
 from repo import *
 from revlog import *
 from filelog import *
 from manifest import *
 from changelog import *
+from dirstate import *
 from demandload import *
-from dirstate import *
 demandload(globals(), "re lock transaction tempfile stat")
 
 class localrepository:
@@ -1323,8 +1323,8 @@
             try:
                 delta = mdiff.patchtext(self.manifest.delta(n))
             except KeyboardInterrupt:
-                self.ui.warn("aborted")
-                sys.exit(0)
+                self.ui.warn("interrupted")
+                raise
             except Exception, inst:
                 self.ui.warn("unpacking manifest %s: %s\n"
                              % (short(n), inst))