Skip to content

Commit 2080ec1

Browse files
committed
Use scm.checkout() instead of scm.update() when importing (also improves importing speed)
1 parent efd83ab commit 2080ec1

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

mbed/mbed.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,9 @@ def discard():
381381
popen([hg_cmd, 'update', '-C'] + (['-v'] if verbose else ['-q']))
382382

383383
def checkout(rev):
384-
log("Checkout \"%s\" in %s" % (rev, os.path.basename(os.getcwd())))
384+
if not rev:
385+
return
386+
log("Checkout \"%s\" in %s to %s" % (rev, os.path.basename(os.getcwd()), rev))
385387
popen([hg_cmd, 'update'] + (['-r', rev] if rev else []) + (['-v'] if verbose else ['-q']))
386388

387389
def update(rev=None, clean=False, is_local=False):
@@ -568,7 +570,9 @@ def merge(dest):
568570
popen([git_cmd, 'merge', dest] + (['-v'] if verbose else ['-q']))
569571

570572
def checkout(rev):
571-
log("Checkout \"%s\" in %s" % (rev, os.path.basename(os.getcwd())))
573+
if not rev:
574+
return
575+
log("Checkout \"%s\" in %s to %s" % (rev, os.path.basename(os.getcwd()), rev))
572576
popen([git_cmd, 'checkout', rev] + ([] if verbose else ['-q']))
573577
if Git.isdetached(): # try to find associated refs to avoid detached state
574578
refs = Git.getrefs(rev)
@@ -947,6 +951,9 @@ def outgoing(self, *args, **kwargs):
947951
def publish(self, *args, **kwargs):
948952
return self.__scm_call('publish', *args, **kwargs)
949953

954+
def checkout(self, *args, **kwargs):
955+
return self.__scm_call('checkout', *args, **kwargs)
956+
950957
def update(self, *args, **kwargs):
951958
return self.__scm_call('update', *args, **kwargs)
952959

@@ -1337,7 +1344,7 @@ def import_(url, path=None, ignore=False, depth=None, protocol=None, top=True):
13371344
with cd(repo.path):
13381345
Program(repo.path).set_root()
13391346
try:
1340-
repo.update(repo.rev, True)
1347+
repo.checkout(repo.rev)
13411348
except ProcessException as e:
13421349
err = "Unable to update \"%s\" to %s" % (repo.name, repo.revtype(repo.rev, True))
13431350
if depth:

0 commit comments

Comments
 (0)