Added checkout support to porcelain.clone. It's enabled by default

to mimick default git clone behaviour

Signed-off-by: Jelmer Vernooij <jelmer@samba.org>

dulwich/porcelain.py

@@ -19,6 +19,7 @@
 import os
 import sys
 
+from dulwich import index
 from dulwich.client import get_transport_and_path
 from dulwich.patch import write_tree_diff
 from dulwich.repo import (BaseRepo, Repo)
@@ -137,7 +138,7 @@ def init(path=".", bare=False):
         return Repo.init(path)
 
 
-def clone(source, target=None, bare=False, outstream=sys.stdout):
+def clone(source, target=None, bare=False, checkout=True, outstream=sys.stdout):
     """Clone a local or remote git repository.
 
     :param source: Path or URL for source repository
@@ -161,6 +162,11 @@ def clone(source, target=None, bare=False, outstream=sys.stdout):
         determine_wants=r.object_store.determine_wants_all,
         progress=outstream.write)
     r["HEAD"] = remote_refs["HEAD"]
+    if checkout:
+        outstream.write('Checking out HEAD')
+        index.build_index_from_tree(r.path, r.index_path(),
+                                    r.object_store, r["HEAD"].tree)
+
     return r
 
 

dulwich/tests/test_porcelain.py

@@ -35,6 +35,7 @@ from dulwich.tests import (
     )
 from dulwich.tests.utils import (
     build_commit_graph,
+    make_object,
     )
 
 
@@ -89,15 +90,45 @@ class CommitTests(PorcelainTestCase):
 class CloneTests(PorcelainTestCase):
 
     def test_simple_local(self):
-        c1, c2, c3 = build_commit_graph(self.repo.object_store, [[1], [2, 1],
-            [3, 1, 2]])
+        f1_1 = make_object(Blob, data='f1')
+        commit_spec = [[1], [2, 1], [3, 1, 2]]
+        trees = {1: [('f1', f1_1), ('f2', f1_1)],
+                 2: [('f1', f1_1), ('f2', f1_1)],
+                 3: [('f1', f1_1), ('f2', f1_1)], }
+
+        c1, c2, c3 = build_commit_graph(self.repo.object_store,
+                                        commit_spec, trees)
+        self.repo.refs["refs/heads/master"] = c3.id
+        target_path = tempfile.mkdtemp()
+        outstream = StringIO()
+        self.addCleanup(shutil.rmtree, target_path)
+        r = porcelain.clone(self.repo.path, target_path,
+                            checkout=False, outstream=outstream)
+        self.assertEquals(r.path, target_path)
+        self.assertEquals(Repo(target_path).head(), c3.id)
+        self.assertTrue('f1' not in os.listdir(target_path))
+        self.assertTrue('f2' not in os.listdir(target_path))
+
+    def test_simple_local_with_checkout(self):
+
+        f1_1 = make_object(Blob, data='f1')
+        commit_spec = [[1], [2, 1], [3, 1, 2]]
+        trees = {1: [('f1', f1_1), ('f2', f1_1)],
+                 2: [('f1', f1_1), ('f2', f1_1)],
+                 3: [('f1', f1_1), ('f2', f1_1)], }
+
+        c1, c2, c3 = build_commit_graph(self.repo.object_store,
+                                        commit_spec, trees)
         self.repo.refs["refs/heads/master"] = c3.id
         target_path = tempfile.mkdtemp()
         outstream = StringIO()
         self.addCleanup(shutil.rmtree, target_path)
-        r = porcelain.clone(self.repo.path, target_path, outstream=outstream)
+        r = porcelain.clone(self.repo.path, target_path,
+                            checkout=True, outstream=outstream)
         self.assertEquals(r.path, target_path)
         self.assertEquals(Repo(target_path).head(), c3.id)
+        self.assertTrue('f1' in os.listdir(target_path))
+        self.assertTrue('f2' in os.listdir(target_path))
 
 
 class InitTests(TestCase):