Handle KeyboardInterrupt consistently in python scripts

git_map_branches.py

Index: git_map_branches.py
diff --git a/git_map_branches.py b/git_map_branches.py
index 44f13c3bd5abc010269e48d05d6d82a7374ddf65..0bf57499e738d0781da76551f75363dbe46d1fed 100755
--- a/git_map_branches.py
+++ b/git_map_branches.py
@@ -266,13 +266,18 @@ def main(argv):
   parser.add_argument('--no-color', action='store_true', dest='nocolor',
                       help='Turn off colors.')
 
-  opts = parser.parse_args(argv[1:])
+  opts = parser.parse_args(argv)
 
   mapper = BranchMapper()
   mapper.verbosity = opts.v
   mapper.output.nocolor = opts.nocolor
   mapper.start()
   print mapper.output.as_formatted_string()
+  return 0
 
 if __name__ == '__main__':
-  sys.exit(main(sys.argv))
+  try:
+    sys.exit(main(sys.argv[1:]))
+  except KeyboardInterrupt:
+    sys.stderr.write('interrupted\n')
+    sys.exit(1)