Merge pull request swiftlang#316 from apple/check-it-out

Fix checkout script

Author: Zachary 'Clack' Cole

checkout

@@ -59,8 +59,7 @@ def main():
             continue
         total_repos += 1
         for compatible_swift in repo['compatibility']:
-            project.checkout(root_path, repo,
-                             repo['compatibility'][compatible_swift]['commit'])
+            project.checkout(root_path, repo, compatible_swift['commit'])
     common.debug_print('='*40)
     common.debug_print('Repository Summary:')
     common.debug_print('      Total: %s' % total_repos)

project.py

@@ -238,6 +238,18 @@ def test_swift_package(path, swiftc, sandbox_profile,
                                 env=env)
 
 
+def checkout(root_path, repo, commit):
+    """Checkout an indexed repository."""
+    path = os.path.join(root_path, repo['path'])
+    if repo['repository'] == 'Git':
+        if os.path.exists(path):
+            return common.git_update(repo['url'], commit, path)
+        else:
+            return common.git_clone(repo['url'], path, tree=commit)
+    raise common.Unreachable('Unsupported repository: %s' %
+                             repo['repository'])
+
+
 def strip_resource_phases(repo_path, stdout=sys.stdout, stderr=sys.stderr):
     """Strip resource build phases from a given project."""
     command = ['perl', '-i', '-00ne',

project_future.py

@@ -234,6 +234,18 @@ def test_swift_package(path, swiftc, sandbox_profile,
                                 env=env)
 
 
+def checkout(root_path, repo, commit):
+    """Checkout an indexed repository."""
+    path = os.path.join(root_path, repo['path'])
+    if repo['repository'] == 'Git':
+        if os.path.exists(path):
+            return common.git_update(repo['url'], commit, path)
+        else:
+            return common.git_clone(repo['url'], path, tree=commit)
+    raise common.Unreachable('Unsupported repository: %s' %
+                             repo['repository'])
+
+
 def strip_resource_phases(repo_path, stdout=sys.stdout, stderr=sys.stderr):
     """Strip resource build phases from a given project."""
     command = ['perl', '-i', '-00ne',