commit 5c7dffc9a7dc1d06f4687548c46a6411449c0eac
author Don Garrett <dgarrett@google.com> Tue Oct 28 20:28:08 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Wed Oct 29 06:41:17 2014 +0000
tree 09786d64243facc7bf1d2296ccf07c5c35ffc996
parent 5f58cbb23337bca3332cf79ebaf92f7d6272dc08

Constants: Mark kayle-cros-internal as branchable.

Allow us to push branches to the Kayle remotes despite their special
handling.

Also make an assert in git.py more informative in case it ever fires
again.

CQ-DEPEND=CL:*181620
BUG=chromium:428051
TEST=Unittests (not much)

Change-Id: I10f71786e66dbee6948eaf889d038afdd1a322f1
Reviewed-on: https://chromium-review.googlesource.com/226164
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Commit-Queue: Don Garrett <dgarrett@chromium.org>
Tested-by: Don Garrett <dgarrett@chromium.org>

cbuildbot/constants.py

diff --git a/cbuildbot/constants.py b/cbuildbot/constants.py
index 03904f9..778322f 100644
--- a/cbuildbot/constants.py
+++ b/cbuildbot/constants.py
@@ -160,6 +160,8 @@
 # CrOS remotes specified in the manifests.
 EXTERNAL_REMOTE = 'cros'
 INTERNAL_REMOTE = 'cros-internal'
+# TODO(dgarrett): Reconsider when crbug.com/428215 is fixed.
+KAYLE_INTERNAL_REMOTE = 'kayle-cros-internal'
 CHROMIUM_REMOTE = 'chromium'
 CHROME_REMOTE = 'chrome'
 
@@ -168,9 +170,11 @@
     INTERNAL_REMOTE: INTERNAL_GERRIT_HOST,
 }
 
+# Only remotes listed in CROS_REMOTES are considered branchable.
 CROS_REMOTES = {
     EXTERNAL_REMOTE: EXTERNAL_GOB_URL,
     INTERNAL_REMOTE: INTERNAL_GOB_URL,
+    KAYLE_INTERNAL_REMOTE: INTERNAL_GOB_URL,
 }
 
 GIT_REMOTES = {

lib/git.py

diff --git a/lib/git.py b/lib/git.py
index e80d194..1e77c63 100644
--- a/lib/git.py
+++ b/lib/git.py
@@ -362,7 +362,7 @@
       manifest_include_dir: If given, this is where to start looking for
         include targets.
     """
-
+    self.source = source
     self.default = {}
     self.checkouts_by_path = {}
     self.checkouts_by_name = {}
@@ -423,7 +423,8 @@
       attrs.setdefault(key, self.default.get(key))
 
     remote = attrs['remote']
-    assert remote in self.remotes
+    assert remote in self.remotes, ('%s: %s not in %s' %
+        (self.source, remote, self.remotes))
     remote_name = attrs['remote_alias'] = self.remotes[remote]['alias']
 
     # 'repo manifest -r' adds an 'upstream' attribute to the project tag for the