Fix bug in git cl patch using raw patch URL.

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."""
 
 from distutils.version import LooseVersion
@@ skipping 300 matching lines @@
             content)
       break
     if response.status < 500 or try_count >= 2:
       raise httplib2.HttpLib2Error(content)
 
     # status >= 500 means transient failures.
     logging.debug('Transient errors when triggering tryjobs. Will retry.')
     time.sleep(0.5 + 1.5*try_count)
 
   print '\n'.join(print_text)
-      
+
 
 def MatchSvnGlob(url, base_url, glob_spec, allow_wildcards):
   """Return the corresponding git ref if |base_url| together with |glob_spec|
   matches the full |url|.
 
   If |allow_wildcards| is true, |glob_spec| can contain wildcards (see below).
   """
   fetch_suburl, as_ref = glob_spec.split(':')
   if allow_wildcards:
     glob_match = re.match('(.+/)?(\*|{[^/]*})(/.+)?', fetch_suburl)
@@ skipping 2372 matching lines @@
   return PatchIssue(issue_arg, options.reject, options.nocommit,
                     options.directory, auth_config)
 
 
 def PatchIssue(issue_arg, reject, nocommit, directory, auth_config):
   # 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'))
 
-  if type(issue_arg) is int or issue_arg.isdigit():
+  arg_is_issue_id = type(issue_arg) is int or issue_arg.isdigit()
+  if arg_is_issue_id:
     # Input is an issue id.  Figure out the URL.
     issue = int(issue_arg)
     cl = Changelist(issue=issue, auth_config=auth_config)
     patchset = cl.GetMostRecentPatchset()
     patch_data = cl.GetPatchSetDiff(issue, patchset)
   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:
@@ skipping 32 matching lines @@
     cmd.append('--3way')
   try:
     subprocess2.check_call(cmd, env=GetNoGitPagerEnv(),
                            stdin=patch_data, stdout=subprocess2.VOID)
   except subprocess2.CalledProcessError:
     print 'Failed to apply the patch'
     return 1
 
   # If we had an issue, commit the current state and register the issue.
   if not nocommit:
-    RunGit(['commit', '-m', (cl.GetDescription() + '\n\n' +
+    commit_message = cl.GetDescription() + '\n\n' if arg_is_issue_id else ''

[agable, 2015/06/01 21:22:53]

Rather than removing functionality (replacing the description with the
emptystring), instead create a cl = Changelist(...) in the else: clause above,
and explicitly set cl.rietveld_server to be the right thing. Then this call
should work.

[kjellander_chromium, 2015/06/02 07:47:09]

Good idea. That was pretty simple to do by just updating the regexp.

+    RunGit(['commit', '-m', (commit_message +
                              'patch from issue %(i)s at patchset '
                              '%(p)s (http://crrev.com/%(i)s#ps%(p)s)'
                              % {'i': issue, 'p': patchset})])
     cl = Changelist(auth_config=auth_config)
     cl.SetIssue(issue)
     cl.SetPatchset(patchset)
     print "Committed patch locally."
   else:
     print "Patch applied to index."
   return 0
@@ skipping 565 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()
   colorama.init()
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(1)