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

project: Don't emit locally modified hook warning in quiet mode

Browse Source 
Change-Id: I0f6db037b85f2a015fc7b7fd37472df848a58266
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/254698
Reviewed-by: Mike Frysinger <vapier@google.com>
Tested-by: David Pursehouse <dpursehouse@collab.net>
This commit is contained in:
David Pursehouse 2020-02-13 12:41:15 +09:00
parent daa2cecdc5
commit e8ace26117
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
project.py
View File

@ -1470,9 +1470,9 @@ class Project(object):
if is_new is None: if is_new is None:
is_new = not self.Exists is_new = not self.Exists
if is_new: if is_new:
self._InitGitDir(force_sync=force_sync) self._InitGitDir(force_sync=force_sync, quiet=quiet)
else: else:
self._UpdateHooks() self._UpdateHooks(quiet=quiet)
self._InitRemote() self._InitRemote()
if is_new: if is_new:
@ -2590,7 +2590,7 @@ class Project(object):
if GitCommand(self, cmd).Wait() != 0: if GitCommand(self, cmd).Wait() != 0:
raise GitError('%s merge %s ' % (self.name, head)) raise GitError('%s merge %s ' % (self.name, head))
def _InitGitDir(self, mirror_git=None, force_sync=False): def _InitGitDir(self, mirror_git=None, force_sync=False, quiet=False):
init_git_dir = not os.path.exists(self.gitdir) init_git_dir = not os.path.exists(self.gitdir)
init_obj_dir = not os.path.exists(self.objdir) init_obj_dir = not os.path.exists(self.objdir)
try: try:
@ -2618,7 +2618,8 @@ class Project(object):
if self.worktree and os.path.exists(platform_utils.realpath if self.worktree and os.path.exists(platform_utils.realpath
(self.worktree)): (self.worktree)):
platform_utils.rmtree(platform_utils.realpath(self.worktree)) platform_utils.rmtree(platform_utils.realpath(self.worktree))
return self._InitGitDir(mirror_git=mirror_git, force_sync=False) return self._InitGitDir(mirror_git=mirror_git, force_sync=False,
quiet=quiet)
except Exception: except Exception:
raise e raise e
raise e raise e
@ -2650,7 +2651,7 @@ class Project(object):
_lwrite(os.path.join(self.gitdir, 'objects/info/alternates'), _lwrite(os.path.join(self.gitdir, 'objects/info/alternates'),
os.path.join(ref_dir, 'objects') + '\n') os.path.join(ref_dir, 'objects') + '\n')
self._UpdateHooks() self._UpdateHooks(quiet=quiet)
m = self.manifest.manifestProject.config m = self.manifest.manifestProject.config
for key in ['user.name', 'user.email']: for key in ['user.name', 'user.email']:
@ -2669,11 +2670,11 @@ class Project(object):
platform_utils.rmtree(self.gitdir) platform_utils.rmtree(self.gitdir)
raise raise
def _UpdateHooks(self): def _UpdateHooks(self, quiet=False):
if os.path.exists(self.gitdir): if os.path.exists(self.gitdir):
self._InitHooks() self._InitHooks(quiet=quiet)
def _InitHooks(self): def _InitHooks(self, quiet=False):
hooks = platform_utils.realpath(self._gitdir_path('hooks')) hooks = platform_utils.realpath(self._gitdir_path('hooks'))
if not os.path.exists(hooks): if not os.path.exists(hooks):
os.makedirs(hooks) os.makedirs(hooks)
@ -2696,8 +2697,9 @@ class Project(object):
if filecmp.cmp(stock_hook, dst, shallow=False): if filecmp.cmp(stock_hook, dst, shallow=False):
platform_utils.remove(dst) platform_utils.remove(dst)
else: else:
_warn("%s: Not replacing locally modified %s hook", if not quiet:
self.relpath, name) _warn("%s: Not replacing locally modified %s hook",
self.relpath, name)
continue continue
try: try:
platform_utils.symlink( platform_utils.symlink(