Merge pull request swiftlang#1486 from shahmishal/swift-2.2-branch

Sync utils/update-checkout with master

Author: tkremenek

utils/update-checkout

@@ -24,6 +24,15 @@ from SwiftBuildSupport import (
     check_output,
 )
 
+REPOSITORIES = {
+    'llvm': 'apple/swift-llvm',
+    'clang': 'apple/swift-clang',
+    'swift': 'apple/swift-swift',
+    'lldb': 'apple/swift-lldb',
+    'cmark': 'apple/swift-cmark',
+    'swift-integration-tests': 'apple/swift-integration-tests',
+}
+
 def update_working_copy(repo_path, branch):
     if not os.path.isdir(repo_path):
         return
@@ -44,23 +53,23 @@ def update_working_copy(repo_path, branch):
         check_call(["git", "fetch"])
         check_call(["git", "rebase", "FETCH_HEAD"])
 
-def obtain_additional_swift_sources(with_ssh, branch):
-    additional_repos = {
-        'llvm': 'apple/swift-llvm',
-        'clang': 'apple/swift-clang',
-        'lldb': 'apple/swift-lldb',
-        'cmark': 'apple/swift-cmark',
-        'swift-integration-tests': 'apple/swift-integration-tests',
-    }
-    for dir_name, repo in additional_repos.items():
+def obtain_additional_swift_sources(
+        with_ssh, branch, skip_history, skip_repositories):
+    for dir_name, repo in REPOSITORIES.items():
+        if dir_name in skip_repositories:
+            print("--- Skipping '" + dir_name + "' ---")
+            continue
         with WorkingDirectory(SWIFT_SOURCE_ROOT):
             if not os.path.isdir(os.path.join(dir_name, ".git")):
                 print("--- Cloning '" + dir_name + "' ---")
                 if with_ssh is True:
                     remote = "git@github.com:" + repo + '.git'
                 else:
                     remote = "https://github.com/" + repo + '.git'
-                check_call(['git', 'clone', remote, dir_name])
+                if skip_history:
+                    check_call(['git', 'clone', '--depth', '1', remote, dir_name])
+                else:
+                    check_call(['git', 'clone', remote, dir_name])
                 if branch:
                     src_path = SWIFT_SOURCE_ROOT + "/" + dir_name + "/" + ".git"
                     check_call(['git', '--git-dir', src_path, '--work-tree', os.path.join(SWIFT_SOURCE_ROOT, dir_name), 'checkout', branch])
@@ -71,38 +80,39 @@ def main():
         description="""
 repositories.
 
-By default, updates your checkouts of Swift, and LLDB.""")
-    parser.add_argument("-a", "--all",
-        help="also update checkouts of LLVM, and Clang",
-        action="store_true")
+By default, updates your checkouts of Swift, SourceKit, LLDB, and SwiftPM.""")
     parser.add_argument("--clone",
         help="Obtain Sources for Swift and Related Projects",
         action="store_true")
     parser.add_argument("--clone-with-ssh",
         help="Obtain Sources for Swift and Related Projects via SSH",
         action="store_true")
+    parser.add_argument("--skip-history",
+        help="Skip histories when obtaining sources",
+        action="store_true")
+    parser.add_argument("--skip-repository",
+        metavar="DIRECTORY",
+        default=[],
+        help="Skip the specified repository",
+        action="append")
     parser.add_argument("--branch",
         help="Obtain Sources for specific branch")
     args = parser.parse_args()
 
     clone = args.clone
     clone_with_ssh = args.clone_with_ssh
+    skip_history = args.skip_history
     branch = args.branch
 
     if clone or clone_with_ssh:
-        obtain_additional_swift_sources(clone_with_ssh, branch)
-        return 0
-
-    if args.all:
-        update_working_copy(os.path.join(SWIFT_SOURCE_ROOT, "llvm"), branch)
-        update_working_copy(os.path.join(SWIFT_SOURCE_ROOT, "clang"), branch)
-
-    update_working_copy(os.path.join(SWIFT_SOURCE_ROOT, "swift"), branch)
-    update_working_copy(
-        os.path.join(SWIFT_SOURCE_ROOT, "swift", "benchmark", "PerfTestSuite"), branch)
-    update_working_copy(os.path.join(SWIFT_SOURCE_ROOT, "cmark"), branch)
-    update_working_copy(os.path.join(SWIFT_SOURCE_ROOT, "lldb"), branch)
-    update_working_copy(os.path.join(SWIFT_SOURCE_ROOT, "swift-integration-tests"), branch)
+        obtain_additional_swift_sources(
+            clone_with_ssh, branch, skip_history, args.skip_repository)
+
+    for dir_name, _ in REPOSITORIES.items():
+        if dir_name in args.skip_repository:
+            print("--- Skipping '" + dir_name + "' ---")
+            continue
+        update_working_copy(os.path.join(SWIFT_SOURCE_ROOT, dir_name), branch)
 
     return 0