Enforce coherent type handling in git_cl.py

git_cl.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 """A git-command for integrating reviews on Rietveld."""
 
 import json
@@ skipping 418 matching lines @@
 
   def GetRemoteUrl(self):
     """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
 
     Returns None if there is no remote.
     """
     remote = self.GetRemote()
     return RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
 
   def GetIssue(self):
+    """Returns the issue number as a int or None if not set."""
     if not self.has_issue:
       issue = RunGit(['config', self._IssueSetting()], error_ok=True).strip()
       if issue:
-        self.issue = issue
+        self.issue = int(issue)
       else:
         self.issue = None
       self.has_issue = True
     return self.issue
 
   def GetRietveldServer(self):
     if not self.rietveld_server:
       # If we're on a branch then get the server potentially associated
       # with that branch.
       if self.GetIssue():
         self.rietveld_server = gclient_utils.UpgradeToHttps(RunGit(
             ['config', self._RietveldServer()], error_ok=True).strip())
       if not self.rietveld_server:
         self.rietveld_server = settings.GetDefaultServerUrl()
     return self.rietveld_server
 
   def GetIssueURL(self):
     """Get the URL for a particular issue."""
     return '%s/%s' % (self.GetRietveldServer(), self.GetIssue())
 
   def GetDescription(self, pretty=False):
     if not self.has_description:
       if self.GetIssue():
-        issue = int(self.GetIssue())
+        issue = self.GetIssue()
         try:
           self.description = self.RpcServer().get_description(issue).strip()
         except urllib2.HTTPError, e:
           if e.code == 404:
             DieWithError(
                 ('\nWhile fetching the description for issue %d, received a '
                  '404 (not found)\n'
                  'error. It is likely that you deleted this '
                  'issue on the server. If this is the\n'
                  'case, please run\n\n'
                  '    git cl issue 0\n\n'
                  'to clear the association with the deleted issue. Then run '
                  'this command again.') % issue)
           else:
             DieWithError(
                 '\nFailed to fetch issue description. HTTP error ' + e.code)
       self.has_description = True
     if pretty:
       wrapper = textwrap.TextWrapper()
       wrapper.initial_indent = wrapper.subsequent_indent = '  '
       return wrapper.fill(self.description)
     return self.description
 
   def GetPatchset(self):
+    """Returns the patchset number as a int or None if not set."""
     if not self.has_patchset:
       patchset = RunGit(['config', self._PatchsetSetting()],
                         error_ok=True).strip()
       if patchset:
-        self.patchset = patchset
+        self.patchset = int(patchset)
       else:
         self.patchset = None
       self.has_patchset = True
     return self.patchset
 
   def SetPatchset(self, patchset):
     """Set this branch's patchset.  If patchset=0, clears the patchset."""
     if patchset:
       RunGit(['config', self._PatchsetSetting(), str(patchset)])
     else:
@@ skipping 29 matching lines @@
       files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
     except subprocess2.CalledProcessError:
       DieWithError(
           ('\nFailed to diff against upstream branch %s!\n\n'
            'This branch probably doesn\'t exist anymore. To reset the\n'
            'tracking branch, please run\n'
            '    git branch --set-upstream %s trunk\n'
            'replacing trunk with origin/master or the relevant branch') %
           (upstream_branch, self.GetBranch()))
 
-    issue = ConvertToInteger(self.GetIssue())
-    patchset = ConvertToInteger(self.GetPatchset())
+    issue = self.GetIssue()
+    patchset = self.GetPatchset()
     if issue:
       description = self.GetDescription()
     else:
       # If the change was never uploaded, use the log messages of all commits
       # up to the branch point, as git cl upload will prefill the description
       # with these log messages.
       description = RunCommand(['git', 'log', '--pretty=format:%s%n%n%b',
                                 '%s...' % (upstream_branch)]).strip()
 
     if not author:
@@ skipping 22 matching lines @@
           verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
           default_presubmit=None, may_prompt=may_prompt,
           rietveld_obj=self.RpcServer())
     except presubmit_support.PresubmitFailure, e:
       DieWithError(
           ('%s\nMaybe your depot_tools is out of date?\n'
            'If all fails, contact maruel@') % e)
 
   def CloseIssue(self):
     """Updates the description and closes the issue."""
-    issue = int(self.GetIssue())
+    issue = self.GetIssue()
     self.RpcServer().update_description(issue, self.description)
     return self.RpcServer().close_issue(issue)
 
   def SetFlag(self, flag, value):
     """Patchset must match."""
     if not self.GetPatchset():
       DieWithError('The patchset needs to match. Send another patchset.')
     try:
       return self.RpcServer().set_flag(
-          int(self.GetIssue()), int(self.GetPatchset()), flag, value)
+          self.GetIssue(), self.GetPatchset(), flag, value)
     except urllib2.HTTPError, e:
       if e.code == 404:
         DieWithError('The issue %s doesn\'t exist.' % self.GetIssue())
       if e.code == 403:
         DieWithError(
             ('Access denied to issue %s. Maybe the patchset %s doesn\'t '
              'match?') % (self.GetIssue(), self.GetPatchset()))
       raise
 
   def RpcServer(self):
