Refactoring: Extract low-level git from push and merge scripts.

tools/push-to-trunk/merge_to_branch.py

 #!/usr/bin/env python
 # Copyright 2014 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 39 matching lines @@
 }
 
 
 class MergeToBranchOptions(CommonOptions):
   def __init__(self, options, args):
     super(MergeToBranchOptions, self).__init__(options, True)
     self.requires_editor = True
     self.wait_for_lgtm = True
     self.delete_sentinel = options.f
     self.message = getattr(options, "message", "")
-    self.revert = "--reverse" if getattr(options, "r", None) else ""
+    self.revert = getattr(options, "r", False)
     self.revert_bleeding_edge = getattr(options, "revert_bleeding_edge", False)
     self.patch = getattr(options, "p", "")
     self.args = args
 
 
 class Preparation(Step):
   MESSAGE = "Preparation."
 
   def RunStep(self):
     if os.path.exists(self.Config(ALREADY_MERGING_SENTINEL_FILE)):
@@ skipping 13 matching lines @@
       self.Die("Please specify a branch to merge to")
 
     self.CommonPrepare()
     self.PrepareBranch()
 
 
 class CreateBranch(Step):
   MESSAGE = "Create a fresh branch for the patch."
 
   def RunStep(self):
-    self.Git("checkout -b %s svn/%s" % (self.Config(BRANCHNAME),
-                                        self["merge_to_branch"]))
+    self.GitCreateBranch(self.Config(BRANCHNAME),
+                         "svn/%s" % self["merge_to_branch"])
 
 
 class SearchArchitecturePorts(Step):
   MESSAGE = "Search for corresponding architecture ports."
 
   def RunStep(self):
     self["full_revision_list"] = list(OrderedDict.fromkeys(self._options.args))
     port_revision_list = []
     for revision in self["full_revision_list"]:
       # Search for commits which matches the "Port rXXX" pattern.
-      args = ("log svn/bleeding_edge --reverse "
-              "--format=%%H --grep=\"Port r%d\"" % int(revision))
-      git_hashes = self.Git(args) or ""
-      for git_hash in git_hashes.strip().splitlines():
-        args = "svn find-rev %s svn/bleeding_edge" % git_hash
-        svn_revision = self.Git(args).strip()
+      git_hashes = self.GitLog(reverse=True, format="%H",
+                               grep="Port r%d" % int(revision),
+                               branch="svn/bleeding_edge")
+      for git_hash in git_hashes.splitlines():
+        svn_revision = self.GitSVNFindSVNRev(git_hash, "svn/bleeding_edge")
         if not svn_revision:
           self.Die("Cannot determine svn revision for %s" % git_hash)
-        revision_title = self.Git("log -1 --format=%%s %s" % git_hash)
+        revision_title = self.GitLog(n=1, format="%s", git_hash=git_hash)
 
         # Is this revision included in the original revision list?
         if svn_revision in self["full_revision_list"]:
           print("Found port of r%s -> r%s (already included): %s"
                 % (revision, svn_revision, revision_title))
         else:
           print("Found port of r%s -> r%s: %s"
                 % (revision, svn_revision, revision_title))
           port_revision_list.append(svn_revision)
 
     # Do we find any port?
     if len(port_revision_list) > 0:
       if self.Confirm("Automatically add corresponding ports (%s)?"
                       % ", ".join(port_revision_list)):
         #: 'y': Add ports to revision list.
         self["full_revision_list"].extend(port_revision_list)
 
 
 class FindGitRevisions(Step):
   MESSAGE = "Find the git revisions associated with the patches."
 
   def RunStep(self):
     self["patch_commit_hashes"] = []
     for revision in self["full_revision_list"]:
-      next_hash = self.Git("svn find-rev \"r%s\" svn/bleeding_edge" % revision)
+      next_hash = self.GitSVNFindGitHash(revision, "svn/bleeding_edge")
       if not next_hash:
         self.Die("Cannot determine git hash for r%s" % revision)
       self["patch_commit_hashes"].append(next_hash)
 
     # Stringify: [123, 234] -> "r123, r234"
     self["revision_list"] = ", ".join(map(lambda s: "r%s" % s,
                                       self["full_revision_list"]))
 
     if not self["revision_list"]:
       self.Die("Revision list is empty.")
 
     if self._options.revert:
       if not self._options.revert_bleeding_edge:
         self["new_commit_msg"] = ("Rollback of %s in %s branch."
             % (self["revision_list"], self["merge_to_branch"]))
       else:
         self["new_commit_msg"] = "Revert %s." % self["revision_list"]
     else:
       self["new_commit_msg"] = ("Merged %s into %s branch."
           % (self["revision_list"], self["merge_to_branch"]))
     self["new_commit_msg"] += "\n\n"
 
     for commit_hash in self["patch_commit_hashes"]:
