android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-21 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't fetch from remotes if commit id exists locally

Browse Source 
In existing workspaces where the manifest specifies a commit id in the
manifest, we can avoid doing a fetch from the remote if we have the
commit locally. This substantially improves sync times for fully
specified manifests.

Change-Id: Ide216f28a545e00e0b493ce90ed0019513c61613
This commit is contained in:
Chris AtLee 2014-01-16 21:32:33 -05:00 committed by David Pursehouse
parent 724aafb52d
commit 2fb6466f79
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
project.py
View File

@ -1078,6 +1078,13 @@ class Project(object):
elif self.manifest.default.sync_c: elif self.manifest.default.sync_c:
current_branch_only = True current_branch_only = True
is_sha1 = False
if ID_RE.match(self.revisionExpr) is not None:
is_sha1 = True
if is_sha1 and self._CheckForSha1():
# Don't need to fetch since we already have this revision
return True
if not self._RemoteFetch(initial=is_new, quiet=quiet, alt_dir=alt_dir, if not self._RemoteFetch(initial=is_new, quiet=quiet, alt_dir=alt_dir,
current_branch_only=current_branch_only, current_branch_only=current_branch_only,
no_tags=no_tags): no_tags=no_tags):
@ -1644,6 +1651,15 @@ class Project(object):
## Direct Git Commands ## ## Direct Git Commands ##
def _CheckForSha1(self):
try:
# if revision (sha or tag) is not present then following function
# throws an error.
self.bare_git.rev_parse('--verify', '%s^0' % self.revisionExpr)
return True
except GitError:
# There is no such persistent revision. We have to fetch it.
return False
def _FetchArchive(self, tarpath, cwd=None): def _FetchArchive(self, tarpath, cwd=None):
cmd = ['archive', '-v', '-o', tarpath] cmd = ['archive', '-v', '-o', tarpath]
@ -1668,16 +1684,6 @@ class Project(object):
is_sha1 = False is_sha1 = False
tag_name = None tag_name = None
def CheckForSha1():
try:
# if revision (sha or tag) is not present then following function
# throws an error.
self.bare_git.rev_parse('--verify', '%s^0' % self.revisionExpr)
return True
except GitError:
# There is no such persistent revision. We have to fetch it.
return False
if self.clone_depth: if self.clone_depth:
depth = self.clone_depth depth = self.clone_depth
else: else:
@ -1693,7 +1699,7 @@ class Project(object):
tag_name = self.revisionExpr[len(R_TAGS):] tag_name = self.revisionExpr[len(R_TAGS):]
if is_sha1 or tag_name is not None: if is_sha1 or tag_name is not None:
if CheckForSha1(): if self._CheckForSha1():
return True return True
if is_sha1 and (not self.upstream or ID_RE.match(self.upstream)): if is_sha1 and (not self.upstream or ID_RE.match(self.upstream)):
current_branch_only = False current_branch_only = False
@ -1808,7 +1814,7 @@ class Project(object):
# We just synced the upstream given branch; verify we # We just synced the upstream given branch; verify we
# got what we wanted, else trigger a second run of all # got what we wanted, else trigger a second run of all
# refs. # refs.
if not CheckForSha1(): if not self._CheckForSha1():
return self._RemoteFetch(name=name, current_branch_only=False, return self._RemoteFetch(name=name, current_branch_only=False,
initial=False, quiet=quiet, alt_dir=alt_dir) initial=False, quiet=quiet, alt_dir=alt_dir)