commit: ab840ac982d3c8b676b89f6bedd14e85dd06870f Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Mon Nov 7 22:03:40 2016 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Mon Nov 7 22:03:46 2016 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=ab840ac9
Revert "GitSync.update: respect sync-depth (bug 552814)" This reverts commit 84413bb1dd9df322568ce25efc5b7854a43d03c7, and all of the related commits that followed: d075422a89 sync: always pass -q --unmerged to git-update-index f77fcd6b0b [sync] Run `git update-index --refresh` when doing shallow pulls f5d258656d GitSync.update: handle git rev-list failure (bug 594822) 55aef9bf29 GitSync.update: use git reset --merge instead of --hard (bug 552814) Shallow fetch is not a practical default at this time, given performance issues introduced by `git update-index` and `git prune` (see bug 599008). X-Gentoo-Bug: 552814 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=552814 pym/portage/sync/modules/git/git.py | 41 ++----------------------------------- 1 file changed, 2 insertions(+), 39 deletions(-) diff --git a/pym/portage/sync/modules/git/git.py b/pym/portage/sync/modules/git/git.py index f288733..02eeb16 100644 --- a/pym/portage/sync/modules/git/git.py +++ b/pym/portage/sync/modules/git/git.py @@ -79,32 +79,11 @@ class GitSync(NewBase): ''' git_cmd_opts = "" - quiet = self.settings.get("PORTAGE_QUIET") == "1" - if quiet: + if self.settings.get("PORTAGE_QUIET") == "1": git_cmd_opts += " --quiet" if self.repo.module_specific_options.get('sync-git-pull-extra-opts'): git_cmd_opts += " %s" % self.repo.module_specific_options['sync-git-pull-extra-opts'] - if self.repo.sync_depth is None: - git_cmd = "%s pull%s" % (self.bin_command, git_cmd_opts) - else: - # Since the default merge strategy typically fails when - # the depth is not unlimited, use `git fetch` followed by - # `git update-index --refresh`, then `git reset --merge`. - try: - remote_branch = portage._unicode_decode( - subprocess.check_output([self.bin_command, 'rev-parse', - '--abbrev-ref', '--symbolic-full-name', '@{upstream}'], - cwd=portage._unicode_encode(self.repo.location))).rstrip('\n') - except subprocess.CalledProcessError as e: - msg = "!!! git rev-parse error in %s" % self.repo.location - self.logger(self.xterm_titles, msg) - writemsg_level(msg + "\n", level=logging.ERROR, noiselevel=-1) - return (e.returncode, False) - - git_cmd_opts += " --depth %d" % self.repo.sync_depth - git_cmd = "%s fetch %s%s" % (self.bin_command, - remote_branch.partition('/')[0], git_cmd_opts) - + git_cmd = "%s pull%s" % (self.bin_command, git_cmd_opts) writemsg_level(git_cmd + "\n") rev_cmd = [self.bin_command, "rev-list", "--max-count=1", "HEAD"] @@ -114,22 +93,6 @@ class GitSync(NewBase): exitcode = portage.process.spawn_bash("cd %s ; exec %s" % ( portage._shell_quote(self.repo.location), git_cmd), **self.spawn_kwargs) - - if exitcode == os.EX_OK and self.repo.sync_depth is not None: - # update-index --refresh is needed on some filesystems - # (e.g. with overlayfs on squashfs) - update_index_cmd = [self.bin_command, 'update-index', '-q', '--unmerged', '--refresh'] - - exitcode = subprocess.call(update_index_cmd, - cwd=portage._unicode_encode(self.repo.location)) - - if exitcode == os.EX_OK: - reset_cmd = [self.bin_command, 'reset', '--merge', remote_branch] - if quiet: - reset_cmd.append('--quiet') - exitcode = subprocess.call(reset_cmd, - cwd=portage._unicode_encode(self.repo.location)) - if exitcode != os.EX_OK: msg = "!!! git pull error in %s" % self.repo.location self.logger(self.xterm_titles, msg)
