git cl diff: fix regression.

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 and Gerrit."""
 
 from distutils.version import LooseVersion
@@ skipping 1279 matching lines @@
           verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
           default_presubmit=None, may_prompt=may_prompt,
           rietveld_obj=self._codereview_impl.GetRieveldObjForPresubmit())
     except presubmit_support.PresubmitFailure, e:
       DieWithError(
           ('%s\nMaybe your depot_tools is out of date?\n'
            'If all fails, contact maruel@') % e)
 
   def CMDPatchIssue(self, issue_arg, reject, nocommit, directory):
     """Fetches and applies the issue patch from codereview to local branch."""
-    if issue_arg.isdigit():
-      parsed_issue_arg = _RietveldParsedIssueNumberArgument(int(issue_arg))
+    if isinstance(issue_arg, (int, long)) or issue_arg.isdigit():
+      parsed_issue_arg = _ParsedIssueNumberArgument(int(issue_arg))
     else:
       # Assume url.
       parsed_issue_arg = self._codereview_impl.ParseIssueURL(
           urlparse.urlparse(issue_arg))
     if not parsed_issue_arg or not parsed_issue_arg.valid:
       DieWithError('Failed to parse issue argument "%s". '
                    'Must be an issue number or a valid URL.' % issue_arg)
     return self._codereview_impl.CMDPatchWithParsedIssue(
         parsed_issue_arg, reject, nocommit, directory)
 
@@ skipping 284 matching lines @@
 
     # PatchIssue should never be called with a dirty tree.  It is up to the
     # caller to check this, but just in case we assert here since the
     # consequences of the caller not checking this could be dire.
     assert(not git_common.is_dirty_git_tree('apply'))
     assert(parsed_issue_arg.valid)
     self._changelist.issue = parsed_issue_arg.issue
     if parsed_issue_arg.hostname:
       self._rietveld_server = 'https://%s' % parsed_issue_arg.hostname
 
-    if parsed_issue_arg.patch_url:
+    if (isinstance(parsed_issue_arg, _RietveldParsedIssueNumberArgument) and
+        parsed_issue_arg.patch_url):
       assert parsed_issue_arg.patchset
       patchset = parsed_issue_arg.patchset
       patch_data = urllib2.urlopen(parsed_issue_arg.patch_url).read()
     else:
       patchset = parsed_issue_arg.patchset or self.GetMostRecentPatchset()
       patch_data = self.GetPatchSetDiff(self.GetIssue(), patchset)
 
     # Switch up to the top-level directory, if necessary, in preparation for
     # applying the patch.
     top = settings.GetRelativeRoot()
@@ skipping 2692 matching lines @@
   cl = Changelist(auth_config=auth_config)
   issue = cl.GetIssue()
   branch = cl.GetBranch()
   if not issue:
     DieWithError('No issue found for current branch (%s)' % branch)
   TMP_BRANCH = 'git-cl-diff'
   base_branch = cl.GetCommonAncestorWithUpstream()
 
   # Create a new branch based on the merge-base
   RunGit(['checkout', '-q', '-b', TMP_BRANCH, base_branch])
+  # Update the cached branch in cl instance, to avoid overwriting original

[Michael Achenbach, 2016/04/07 09:35:53]

This could do some more information hiding.

+  # branch properties.
+  cl.branch = cl.branchref = None
   try:
     rtn = cl.CMDPatchIssue(issue, reject=False, nocommit=False, directory=None)
     if rtn != 0:
       RunGit(['reset', '--hard'])
       return rtn
 
     # Switch back to starting branch and diff against the temporary
     # branch containing the latest rietveld patch.
     subprocess2.check_call(['git', 'diff', TMP_BRANCH, branch, '--'])
   finally:
@@ skipping 291 matching lines @@
 if __name__ == '__main__':
   # These affect sys.stdout so do it outside of main() to simplify mocks in
   # unit testing.
   fix_encoding.fix_encoding()
   setup_color.init()
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(1)