Running git cl patch sets the rietveld patchset.

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 491 matching lines @@
 
   def SetPatchset(self, patchset):
     """Set this branch's patchset.  If patchset=0, clears the patchset."""
     if patchset:
       RunGit(['config', self._PatchsetSetting(), str(patchset)])
     else:
       RunGit(['config', '--unset', self._PatchsetSetting()],
              stderr=subprocess2.PIPE, error_ok=True)
     self.has_patchset = False
 
-  def GetPatchSetDiff(self, issue):
-    patchset = self.RpcServer().get_issue_properties(
+  def GetMostRecentPatchset(self, issue):
+    return self.RpcServer().get_issue_properties(
         int(issue), False)['patchsets'][-1]
+
+  def GetPatchSetDiff(self, issue, patchset):
     return self.RpcServer().get(
         '/download/issue%s_%s.diff' % (issue, patchset))
 
   def SetIssue(self, issue):
     """Set this branch's issue.  If issue=0, clears the issue."""
     if issue:
       RunGit(['config', self._IssueSetting(), str(issue)])
       if self.rietveld_server:
         RunGit(['config', self._RietveldServer(), self.rietveld_server])
     else:
@@ skipping 871 matching lines @@
   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 issue_arg.isdigit():
     # Input is an issue id.  Figure out the URL.
+    cl = Changelist()
     issue = int(issue_arg)
-    patch_data = Changelist().GetPatchSetDiff(issue)
+    patchset = cl.GetMostRecentPatchset(issue)
+    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)
+    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 = int(match.group(1))
+    patchset = int(match.group(2))
     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 21 matching lines @@
   try:
     subprocess2.check_call(cmd, stdin=patch_data, stdout=subprocess2.VOID)
   except subprocess2.CalledProcessError:
     DieWithError('Failed to apply the patch')
 
   # If we had an issue, commit the current state and register the issue.
   if not options.nocommit:
     RunGit(['commit', '-m', 'patch from issue %s' % issue])
     cl = Changelist()
     cl.SetIssue(issue)
+    cl.SetPatchset(patchset)
     print "Committed patch."
   else:
     print "Patch applied to index."
   return 0
 
 
 def CMDrebase(parser, args):
   """rebase current branch on top of svn repo"""
   # Provide a wrapper for git svn rebase to help avoid accidental
   # git svn dcommit.
@@ skipping 113 matching lines @@
       builders_and_tests.setdefault(bot, []).append('defaulttests')
 
   if options.testfilter:
     forced_tests = sum((t.split(',') for t in options.testfilter), [])
     builders_and_tests = dict(
       (b, forced_tests) for b, t in builders_and_tests.iteritems()
       if t != ['compile'])
 
   patchset = cl.GetPatchset()
   if not cl.GetPatchset():
-    properties = cl.RpcServer().get_issue_properties(cl.GetIssue(), False)
-    patchset = properties['patchsets'][-1]
+    patchset = cl.GetMostRecentPatchset(cl.GetIssue())
 
   cl.RpcServer().trigger_try_jobs(
       cl.GetIssue(), patchset, options.name, options.clobber, options.revision,
       builders_and_tests)
   return 0
 
 
 @usage('[new upstream branch]')
 def CMDupstream(parser, args):
   """prints or sets the name of the upstream branch, if any"""
@@ skipping 97 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:]))