Add patchset number on manual commit comment.

gcl.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.
 
 """\
 Wrapper script around Rietveld's upload.py that simplifies working with groups
 of files.
 """
 
@@ skipping 380 matching lines @@
 
   def GetIssueDescription(self):
     """Returns the issue description from Rietveld."""
     return self.SendToRietveld('/%d/description' % self.issue)
 
   def AddComment(self, comment):
     """Adds a comment for an issue on Rietveld.
     As a side effect, this will email everyone associated with the issue."""
     return self.RpcServer().add_comment(self.issue, comment)
 
+  def GetIssueProperties(self, messages=False):
+    """Returns the issue properties as a JSON-style object.
+    Can optionally retrieve the messages as well."""
+    return self.RpcServer().get_issue_properties(self.issue, messages)
+
   def PrimeLint(self):
     """Do background work on Rietveld to lint the file so that the results are
     ready when the issue is viewed."""
     if self.issue and self.patchset:
       self.SendToRietveld('/lint/issue%s_%s' % (self.issue, self.patchset),
           timeout=10)
 
   def SendToRietveld(self, request_path, timeout=None, **kwargs):
     """Send a POST/GET to Rietveld.  Returns the response body."""
     try:
@@ skipping 627 matching lines @@
     if change_info.issue:
       revision = re.compile(".*?\nCommitted revision (\d+)",
                             re.DOTALL).match(output).group(1)
       viewvc_url = GetCodeReviewSetting('VIEW_VC')
       change_info.description += '\n'
       if viewvc_url and revision:
         change_info.description += "\nCommitted: " + viewvc_url + revision
       elif revision:
         change_info.description += "\nCommitted: " + revision
       change_info.CloseIssue()
-      comment = "Committed manually as r%s" % revision
+      patch_num = len(change_info.GetIssueProperties()['patchsets'])

[M-A Ruel, 2013/02/15 22:43:34]

I'd be fine with:
change_info.RpcServer().get_issue_properties(change_info.issue)

That's save you from a new function that will never be reused.

[iannucci, 2013/02/15 23:09:00]

Done. (Though it made the test a little (more) awkward :))

[M-A Ruel, 2013/02/15 23:12:08]

As you prefer

+      comment = "Committed patch #%d manually as r%s" % (patch_num, revision)

[M-A Ruel, 2013/02/15 22:43:34]

s/patch/patchset/

[iannucci, 2013/02/15 23:09:00]

Done.

       comment += ' (presubmit successful).' if not bypassed else '.'
       change_info.AddComment(comment)
   return 0
 
 
 def CMDchange(args):
   """Creates or edits a changelist.
 
   Only scans the current directory and subdirectories.
   """
@@ skipping 45 matching lines @@
   file_re = re.compile(r"^[a-z].+\Z", re.IGNORECASE)
   affected_files = [x for x in other_files if file_re.match(x[0])]
   unaffected_files = [x for x in other_files if not file_re.match(x[0])]
 
   description = description.rstrip() + '\n'
 
   separator1 = ("\n---All lines above this line become the description.\n"
                 "---Repository Root: " + change_info.GetLocalRoot() + "\n"
                 "---Paths in this changelist (" + change_info.name + "):\n")
   separator2 = "\n\n---Paths modified but not in any changelist:\n\n"
-  
+
   text = (description + separator1 + '\n' +
           '\n'.join([f[0] + f[1] for f in change_info.GetFiles()]))
 
   if change_info.Exists():
     text += (separator2 +
             '\n'.join([f[0] + f[1] for f in affected_files]) + '\n')
   else:
     text += ('\n'.join([f[0] + f[1] for f in affected_files]) + '\n' +
             separator2)
   text += '\n'.join([f[0] + f[1] for f in unaffected_files]) + '\n'
@@ skipping 342 matching lines @@
       raise
     print >> sys.stderr, (
         'AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
         'and retry or visit go/isgaeup.\n%s') % (e.code, str(e))
     return 1
 
 
 if __name__ == "__main__":
   fix_encoding.fix_encoding()
   sys.exit(main(sys.argv[1:]))