@@ skipping 247 matching lines @@
       url = cl.GetIssueURL()
       if url:
         print url
   else:
     print
     print 'Current branch:',
     if not cl.GetIssue():
       print 'no issue assigned.'
       return 0
     print cl.GetBranch()
-    print 'Issue number:', cl.GetIssue(), '(%s)' % cl.GetIssueURL()
+    print 'Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL())
     print 'Issue description:'
     print cl.GetDescription(pretty=True)
   return 0
 
 
 @usage('[issue_number]')
 def CMDissue(parser, args):
   """Set or display the current code review issue number.
 
   Pass issue number 0 to clear the current issue.
 """
   _, args = parser.parse_args(args)
 
   cl = Changelist()
   if len(args) > 0:
     try:
       issue = int(args[0])
     except ValueError:
       DieWithError('Pass a number to set the issue or none to list it.\n'
           'Maybe you want to run git cl status?')
     cl.SetIssue(issue)
-  print 'Issue number:', cl.GetIssue(), '(%s)' % cl.GetIssueURL()
+  print 'Issue number: %s (%s)' % (cl.GetIssue(), cl.GetIssueURL())
   return 0
 
 
 def CMDcomments(parser, args):
   """show review comments of the current changelist"""
   (_, args) = parser.parse_args(args)
   if args:
     parser.error('Unsupported argument: %s' % args)
 
   cl = Changelist()
@@ skipping 13 matching lines @@
     log_args = [args[0] + '..']
   elif len(args) == 1 and args[0].endswith('...'):
     log_args = [args[0][:-1]]
   elif len(args) == 2:
     log_args = [args[0] + '..' + args[1]]
   else:
     log_args = args[:]  # Hope for the best!
   return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
 
 
-def ConvertToInteger(inputval):
-  """Convert a string to integer, but returns either an int or None."""
-  try:
-    return int(inputval)
-  except (TypeError, ValueError):
-    return None
-
-
 def CMDpresubmit(parser, args):
   """run presubmit tests on the current changelist"""
   parser.add_option('--upload', action='store_true',
                     help='Run upload hook instead of the push/dcommit hook')
   (options, args) = parser.parse_args(args)
 
   # Make sure index is up-to-date before running diff-index.
   RunGit(['update-index', '--refresh', '-q'], error_ok=True)
   if RunGit(['diff-index', 'HEAD']):
     # TODO(maruel): Is this really necessary?
@@ skipping 63 matching lines @@
   change_desc = None
 
   if cl.GetIssue():
     if options.title:
       upload_args.extend(['--title', options.title])
     elif options.message:
       # TODO(rogerta): for now, the -m option will also set the --title option
       # for upload.py.  Soon this will be changed to set the --message option.
       # Will wait until people are used to typing -t instead of -m.
       upload_args.extend(['--title', options.message])
-    upload_args.extend(['--issue', cl.GetIssue()])
+    upload_args.extend(['--issue', str(cl.GetIssue())])
     print ("This branch is associated with issue %s. "
            "Adding patch to that issue." % cl.GetIssue())
   else:
     if options.title:
       upload_args.extend(['--title', options.title])
     message = options.message or CreateDescriptionFromLog(args)
     change_desc = ChangeDescription(message, options.reviewers)
     if not options.force:
       change_desc.Prompt()
     change_desc.ParseDescription()
@@ skipping 373 matching lines @@
                     help="don't commit after patch applies")
   (options, args) = parser.parse_args(args)
   if len(args) != 1:
     parser.print_help()
     return 1
   issue_arg = args[0]
 
   # TODO(maruel): Use apply_issue.py
   # TODO(ukai): use gerrit-cherry-pick for gerrit repository?
 
-  if re.match(r'\d+', issue_arg):
+  if issue_arg.isdigit():
     # Input is an issue id.  Figure out the URL.
-    issue = issue_arg
+    issue = int(issue_arg)
     patch_data = Changelist().GetPatchSetDiff(issue)
   else:
     # Assume it's a URL to the patch. Default to https.
     issue_url = gclient_utils.UpgradeToHttps(issue_arg)
     match = re.match(r'.*?/issue(\d+)_\d+.diff', issue_url)
     if not match:
       DieWithError('Must pass an issue ID or full URL for '
           '\'Download raw patch set\'')
-    issue = match.group(1)
+    issue = int(match.group(1))
     patch_data = urllib2.urlopen(issue_arg).read()
 
   if options.newbranch:
     if options.force:
       RunGit(['branch', '-D', options.newbranch],
           stderr=subprocess2.PIPE, error_ok=True)
     RunGit(['checkout', '-b', options.newbranch,
             Changelist().GetUpstreamBranch()])
 
   # Switch up to the top-level directory, if necessary, in preparation for
@@ skipping 187 matching lines @@
              'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
 
   # Not a known command. Default to help.
   GenUsage(parser, 'help')
   return CMDhelp(parser, argv)
 
 
 if __name__ == '__main__':
   fix_encoding.fix_encoding()
   sys.exit(main(sys.argv[1:]))