[update-checkout] Perform following rename: config['repositories'][repo]['{name,remote-repo-name}']

This makes it absolutely clear when reading the config file that this is a name on the remote server.

Author: gottesmm

utils/update-checkout

@@ -78,7 +78,6 @@ def obtain_additional_swift_sources(
     with shell.pushd(SWIFT_SOURCE_ROOT, dry_run=False,
                      echo=False):
         for dir_name, repo_info in config['repositories'].items():
-            repo = repo_info['name']
             if dir_name in skip_repositories:
                 print("--- Skipping '" + dir_name + "' ---")
                 continue
@@ -92,10 +91,13 @@ def obtain_additional_swift_sources(
             # 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_repo_name = repo_info['remote-repo-name']
+                if with_ssh is True or 'https-clone-pattern' not in config:
+                    remote = config['ssh-clone-pattern'] % remote_repo_name
+                else:
+                    remote = config['https-clone-pattern'] % remote_repo_name
+
             if skip_history:
                 shell.call(['git', 'clone', '--recursive', '--depth', '1',
                             remote, dir_name], echo=False)

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": { "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" }
+        "llvm": { "remote-repo-name": "apple/swift-llvm" },
+        "clang": { "remote-repo-name": "apple/swift-clang" },
+        "swift": { "remote-repo-name": "apple/swift-swift" },
+        "lldb": { "remote-repo-name": "apple/swift-lldb" },
+        "cmark": { "remote-repo-name": "apple/swift-cmark" },
+        "llbuild": { "remote-repo-name": "apple/swift-llbuild" },
+        "swiftpm": { "remote-repo-name": "apple/swift-package-manager" },
+        "compiler-rt": { "remote-repo-name": "apple/swift-compiler-rt" },
+        "swift-corelibs-xctest": { "remote-repo-name": "apple/swift-corelibs-xctest" },
+        "swift-corelibs-foundation": { "remote-repo-name": "apple/swift-corelibs-foundation" },
+        "swift-corelibs-libdispatch": { "remote-repo-name": "apple/swift-corelibs-libdispatch" },
+        "swift-integration-tests": { "remote-repo-name": "apple/swift-integration-tests" }
     },
     "branch-names": ["master-branches", "next-branches", "swift-3.0-preview-1-branches", "swift-3.0-preview-2-branches"],
     "default-branch-alias": "master",