commit 97d9587d16b988f839c515c2c0165a7331a65624
author David James <davidjames@chromium.org> Fri Nov 16 15:09:56 2012 -0800
committer Gerrit <chrome-bot@google.com> Mon Nov 19 16:58:11 2012 -0800
tree 88d5ba4dadef7ed2d66d095a0b9a694c760e0356
parent 52a81b69499e70e916f8e11f83e4c2c05c9b80c7

Move git-related functionality out of cros_build_lib (1 of 4).

cros_build_lib is starting to get really long -- it's now 2279 lines. This CL
moves git-related functionality out of cros_build_lib into git.py, reducing the
size and complexity of cros_build_lib by over 980 lines.

Note  CL:*29160 and CL:*29161 should also be committed at the same time as this
CL, but CQ is not capable of handling external -> internal dependencies, so we
leave this dependency as implicit.

BUG=none
CQ-DEPEND=CL:38255
TEST=pylint, regexps, run_tests, and lots of trybot runs.
Change-Id: Id6c749df09862a724bef2eee84ca719ed461589c
Reviewed-on: https://gerrit.chromium.org/gerrit/38253
Commit-Ready: David James <davidjames@chromium.org>
Reviewed-by: David James <davidjames@chromium.org>
Tested-by: David James <davidjames@chromium.org>

scripts/cbuildbot.py

diff --git a/scripts/cbuildbot.py b/scripts/cbuildbot.py
index 1b28a16..83cc7a7 100644
--- a/scripts/cbuildbot.py
+++ b/scripts/cbuildbot.py
@@ -36,6 +36,7 @@
 from chromite.lib import commandline
 from chromite.lib import cros_build_lib
 from chromite.lib import gerrit
+from chromite.lib import git
 from chromite.lib import osutils
 from chromite.lib import patch as cros_patch
 from chromite.lib import sudo
@@ -115,7 +116,7 @@
         cros_build_lib.Warning('Patch %s has already been merged.' % str(patch))
 
   if options.local_patches:
-    manifest = cros_build_lib.ManifestCheckout.Cached(options.sourceroot)
+    manifest = git.ManifestCheckout.Cached(options.sourceroot)
     local_patches = cros_patch.PrepareLocalPatches(manifest,
                                                    options.local_patches)
 
@@ -266,7 +267,7 @@
     stage = None
     chromite_pool = self.patch_pool.Filter(project=constants.CHROMITE_PROJECT)
     manifest_pool = self.patch_pool.FilterManifest()
-    chromite_branch = cros_build_lib.GetChromiteTrackingBranch()
+    chromite_branch = git.GetChromiteTrackingBranch()
     if (chromite_pool or manifest_pool or self.options.test_bootstrap
         or chromite_branch != self.options.branch):
       stage = stages.BootstrapStage(self.options, self.build_config,
@@ -586,7 +587,7 @@
     sourceroot: The checkout where patches are coming from.
   """
   verified_patches = []
-  manifest = cros_build_lib.ManifestCheckout.Cached(sourceroot)
+  manifest = git.ManifestCheckout.Cached(sourceroot)
   for patch in local_patches:
     components = patch.split(':')
     if len(components) > 2:
@@ -603,12 +604,12 @@
 
     # If no branch was specified, we use the project's current branch.
     if len(components) == 1:
-      branch = cros_build_lib.GetCurrentBranch(project_dir)
+      branch = git.GetCurrentBranch(project_dir)
       if not branch:
         cros_build_lib.Die('Project %s is not on a branch!' % project)
     else:
       branch = components[1]
-      if not cros_build_lib.DoesLocalBranchExist(project_dir, branch):
+      if not git.DoesLocalBranchExist(project_dir, branch):
         cros_build_lib.Die('Project %s does not have branch %s'
                            % (project, branch))
 
@@ -1020,7 +1021,7 @@
     options/args: The options/args object returned by optparse
   """
   if not options.branch:
-    options.branch = cros_build_lib.GetChromiteTrackingBranch()
+    options.branch = git.GetChromiteTrackingBranch()
 
   if not repository.IsARepoRoot(options.sourceroot):
     if options.local_patches: