Fix landing candidate pushes.

tools/push-to-trunk/push_to_trunk.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 33 matching lines @@
     self.InitialEnvironmentChecks(self.default_cwd)
     self.CommonPrepare()
 
     if(self["current_branch"] == self.Config("TRUNKBRANCH")
        or self["current_branch"] == self.Config("BRANCHNAME")):
       print "Warning: Script started on branch %s" % self["current_branch"]
 
     self.PrepareBranch()
     self.DeleteBranch(self.Config("TRUNKBRANCH"))
 
-    # Allow directly pushing to candidates.
-    if not self.Git("config --get remote.origin.push").strip():
-      self.Git("config --add remote.origin.push "
-               "refs/remotes/origin/candidates:refs/pending/heads/candidates")

[tandrii(chromium), 2014/11/13 13:18:50]

yeah :(

-
 
 class FreshBranch(Step):
   MESSAGE = "Create a fresh branch."
 
   def RunStep(self):
     self.GitCreateBranch(self.Config("BRANCHNAME"),
                          self.vc.RemoteMasterBranch())
 
 
 class PreparePushRevision(Step):
@@ skipping 279 matching lines @@
     if not self.Confirm("Please check if your local checkout is sane: Inspect "
         "%s, compile, run tests. Do you want to commit this new trunk "
         "revision to the repository?" % VERSION_FILE):
       self.Die("Execution canceled.")  # pragma: no cover
 
 
 class Land(Step):
   MESSAGE = "Land the patch."
 
   def RunStep(self):
-    self.vc.Land()
+    self.vc.CLLand()
 
 
 class TagRevision(Step):
   MESSAGE = "Tag the new revision."
 
   def RunStep(self):
     self.vc.Tag(
         self["version"], self.vc.RemoteCandidateBranch(), self["commit_title"])
 
 
@@ skipping 68 matching lines @@
       CommitTrunk,
       SanityCheck,
       Land,
       TagRevision,
       CleanUp,
     ]
 
 
 if __name__ == "__main__":  # pragma: no cover
   sys.exit(PushToTrunk().Run())