Reviewers: jarin,

Message:
PTAL

Description:
Correctly overwrite author in chromium roll script.

BUG=408523
LOG=n
[email protected]

Please review this at https://codereview.chromium.org/535073002/

SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge

Affected files (+7, -3 lines):
  M tools/push-to-trunk/chromium_roll.py
  M tools/push-to-trunk/git_recipes.py
  M tools/push-to-trunk/test_scripts.py


Index: tools/push-to-trunk/chromium_roll.py
diff --git a/tools/push-to-trunk/chromium_roll.py b/tools/push-to-trunk/chromium_roll.py index 03f18f6e605ac58c7f0441699da85093a6e93037..e6c3086bd17439cf3a70d50f2dda15728d1ba616 100755
--- a/tools/push-to-trunk/chromium_roll.py
+++ b/tools/push-to-trunk/chromium_roll.py
@@ -86,7 +86,8 @@ class UploadCL(Step):
sheriff = ("\n\nPlease reply to the V8 sheriff %s in case of problems."
                  % self["sheriff"])
     self.GitCommit("%s%s\n\nTBR=%s" %
-                   (commit_title, sheriff, self._options.reviewer))
+                       (commit_title, sheriff, self._options.reviewer),
+                   author=self._options.author)
     if not self._options.dry_run:
       self.GitUpload(author=self._options.author,
                      force=True,
Index: tools/push-to-trunk/git_recipes.py
diff --git a/tools/push-to-trunk/git_recipes.py b/tools/push-to-trunk/git_recipes.py index 1cbd8f5149802498e3d91fecc2d5f50a9c595ca9..96fa05acf64934d39ed6be06ccc2ff85cfd1d77b 100644
--- a/tools/push-to-trunk/git_recipes.py
+++ b/tools/push-to-trunk/git_recipes.py
@@ -167,13 +167,15 @@ class GitRecipesMixin(object):
     # base files were uploaded, if not retry.
     self.Git(MakeArgs(args), pipe=False)

-  def GitCommit(self, message="", file_name=""):
+  def GitCommit(self, message="", file_name="", author=None):
     assert message or file_name
     args = ["commit"]
     if file_name:
       args += ["-aF", Quoted(file_name)]
     if message:
       args += ["-am", Quoted(message)]
+    if author:
+      args += ["--author", "\"%s <%s>\"" % (author, author)]
     self.Git(MakeArgs(args))

   def GitPresubmit(self):
Index: tools/push-to-trunk/test_scripts.py
diff --git a/tools/push-to-trunk/test_scripts.py b/tools/push-to-trunk/test_scripts.py index 71b8a055102d8517f3580ed571526b0226da79cf..bb41cf1c8c954166699244b4dc0c77e76af38128 100644
--- a/tools/push-to-trunk/test_scripts.py
+++ b/tools/push-to-trunk/test_scripts.py
@@ -842,7 +842,8 @@ def get_list():
       Cmd(("git commit -am \"Update V8 to version 3.22.5 "
            "(based on bleeding_edge revision r123454).\n\n"
            "Please reply to the V8 sheriff [email protected] in "
-           "case of problems.\n\[email protected]\""),
+           "case of problems.\n\[email protected]\" "
+           "--author \"[email protected] <[email protected]>\""),
           ""),
Cmd("git cl upload --send-mail --email \"[email protected]\" -f", ""),
     ]


--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to