[update-checkout] Small refactoring to make it clear that config['repos'] contains generic repo information, not just remote information.

I was trying to get this right a bit ago, but I remained unhappy with the
result. This at least makes it clear when reading the config file that
config['repos'].keys() serves in the code as the "source" of the names of
repositories.

Author: gottesmm

utils/update-checkout

@@ -58,7 +58,7 @@ def update_single_repository(repo_path, branch):
 
 def update_all_repositories(args, config, scheme_name):
     repo_branch = scheme_name
-    for repo_name in config["repositories"].keys():
+    for repo_name in config['repos'].keys():
         if repo_name in args.skip_repository:
             print("--- Skipping '" + repo_name + "' ---")
             continue
@@ -81,45 +81,46 @@ def obtain_additional_swift_sources(
         config, with_ssh, scheme_name, skip_history, skip_repositories):
     with shell.pushd(SWIFT_SOURCE_ROOT, dry_run=False,
                      echo=False):
-        for dir_name, repo_info in config['repositories'].items():
-            if dir_name in skip_repositories:
-                print("--- Skipping '" + dir_name + "' ---")
+        for repo_name, repo_info in config['repos'].items():
+            if repo_name in skip_repositories:
+                print("--- Skipping '" + repo_name + "' ---")
                 continue
 
-            if os.path.isdir(os.path.join(dir_name, ".git")):
+            if os.path.isdir(os.path.join(repo_name, ".git")):
                 continue
 
-            print("--- Cloning '" + dir_name + "' ---")
+            print("--- Cloning '" + repo_name + "' ---")
 
             # If we have a url override, use that url instead of
             # interpolating.
-            if 'url' in repo_info:
-                remote = repo_info['url']
+            remote_repo_info = repo_info['remote']
+            if 'url' in remote_repo_info:
+                remote = remote_repo_info['url']
             else:
-                remote_repo_name = repo_info['remote-repo-name']
+                remote_repo_id = remote_repo_info['id']
                 if with_ssh is True or 'https-clone-pattern' not in config:
-                    remote = config['ssh-clone-pattern'] % remote_repo_name
+                    remote = config['ssh-clone-pattern'] % remote_repo_id
                 else:
-                    remote = config['https-clone-pattern'] % remote_repo_name
+                    remote = config['https-clone-pattern'] % remote_repo_id
 
             if skip_history:
                 shell.call(['git', 'clone', '--recursive', '--depth', '1',
-                            remote, dir_name], echo=False)
+                            remote, repo_name], echo=False)
             else:
                 shell.call(['git', 'clone', '--recursive', remote,
-                            dir_name], echo=False)
+                            repo_name], echo=False)
             if scheme_name:
                 for v in config['branch-schemes'].values():
                     if scheme_name not in v['aliases']:
                         continue
-                    repo_branch = v['repos'][dir_name]
+                    repo_branch = v['repos'][repo_name]
                     break
                 else:
                     repo_branch = scheme_name
-                src_path = os.path.join(SWIFT_SOURCE_ROOT, dir_name,
+                src_path = os.path.join(SWIFT_SOURCE_ROOT, repo_name,
                                         ".git")
                 shell.call(['git', '--git-dir', src_path, '--work-tree',
-                            os.path.join(SWIFT_SOURCE_ROOT, dir_name),
+                            os.path.join(SWIFT_SOURCE_ROOT, repo_name),
                             'checkout', repo_branch], echo=False)
 
 

utils/update-checkout-config.json

@@ -1,19 +1,31 @@
 {
     "ssh-clone-pattern": "[email protected]:%s.git",
     "https-clone-pattern": "https://github.com/%s.git",
-    "repositories" : {
-        "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" }
+    "repos" : {
+        "llvm": {
+            "remote": { "id": "apple/swift-llvm" } },
+        "clang": {
+            "remote": { "id": "apple/swift-clang" } },
+        "swift": {
+            "remote": { "id": "apple/swift-swift" } },
+        "lldb": {
+            "remote": { "id": "apple/swift-lldb" } },
+        "cmark": {
+            "remote": { "id": "apple/swift-cmark" } },
+        "llbuild": {
+            "remote": { "id": "apple/swift-llbuild" } },
+        "swiftpm": {
+            "remote": { "id": "apple/swift-package-manager" } },
+        "compiler-rt": {
+            "remote": { "id": "apple/swift-compiler-rt" } },
+        "swift-corelibs-xctest": {
+            "remote": { "id": "apple/swift-corelibs-xctest" } },
+        "swift-corelibs-foundation": {
+            "remote": { "id": "apple/swift-corelibs-foundation" } },
+        "swift-corelibs-libdispatch": {
+            "remote": { "id": "apple/swift-corelibs-libdispatch" } },
+        "swift-integration-tests": {
+            "remote": { "id": "apple/swift-integration-tests" } }
     },
     "default-branch-scheme": "master",
     "branch-schemes": {