Merge pull request #565 from cmonr/issue_560

Properly performs shallow clone when `depth` is used

Author: theotherjimmy

mbed/mbed.py

@@ -281,7 +281,7 @@ def cleanup():
                 else:
                     shutil.rmtree(fl)
 
-    def clone(url, path=None, depth=None, protocol=None):
+    def clone(url, path=None, rev=None, depth=None, protocol=None):
         m = Bld.isurl(url)
         if not m:
             raise ProcessException(1, "Not a library build URL")
@@ -395,7 +395,7 @@ def init(path=None):
     def cleanup():
         return True
 
-    def clone(url, name=None, depth=None, protocol=None):
+    def clone(url, name=None, rev=None, depth=None, protocol=None):
         popen([hg_cmd, 'clone', formaturl(url, protocol), name] + (['-v'] if very_verbose else ([] if verbose else ['-q'])))
 
     def add(dest):
@@ -607,8 +607,24 @@ def cleanup():
         for branch in branches: # delete all local branches so the new repo clone is not poluted
             pquery([git_cmd, 'branch', '-D', branch])
 
-    def clone(url, name=None, depth=None, protocol=None):
-        popen([git_cmd, 'clone', formaturl(url, protocol), name] + (['--depth', depth] if depth else []) + (['-v'] if very_verbose else ([] if verbose else ['-q'])))
+    def clone(url, path, rev=None, depth=None, protocol=None, name=None):
+        result = pquery([git_cmd, "ls-remote", url, (rev if rev else "HEAD")])
+        
+        if result and rev:
+            repo_name = url.split('/')[-1]
+            if '.git' in repo_name:
+                repo_name = repo_name[:-4]
+
+            os.mkdir(repo_name)
+
+            with cd(repo_name):
+                Git.init()
+                Git.fetch(url=url, rev=rev, depth=depth)
+                Git.checkout('FETCH_HEAD')
+                popen([git_cmd, 'remote', 'add', 'origin', url])
+            
+        else:
+            popen([git_cmd, 'clone', formaturl(url, protocol), path] + (['-v'] if very_verbose else ([] if verbose else ['-q'])))
 
     def add(dest):
         info("Adding reference "+dest)
@@ -642,9 +658,12 @@ def publish(all_refs=None):
                 if not branch:
                     error(err+"Working set is not on a branch.", 1)
 
-    def fetch():
+    def fetch(url=None, rev=None, depth=None):
         info("Fetching revisions from remote repository to \"%s\"" % os.path.basename(os.getcwd()))
-        popen([git_cmd, 'fetch', '--all', '--tags'] + (['-v'] if very_verbose else ([] if verbose else ['-q'])))
+        if url:
+            popen([git_cmd, 'fetch', '--tags'] + ([url] if url else []) + ([rev] if rev else []) + (["--depth", depth] if depth else []) + (['-v'] if very_verbose else ([] if verbose else ['-q'])))
+        else:
+            popen([git_cmd, 'fetch', '--tags', '--all'] + (['-v'] if very_verbose else ([] if verbose else ['-q'])))
 
     def discard(clean_files=False):
         info("Discarding local changes in \"%s\"" % os.path.basename(os.getcwd()))
@@ -1098,7 +1117,7 @@ def clone(self, url, path, rev=None, depth=None, protocol=None, **kwargs):
             # Main clone routine if the clone with cache ref failed (might occur if cache ref is dirty)
             if main:
                 try:
-                    scm.clone(url, path, depth=depth, protocol=protocol, **kwargs)
+                    scm.clone(url, path, rev=rev, depth=depth, protocol=protocol, **kwargs)
                 except ProcessException:
                     if os.path.isdir(path):
                         rmtree_readonly(path)
@@ -1786,7 +1805,7 @@ def import_(url, path=None, ignore=False, depth=None, protocol=None, top=True):
         with cd(repo.path):
             Program(repo.path).set_root()
             try:
-                if repo.rev and repo.getrev() != repo.rev:
+                if repo.rev and repo.getrev() != repo.rev and not depth:
                     repo.checkout(repo.rev, True)
             except ProcessException as e:
                 err = "Unable to update \"%s\" to %s" % (repo.name, repo.revtype(repo.rev, True))