Force branch-scheme aliases to include the scheme name.

Author: gmilos

utils/update-checkout

@@ -97,7 +97,7 @@ def update_repository_to_scheme(
     cross_repo = False
     repo_branch = scheme_name
     # This loop is only correct, since we know that each alias set has
-    # unique contents. This is checked by verify config. Thus the first
+    # unique contents. This is checked by validate_config. Thus the first
     # branch scheme data that has scheme_name as one of its aliases is
     # the only possible correct answer.
     for v in config['branch-schemes'].values():
@@ -241,6 +241,14 @@ def validate_config(config):
     if len(scheme_names) != len(set(scheme_names)):
         raise RuntimeError('Configuration file has duplicate schemes?!')
 
+    # Ensure the branch-scheme name is also an alias
+    # This guarantees sensible behavior of update_repository_to_scheme when
+    # the branch-scheme is passed as the scheme name
+    for scheme_name in config['branch-schemes'].keys():
+        if not scheme_name in config['branch-schemes'][scheme_name]['aliases']:
+            raise RuntimeError('branch-scheme name: "{0}" must be an alias too.'
+                .format(scheme_name))
+
     # Then make sure the alias names used by our branches are unique.
     #
     # We do this by constructing a list consisting of len(names),

utils/update-checkout-config.json

@@ -50,7 +50,7 @@
             }
         },
         "next" : {
-            "aliases": ["master-next", "stable-next"],
+            "aliases": ["next", "master-next", "stable-next"],
             "repos": {
                 "llvm": "stable-next",
                 "clang": "stable-next",
@@ -104,7 +104,7 @@
             }
         },
         "swift-3.0-preview-1" : {
-            "aliases": ["swift-3.0-preview-1-branch"],
+            "aliases": ["swift-3.0-preview-1", "swift-3.0-preview-1-branch"],
             "repos": {
                 "llvm": "swift-3.0-branch",
                 "clang": "swift-3.0-branch",
@@ -121,7 +121,7 @@
             }
         },
         "swift-3.0-preview-2" : {
-            "aliases": ["swift-3.0-preview-2-branch"],
+            "aliases": ["swift-3.0-preview-2", "swift-3.0-preview-2-branch"],
             "repos": {
                 "llvm": "swift-3.0-branch",
                 "clang": "swift-3.0-branch",
@@ -138,7 +138,7 @@
             }
         },
         "swift-3.0-preview-3" : {
-            "aliases": ["swift-3.0-preview-3-branch"],
+            "aliases": ["swift-3.0-preview-3", "swift-3.0-preview-3-branch"],
             "repos": {
                 "llvm": "swift-3.0-branch",
                 "clang": "swift-3.0-branch",
@@ -155,7 +155,7 @@
             }
         },
         "swift-3.0-preview-4" : {
-            "aliases": ["swift-3.0-preview-4-branch"],
+            "aliases": ["swift-3.0-preview-4", "swift-3.0-preview-4-branch"],
             "repos": {
                 "llvm": "swift-3.0-branch",
                 "clang": "swift-3.0-branch",
@@ -173,7 +173,7 @@
             }
         },
         "swift-3.0-preview-5" : {
-            "aliases": ["swift-3.0-preview-5-branch"],
+            "aliases": ["swift-3.0-preview-5", "swift-3.0-preview-5-branch"],
             "repos": {
                 "llvm": "swift-3.0-branch",
                 "clang": "swift-3.0-branch",