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

Support to checkout specific branch using update-checkout script

Author: shahmishal

utils/update-checkout

@@ -21,83 +21,88 @@ from SwiftBuildSupport import (
     SWIFT_SOURCE_ROOT,
     WorkingDirectory,
     check_call,
+    check_output,
 )
 
-def update_working_copy(repo_path):
+def update_working_copy(repo_path, branch):
     if not os.path.isdir(repo_path):
         return
 
     print("--- Updating '" + repo_path + "' ---")
     with WorkingDirectory(repo_path):
+        if branch:
+            status = check_output(['git', 'status', '--porcelain'])
+            if status:
+                print("Please, commit your changes.")
+                print(status)
+                exit(1)
+            check_call(['git', 'checkout', branch])
+
         # Prior to Git 2.6, this is the way to do a "git pull
         # --rebase" that respects rebase.autostash.  See
         # http://stackoverflow.com/a/30209750/125349
-        check_call([ "git", "fetch" ])
-        check_call([ "git", "rebase", "FETCH_HEAD" ])
+        check_call(["git", "fetch"])
+        check_call(["git", "rebase", "FETCH_HEAD"])
 
-def obtain_additional_swift_sources(opts = {'with_ssh': False}):
+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',
-        'llbuild': 'apple/swift-llbuild',
-        'swiftpm': 'apple/swift-package-manager',
-        'swift-corelibs-xctest': 'apple/swift-corelibs-xctest',
-        'swift-corelibs-foundation': 'apple/swift-corelibs-foundation',
         'swift-integration-tests': 'apple/swift-integration-tests',
     }
     for dir_name, repo in additional_repos.items():
         with WorkingDirectory(SWIFT_SOURCE_ROOT):
             if not os.path.isdir(os.path.join(dir_name, ".git")):
                 print("--- Cloning '" + dir_name + "' ---")
-                if opts['with_ssh'] is True:
+                if with_ssh is True:
                     remote = "[email protected]:" + repo + '.git'
                 else:
                     remote = "https://github.com/" + repo + '.git'
                 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])
 
 def main():
     parser = argparse.ArgumentParser(
         formatter_class=argparse.RawDescriptionHelpFormatter,
         description="""
 repositories.
 
-By default, updates your checkouts of Swift, SourceKit, LLDB, and SwiftPM.""")
+By default, updates your checkouts of Swift, and LLDB.""")
     parser.add_argument("-a", "--all",
-        help="also update checkouts of llbuild, LLVM, and Clang",
+        help="also update checkouts of LLVM, and Clang",
         action="store_true")
     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("--branch",
+        help="Obtain Sources for specific branch")
     args = parser.parse_args()
 
-    if args.clone:
-        obtain_additional_swift_sources()
-        return 0
+    clone = args.clone
+    clone_with_ssh = args.clone_with_ssh
+    branch = args.branch
 
-    if args.clone_with_ssh:
-        obtain_additional_swift_sources({'with_ssh': True})
+    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, "llbuild"))
-        update_working_copy(os.path.join(SWIFT_SOURCE_ROOT, "llvm"))
-        update_working_copy(os.path.join(SWIFT_SOURCE_ROOT, "clang"))
+        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"))
+    update_working_copy(os.path.join(SWIFT_SOURCE_ROOT, "swift"), branch)
     update_working_copy(
-        os.path.join(SWIFT_SOURCE_ROOT, "swift", "benchmark", "PerfTestSuite"))
-    update_working_copy(os.path.join(SWIFT_SOURCE_ROOT, "SourceKit"))
-    update_working_copy(os.path.join(SWIFT_SOURCE_ROOT, "cmark"))
-    update_working_copy(os.path.join(SWIFT_SOURCE_ROOT, "lldb"))
-    update_working_copy(os.path.join(SWIFT_SOURCE_ROOT, "swiftpm"))
-    update_working_copy(os.path.join(SWIFT_SOURCE_ROOT, "swift-corelibs-foundation"))
-    update_working_copy(os.path.join(SWIFT_SOURCE_ROOT, "swift-corelibs-xctest"))
-    update_working_copy(os.path.join(SWIFT_SOURCE_ROOT, "swift-integration-tests"))
+        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)
 
     return 0