Fix push script for autoroll account.

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 382 matching lines @@
     return "origin/master"
 
   def RemoteCandidateBranch(self):
     return "origin/candidates"
 
   def RemoteBranch(self, name):
     if name in ["candidates", "master"]:
       return "origin/%s" % name
     return "branch-heads/%s" % name
 
+  def PushRef(self, ref):
+    self.step.Git("push origin %s" % ref)
+
   def Tag(self, tag, remote, message):
     # Wait for the commit to appear. Assumes unique commit message titles (this
     # is the case for all automated merge and push commits - also no title is
     # the prefix of another title).
     commit = None
     for wait_interval in [3, 7, 15, 35, 35]:
       self.step.Git("fetch")
       commit = self.step.GitLog(n=1, format="%H", grep=message, branch=remote)
       if commit:
         break
       print("The commit has not replicated to git. Waiting for %s seconds." %
             wait_interval)
       self.step._side_effect_handler.Sleep(wait_interval)
     else:
       self.step.Die("Couldn't determine commit for setting the tag. Maybe the "
                     "git updater is lagging behind?")
 
     self.step.Git("tag %s %s" % (tag, commit))
-    self.step.Git("push origin %s" % tag)
+    self.PushRef(tag)
 
 
 class GitReadSvnWriteInterface(GitTagsOnlyMixin, GitSvnInterface):
   pass
 
 
 class GitInterface(GitTagsOnlyMixin):
   def Fetch(self):
     self.step.Git("fetch")
 
   def GitSvn(self, hsh, branch=""):
     return ""
 
   def SvnGit(self, rev, branch=""):
     raise NotImplementedError()
 
   def Land(self):
+    # FIXME(machenbach): This will not work with checkouts from bot_update
+    # after flag day because it will push to the cache. Investigate if it
+    # will work with "cl land".
     self.step.Git("push origin")
 
   def CLLand(self):
     self.step.GitCLLand()
 
+  def PushRef(self, ref):
+    self.step.Git("push https://chromium.googlesource.com/v8/v8 %s" % ref)
+
 
 VC_INTERFACES = {
   "git_svn": GitSvnInterface,
   "git_read_svn_write": GitReadSvnWriteInterface,
   "git": GitInterface,
 }
 
 
 class Step(GitRecipesMixin):
   def __init__(self, text, number, config, state, options, handler):
@@ skipping 261 matching lines @@
         line = re.sub("\d+$", self[prefix + "patch"], line)
       output += "%s\n" % line
     TextToFile(output, version_file)
 
   def SVNCommit(self, root, commit_message):
     patch = self.GitDiff("HEAD^", "HEAD")
     TextToFile(patch, self._config["PATCH_FILE"])
     self.Command("svn", "update", cwd=self._options.svn)
     if self.Command("svn", "status", cwd=self._options.svn) != "":
       self.Die("SVN checkout not clean.")
     if not self.Command("patch", "-d %s -p1 -i %s" %

[Michael Achenbach, 2014/11/02 12:47:03]

Just wondering: Will removing files work?

                         (root, self._config["PATCH_FILE"]),
                         cwd=self._options.svn):
       self.Die("Could not apply patch.")
+    # Recursively add possibly newly added files.
+    self.Command("svn", "add --force %s" % root, cwd=self._options.svn)
     self.Command(
         "svn",
         "commit --non-interactive --username=%s --config-dir=%s -m \"%s\"" %
             (self._options.author, self._options.svn_config, commit_message),
         cwd=self._options.svn)
 
 
 class UploadStep(Step):
   MESSAGE = "Upload for code review."
 
@@ skipping 163 matching lines @@
     for (number, step_class) in enumerate(step_classes):
       steps.append(MakeStep(step_class, number, self._state, self._config,
                             options, self._side_effect_handler))
     for step in steps[options.step:]:
       if step.Run():
         return 0
     return 0
 
   def Run(self, args=None):
     return self.RunSteps(self._Steps(), args)