Wrap raw_input() around a try/except to reduce the number of false-positive in breakpad

gclient_scm.py

 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Gclient-specific SCM-specific operations."""
 
 import logging
 import os
 import posixpath
 import re
+import sys
 import time
 
 import scm
 import gclient_utils
 
 
 class DiffFilterer(object):
   """Simple class which tracks which file is being diffed and
   replaces instances of its file name in the original and
   working copy lines of the svn/git diff output."""
@@ skipping 21 matching lines @@
     if (line.startswith(self.index_string)):
       self.SetCurrentFile(line[len(self.index_string):])
       line = self._Replace(line)
     else:
       if (line.startswith(self.original_prefix) or
           line.startswith(self.working_prefix)):
         line = self._Replace(line)
     print(line)
 
 
+def ask_for_data(prompt):
+  try:
+    return raw_input(prompt)
+  except KeyboardInterrupt:
+    # Hide the exception.
+    sys.exit(1)
+
+
 ### SCM abstraction layer
 
 # Factory Method for SCM wrapper creation
 
 def GetScmName(url):
   if url:
     url, _ = gclient_utils.SplitUrlRevision(url)
     if (url.startswith('git://') or url.startswith('ssh://') or
         url.endswith('.git')):
       return 'git'
@@ skipping 284 matching lines @@
         merge_output = scm.GIT.Capture(['merge', '--ff-only', upstream_branch],
             cwd=self.checkout_path)
       except gclient_utils.CheckCallError, e:
         if re.match('fatal: Not possible to fast-forward, aborting.', e.stderr):
           if not printed_path:
             print('\n_____ %s%s' % (self.relpath, rev_str))
             printed_path = True
           while True:
             try:
               # TODO(maruel): That can't work with --jobs.
-              action = str(raw_input("Cannot fast-forward merge, attempt to "
-                                     "rebase? (y)es / (q)uit / (s)kip : "))
+              action = ask_for_data(
+                  'Cannot fast-forward merge, attempt to rebase? '
+                  '(y)es / (q)uit / (s)kip : ')
             except ValueError:
-              gclient_utils.Error('Invalid Character')
-              continue
+              raise gclient_utils.Error('Invalid Character')
             if re.match(r'yes|y', action, re.I):
               self._AttemptRebase(upstream_branch, files, options,
                                   printed_path=printed_path)
               printed_path = True
               break
             elif re.match(r'quit|q', action, re.I):
               raise gclient_utils.Error("Can't fast-forward, please merge or "
                                         "rebase manually.\n"
                                         "cd %s && git " % self.checkout_path
                                         + "rebase %s" % upstream_branch)
@@ skipping 162 matching lines @@
     if branch:
       rebase_cmd.append(branch)
 
     try:
       rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
     except gclient_utils.CheckCallError, e:
       if (re.match(r'cannot rebase: you have unstaged changes', e.stderr) or
           re.match(r'cannot rebase: your index contains uncommitted changes',
                    e.stderr)):
         while True:
-          rebase_action = str(raw_input("Cannot rebase because of unstaged "
-                                        "changes.\n'git reset --hard HEAD' ?\n"
-                                        "WARNING: destroys any uncommitted "
-                                        "work in your current branch!"
-                                        " (y)es / (q)uit / (s)how : "))
+          rebase_action = ask_for_data(
+              'Cannot rebase because of unstaged changes.\n'
+              '\'git reset --hard HEAD\' ?\n'
+              'WARNING: destroys any uncommitted work in your current branch!'
+              ' (y)es / (q)uit / (s)how : ')
           if re.match(r'yes|y', rebase_action, re.I):
             self._Run(['reset', '--hard', 'HEAD'], options)
             # Should this be recursive?
             rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
             break
           elif re.match(r'quit|q', rebase_action, re.I):
             raise gclient_utils.Error("Please merge or rebase manually\n"
                                       "cd %s && git " % self.checkout_path
                                       + "%s" % ' '.join(rebase_cmd))
           elif re.match(r'show|s', rebase_action, re.I):
@@ skipping 366 matching lines @@
 
     This method returns a new list to be used as a command."""
     new_command = command[:]
     if revision:
       new_command.extend(['--revision', str(revision).strip()])
     # --force was added to 'svn update' in svn 1.5.
     if ((options.force or options.manually_grab_svn_rev) and
         scm.SVN.AssertVersion("1.5")[0]):
       new_command.append('--force')
     return new_command