diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py index 4534bd75800..57bb61d5ee1 100644 --- a/bitbake/lib/bb/fetch2/git.py +++ b/bitbake/lib/bb/fetch2/git.py @@ -244,6 +244,7 @@ class Git(FetchMethod): ud.unresolvedrev[name] = 'HEAD' ud.basecmd = d.getVar("FETCHCMD_git") or "git -c core.fsyncobjectfiles=0 -c gc.autoDetach=false -c core.pager=cat" + ud.basecmd = "LANG=C %s" % ud.basecmd write_tarballs = d.getVar("BB_GENERATE_MIRROR_TARBALLS") or "0" ud.write_tarballs = write_tarballs != "0" or ud.rebaseable @@ -344,6 +345,49 @@ class Git(FetchMethod): return False return True + def shallow_clone_by_fetch(self, ud, repourl, d): + """ + Use "git fetch --depth revision" to implement shallow clone + since git can't clone a revision, a better solution should be: + "git fetch --depth revision:" but it doesn't work + when revision is a tag, e.g.: + error: cannot update ref 'refs/heads/master': trying to write + non-commit object to branch 'refs/heads/master' + """ + + import datetime + + depth = ud.shallow_depths[ud.names[0]] + revision = ud.revisions[ud.names[0]] + branchname = ud.branches[ud.names[0]] + if not branchname: + branchname = "master" + + # Rename branchname if it exists which can: + # - Avoid conflicts during update + # - Keep the revision on a branch so that "git submodule update --recursive" + # can work since it requires the revision on a branch. + branch_path = os.path.join(ud.clonedir, 'refs/heads/%s' % branchname) + if os.path.exists(branch_path): + os.rename(branch_path, '%s.%s' % (branch_path, datetime.datetime.now().strftime("%Y%m%d%H%M%S"))) + + init_cmd = "%s init --bare -q" % ud.basecmd + add_remote_cmd = "%s remote add origin %s" % (ud.basecmd, shlex.quote(repourl)) + fetch_cmd = "%s fetch --progress origin --depth %s %s" % (ud.basecmd, depth, revision) + # Create both branch and tag for the revision + branch_cmd = "%s branch -f %s FETCH_HEAD" % (ud.basecmd, branchname) + tag_cmd = "%s tag -f v%s FETCH_HEAD" % (ud.basecmd, branchname) + + if ud.proto.lower() != 'file': + bb.fetch2.check_network_access(d, fetch_cmd, ud.url) + + if not os.path.exists(ud.clonedir): + bb.utils.mkdirhier(ud.clonedir) + + progresshandler = GitProgressHandler(d) + for cmd in (init_cmd, add_remote_cmd, fetch_cmd, branch_cmd, tag_cmd): + runfetchcmd(cmd, d, log=progresshandler, workdir=ud.clonedir) + def download(self, ud, d): """Fetch url""" @@ -360,7 +404,7 @@ class Git(FetchMethod): else: tmpdir = tempfile.mkdtemp(dir=d.getVar('DL_DIR')) runfetchcmd("tar -xzf %s" % ud.fullmirror, d, workdir=tmpdir) - fetch_cmd = "LANG=C %s fetch -f --progress %s " % (ud.basecmd, shlex.quote(tmpdir)) + fetch_cmd = "%s fetch -f --progress %s " % (ud.basecmd, shlex.quote(tmpdir)) runfetchcmd(fetch_cmd, d, workdir=ud.clonedir) repourl = self._get_repo_url(ud) @@ -369,27 +413,32 @@ class Git(FetchMethod): # We do this since git will use a "-l" option automatically for local urls where possible if repourl.startswith("file://"): repourl = repourl[7:] - clone_cmd = "LANG=C %s clone --bare --mirror %s %s --progress" % (ud.basecmd, shlex.quote(repourl), ud.clonedir) - if ud.proto.lower() != 'file': - bb.fetch2.check_network_access(d, clone_cmd, ud.url) - progresshandler = GitProgressHandler(d) - runfetchcmd(clone_cmd, d, log=progresshandler) + if ud.shallow: + self.shallow_clone_by_fetch(ud, repourl, d) + else: + clone_cmd = "%s clone --bare --mirror %s %s --progress" % (ud.basecmd, shlex.quote(repourl), ud.clonedir) + progresshandler = GitProgressHandler(d) + if ud.proto.lower() != 'file': + bb.fetch2.check_network_access(d, clone_cmd, ud.url) + runfetchcmd(clone_cmd, d, log=progresshandler) # Update the checkout if needed if self.clonedir_need_update(ud, d): output = runfetchcmd("%s remote" % ud.basecmd, d, quiet=True, workdir=ud.clonedir) if "origin" in output: - runfetchcmd("%s remote rm origin" % ud.basecmd, d, workdir=ud.clonedir) - - runfetchcmd("%s remote add --mirror=fetch origin %s" % (ud.basecmd, shlex.quote(repourl)), d, workdir=ud.clonedir) - fetch_cmd = "LANG=C %s fetch -f --progress %s refs/*:refs/*" % (ud.basecmd, shlex.quote(repourl)) - if ud.proto.lower() != 'file': - bb.fetch2.check_network_access(d, fetch_cmd, ud.url) - progresshandler = GitProgressHandler(d) - runfetchcmd(fetch_cmd, d, log=progresshandler, workdir=ud.clonedir) - runfetchcmd("%s prune-packed" % ud.basecmd, d, workdir=ud.clonedir) - runfetchcmd("%s pack-refs --all" % ud.basecmd, d, workdir=ud.clonedir) - runfetchcmd("%s pack-redundant --all | xargs -r rm" % ud.basecmd, d, workdir=ud.clonedir) + runfetchcmd("%s remote rm origin" % ud.basecmd, d, workdir=ud.clonedir) + if ud.shallow: + self.shallow_clone_by_fetch(ud, repourl, d) + else: + runfetchcmd("%s remote add --mirror=fetch origin %s" % (ud.basecmd, shlex.quote(repourl)), d, workdir=ud.clonedir) + fetch_cmd = "%s fetch -f --progress %s refs/*:refs/*" % (ud.basecmd, shlex.quote(repourl)) + if ud.proto.lower() != 'file': + bb.fetch2.check_network_access(d, fetch_cmd, ud.url) + progresshandler = GitProgressHandler(d) + runfetchcmd(fetch_cmd, d, log=progresshandler, workdir=ud.clonedir) + runfetchcmd("%s prune-packed" % ud.basecmd, d, workdir=ud.clonedir) + runfetchcmd("%s pack-refs --all" % ud.basecmd, d, workdir=ud.clonedir) + runfetchcmd("%s pack-redundant --all | xargs -r rm" % ud.basecmd, d, workdir=ud.clonedir) try: os.unlink(ud.fullmirror) except OSError as exc: