Refactor ChangeLog generation for push-to-trunk script.

tools/push-to-trunk/common_includes.py

 #!/usr/bin/env python
 # Copyright 2013 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
@@ skipping 57 matching lines @@
 
 
 def GetLastChangeLogEntries(change_log_file):
   result = []
   for line in LinesInFile(change_log_file):
     if re.search(r"^\d{4}-\d{2}-\d{2}:", line) and result: break
     result.append(line)
   return "".join(result)
 
 
+def MakeChangeLogBody(commit_generator):
+  result = ""
+  for (title, body, author) in commit_generator():
+    # Add the commit's title line.
+    result += "%s\n" % title.rstrip()
+
+    # Grep for "BUG=xxxx" lines in the commit message and convert them to
+    # "(issue xxxx)".
+    out = body.splitlines()
+    out = filter(lambda x: re.search(r"^BUG=", x), out)
+    out = filter(lambda x: not re.search(r"BUG=$", x), out)
+    out = filter(lambda x: not re.search(r"BUG=none$", x), out)
+
+    # TODO(machenbach): Handle multiple entries (e.g. BUG=123, 234).
+    def FormatIssue(text):
+      text = re.sub(r"BUG=v8:(.*)$", r"(issue \1)", text)
+      text = re.sub(r"BUG=chromium:(.*)$", r"(Chromium issue \1)", text)
+      text = re.sub(r"BUG=(.*)$", r"(Chromium issue \1)", text)
+      return "        %s\n" % text
+
+    for line in map(FormatIssue, out):
+      result += line
+
+    # Append the commit's author for reference.
+    result += "%s\n\n" % author.rstrip()
+  return result
+
+
 # Some commands don't like the pipe, e.g. calling vi from within the script or
 # from subscripts like git cl upload.
 def Command(cmd, args="", prefix="", pipe=True):
   cmd_line = "%s %s %s" % (prefix, cmd, args)
   print "Command: %s" % cmd_line
   try:
     if pipe:
       return subprocess.check_output(cmd_line, shell=True)
     else:
       return subprocess.check_call(cmd_line, shell=True)
@@ skipping 200 matching lines @@
 class UploadStep(Step):
   def __init__(self):
     Step.__init__(self, "Upload for code review.")
 
   def RunStep(self):
     print "Please enter the email address of a V8 reviewer for your patch: ",
     reviewer = self.ReadLine()
     args = "cl upload -r \"%s\" --send-mail" % reviewer
     if self.Git(args,pipe=False) is None:
       self.Die("'git cl upload' failed, please try again.")