-      patch_merge_desc = self.Git("log -1 --format=%%s %s" % commit_hash)
-      self["new_commit_msg"] += "%s\n\n" % patch_merge_desc.strip()
+      patch_merge_desc = self.GitLog(n=1, format="%s", git_hash=commit_hash)
+      self["new_commit_msg"] += "%s\n\n" % patch_merge_desc
 
     bugs = []
     for commit_hash in self["patch_commit_hashes"]:
-      msg = self.Git("log -1 %s" % commit_hash)
+      msg = self.GitLog(n=1, git_hash=commit_hash)
       for bug in re.findall(r"^[ \t]*BUG[ \t]*=[ \t]*(.*?)[ \t]*$", msg,
                             re.M):
         bugs.extend(map(lambda s: s.strip(), bug.split(",")))
     bug_aggregate = ",".join(sorted(bugs))
     if bug_aggregate:
       self["new_commit_msg"] += "BUG=%s\nLOG=N\n" % bug_aggregate
     TextToFile(self["new_commit_msg"], self.Config(COMMITMSG_FILE))
 
 
 class ApplyPatches(Step):
   MESSAGE = "Apply patches for selected revisions."
 
   def RunStep(self):
     for commit_hash in self["patch_commit_hashes"]:
       print("Applying patch for %s to %s..."
             % (commit_hash, self["merge_to_branch"]))
-      patch = self.Git("log -1 -p %s" % commit_hash)
+      patch = self.GitLog(n=1, patch=True, git_hash=commit_hash)
       TextToFile(patch, self.Config(TEMPORARY_PATCH_FILE))
       self.ApplyPatch(self.Config(TEMPORARY_PATCH_FILE), self._options.revert)
     if self._options.patch:
       self.ApplyPatch(self._options.patch, self._options.revert)
 
 
 class PrepareVersion(Step):
   MESSAGE = "Prepare version file."
 
   def RunStep(self):
@@ skipping 21 matching lines @@
       TextToFile(text, self.Config(VERSION_FILE))
     else:
       self.Editor(self.Config(VERSION_FILE))
     self.ReadAndPersistVersion("new_")
 
 
 class CommitLocal(Step):
   MESSAGE = "Commit to local branch."
 
   def RunStep(self):
-    self.Git("commit -a -F \"%s\"" % self.Config(COMMITMSG_FILE))
+    self.GitCommit(file_name=self.Config(COMMITMSG_FILE))
 
 
 class CommitRepository(Step):
   MESSAGE = "Commit to the repository."
 
   def RunStep(self):
-    self.Git("checkout %s" % self.Config(BRANCHNAME))
+    self.GitCheckout(self.Config(BRANCHNAME))
     self.WaitForLGTM()
-    self.Git("cl presubmit", "PRESUBMIT_TREE_CHECK=\"skip\"")
-    self.Git("cl dcommit -f --bypass-hooks", retry_on=lambda x: x is None)
+    self.GitPresubmit()
+    self.GitDCommit()
 
 
 class PrepareSVN(Step):
   MESSAGE = "Determine svn commit revision."
 
   def RunStep(self):
     if self._options.revert_bleeding_edge:
       return
-    self.Git("svn fetch")
-    args = ("log -1 --format=%%H --grep=\"%s\" svn/%s"
-            % (self["new_commit_msg"], self["merge_to_branch"]))
-    commit_hash = self.Git(args).strip()
+    self.GitSVNFetch()
+    commit_hash = self.GitLog(n=1, format="%H", grep=self["new_commit_msg"],
+                              branch="svn/%s" % self["merge_to_branch"])
     if not commit_hash:
       self.Die("Unable to map git commit to svn revision.")
-    self["svn_revision"] = self.Git(
-        "svn find-rev %s" % commit_hash).strip()
+    self["svn_revision"] = self.GitSVNFindSVNRev(commit_hash)
     print "subversion revision number is r%s" % self["svn_revision"]
 
 
 class TagRevision(Step):
   MESSAGE = "Create the tag."
 
   def RunStep(self):
     if self._options.revert_bleeding_edge:
       return
     self["version"] = "%s.%s.%s.%s" % (self["new_major"],
@@ skipping 92 matching lines @@
 def Main():
   parser = BuildOptions()
   (options, args) = parser.parse_args()
   if not ProcessOptions(options, args):
     parser.print_help()
     return 1
   RunMergeToBranch(CONFIG, MergeToBranchOptions(options, args))
 
 if __name__ == "__main__":
   sys.exit(Main())