Merge pull request #2927 from gottesmm/finish-fixing-update-checkout-to-use-config-file

Finish fixing update checkout to use config file

Author: gottesmm

utils/update-checkout

@@ -56,26 +56,32 @@ def update_working_copy(repo_path, branch):
 
 def obtain_additional_swift_sources(
         config, with_ssh, branch, skip_history, skip_repositories):
-    for dir_name, repo in config['repositories'].items():
+    for dir_name, repo_info in config['repositories'].items():
+        repo = repo_info['name']
         if dir_name in skip_repositories:
             print("--- Skipping '" + dir_name + "' ---")
             continue
         with shell.pushd(SWIFT_SOURCE_ROOT, dry_run=False,
                          echo=False):
             if not os.path.isdir(os.path.join(dir_name, ".git")):
                 print("--- Cloning '" + dir_name + "' ---")
-                if with_ssh is True or "https_clone_pattern" not in config:
-                    remote = config["ssh_clone_pattern"] % repo
+
+                # If we have a url override, use that url instead of
+                # interpolating.
+                if 'url' in repo_info:
+                    remote = repo_info['url']
+                elif with_ssh is True or 'https-clone-pattern' not in config:
+                    remote = config['ssh-clone-pattern'] % repo
                 else:
-                    remote = config["https_clone_pattern"] % repo
+                    remote = config['https-clone-pattern'] % repo
                 if skip_history:
                     shell.call(['git', 'clone', '--recursive', '--depth', '1',
                                 remote, dir_name], echo=False)
                 else:
                     shell.call(['git', 'clone', '--recursive', remote,
                                 dir_name], echo=False)
                 if branch:
-                    for config_branch_name in config['branch_names']:
+                    for config_branch_name in config['branch-names']:
                         if branch not in config[config_branch_name]['aliases']:
                             continue
                         repo_branch = \
@@ -91,9 +97,9 @@ def obtain_additional_swift_sources(
 
 
 def validate_config(config):
-    # Make sure that our branch_names are unique.
-    if len(config['branch_names']) != len(set(config['branch_names'])):
-        raise RuntimeError('Configuration file has duplicate \'branch_names\'')
+    # Make sure that our branch-names are unique.
+    if len(config['branch-names']) != len(set(config['branch-names'])):
+        raise RuntimeError('Configuration file has duplicate \'branch-names\'')
 
     # Then make sure the alias names used by our branches are unique.
     #
@@ -102,7 +108,7 @@ def validate_config(config):
     # the union of the sets. We have uniqueness if the length of the union
     # equals the length of the sum of the counts.
     data = [(len(config[branch]['aliases']), set(config[branch]['aliases']))
-            for branch in config['branch_names']]
+            for branch in config['branch-names']]
     result = reduce(lambda acc, x: (acc[0] + x[0], acc[1] | x[1]), data,
                     (0, set([])))
     if result[0] == len(result[1]):
@@ -153,6 +159,11 @@ By default, updates your checkouts of Swift, SourceKit, LLDB, and SwiftPM.""")
         config = json.load(f)
     validate_config(config)
 
+    # If branch is None, default to using the default branch alias specified by
+    # our configuration file.
+    if branch is None:
+        branch = config['default-branch-alias']
+
     if clone or clone_with_ssh:
         obtain_additional_swift_sources(
             config, clone_with_ssh, branch, skip_history, args.skip_repository)
@@ -163,7 +174,7 @@ By default, updates your checkouts of Swift, SourceKit, LLDB, and SwiftPM.""")
             print("--- Skipping '" + dir_name + "' ---")
             continue
         if branch:
-            for config_branch_name in config['branch_names']:
+            for config_branch_name in config['branch-names']:
                 if branch not in config[config_branch_name]['aliases']:
                     continue
                 repo_branch = config[config_branch_name]['repos'][dir_name]

utils/update-checkout-config.json

@@ -1,21 +1,22 @@
 {
-    "ssh_clone_pattern": "[email protected]:%s.git",
-    "https_clone_pattern": "https://github.com/%s.git",
+    "ssh-clone-pattern": "[email protected]:%s.git",
+    "https-clone-pattern": "https://github.com/%s.git",
     "repositories" : {
-        "llvm": "apple/swift-llvm",
-        "clang": "apple/swift-clang",
-        "swift": "apple/swift-swift",
-        "lldb": "apple/swift-lldb",
-        "cmark": "apple/swift-cmark",
-        "llbuild": "apple/swift-llbuild",
-        "swiftpm": "apple/swift-package-manager",
-        "compiler-rt": "apple/swift-compiler-rt",
-        "swift-corelibs-xctest": "apple/swift-corelibs-xctest",
-        "swift-corelibs-foundation": "apple/swift-corelibs-foundation",
-        "swift-corelibs-libdispatch": "apple/swift-corelibs-libdispatch",
-        "swift-integration-tests": "apple/swift-integration-tests"
+        "llvm": { "name": "apple/swift-llvm" },
+        "clang": { "name": "apple/swift-clang" },
+        "swift": { "name": "apple/swift-swift" },
+        "lldb": { "name": "apple/swift-lldb" },
+        "cmark": { "name": "apple/swift-cmark" },
+        "llbuild": { "name": "apple/swift-llbuild" },
+        "swiftpm": { "name": "apple/swift-package-manager" },
+        "compiler-rt": { "name": "apple/swift-compiler-rt" },
+        "swift-corelibs-xctest": { "name": "apple/swift-corelibs-xctest" },
+        "swift-corelibs-foundation": { "name": "apple/swift-corelibs-foundation" },
+        "swift-corelibs-libdispatch": { "name": "apple/swift-corelibs-libdispatch" },
+        "swift-integration-tests": { "name": "apple/swift-integration-tests" }
     },
-    "branch_names": ["master-branches", "next-branches", "swift-3.0-preview-1-branches"],
+    "branch-names": ["master-branches", "next-branches", "swift-3.0-preview-1-branches"],
+    "default-branch-alias": "master",
     "master-branches": {
         "aliases": ["master", "stable"],
         "repos": {