localrepo: adjust some imports, remove sys dependency

mercurial/localrepo.py

@@ -5,14 +5,14 b''
 # 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 b' class localrepository:'
             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))