[update-checkout] Allow the config file to specify a per repo overriding url.

Author: gottesmm

utils/update-checkout

@@ -56,15 +56,21 @@ 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:
+
+                # 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

utils/update-checkout-config.json

@@ -2,18 +2,18 @@
     "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"],
     "default-branch-alias": "master",