Merge lp:~mattyw/codetree/git-depth into lp:codetree

[Matthew Williams]

Add support for specifying depth=n option when cloning from git repos. This allows shallow copies to be done which is especially useful in the case of cloning fat charms

Add support for specifying depth=n option when cloning from git repos. This allows shallow copies to be done which is especially useful in the case of cloning fat charms

[Tom Haddon (mthaddon)]

Looks good, thanks, but I think we should check the depth option is an integer.

review: Needs Fixing

[lp:~mattyw/codetree/git-depth]

80. By mattyw <email address hidden> on 2016-12-06

handlers/git: Support depth option as int or stringed in

[Tom Haddon (mthaddon)]

Great, thanks.

review: Approve

=== modified file 'codetree/handlers/git.py'
--- codetree/handlers/git.py	2016-11-28 23:53:35 +0000
+++ codetree/handlers/git.py	2016-12-06 10:23:27 +0000
@@ -65,10 +65,14 @@
     def get(self, dest, options):
         ref = options.get('revno')
 
+	clone_command = ['git', 'clone', self.source, dest]
+	if options.get("depth"):
+		depth = int(options.get("depth"))
+		clone_command.extend(["--depth", str(depth)])
         if os.path.exists(dest):
             if options.get("overwrite"):
                 shutil.rmtree(dest)
-                if not log_failure(['git', 'clone', self.source, dest],
+                if not log_failure(clone_command,
                                    "Cloning repository at {} from {}".format(dest, self.source)):
                     return False
             else:
@@ -77,7 +81,7 @@
                 if ref is None:  # default to master for the checkout of any updated repo
                     ref = 'master'
         else:
-            if not log_failure(['git', 'clone', self.source, dest],
+            if not log_failure(clone_command,
                                "Cloning repository at {} from {}".format(dest, self.source)):
                 return False
 

=== modified file 'tests/test_git_handler.py'
--- tests/test_git_handler.py	2016-05-10 20:46:25 +0000
+++ tests/test_git_handler.py	2016-12-06 10:23:27 +0000
@@ -98,6 +98,39 @@
         finally:
             shutil.rmtree(d)
 
+    def test_get_revision_depth_1(self):
+        gh = GitSourceHandler("git://localhost/.git")
+        d = mkdtemp('', 'git-handler')
+        wd = os.path.join(d, 'test')
+        try:
+            gh.get(wd, {'revno': self._revision, 'depth': 1})
+            rev_count = subprocess.check_output(gh._git_cmd(wd, 'rev-list', '--count', '--all'))
+            self.assertEqual('1', rev_count.strip())
+        finally:
+            shutil.rmtree(d)
+
+    def test_get_revision_depth_1_str(self):
+        gh = GitSourceHandler("git://localhost/.git")
+        d = mkdtemp('', 'git-handler')
+        wd = os.path.join(d, 'test')
+        try:
+            gh.get(wd, {'revno': self._revision, 'depth': "1"})
+            rev_count = subprocess.check_output(gh._git_cmd(wd, 'rev-list', '--count', '--all'))
+            self.assertEqual('1', rev_count.strip())
+        finally:
+            shutil.rmtree(d)
+
+    def test_get_revision_depth_is_int(self):
+        gh = GitSourceHandler("git://localhost/.git")
+        d = mkdtemp('', 'git-handler')
+        wd = os.path.join(d, 'test')
+        try:
+            with self.assertRaises(ValueError):
+                gh.get(wd, {'revno': self._revision, 'depth': "invalid"})
+        finally:
+            shutil.rmtree(d)
+
+
     def test_directory_exists(self):
         gh = GitSourceHandler("git://localhost/.git")
         d = mkdtemp('', 'git-handler')