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

Merge "Re-initialise repos git hooks when updating the forest"

Browse Source
This commit is contained in:
David Pursehouse 2013-05-09 08:36:11 +00:00 committed by Gerrit Code Review
commit 793f90cdc0
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
project.py
View File

@ -986,6 +986,8 @@ class Project(object):
is_new = not self.Exists is_new = not self.Exists
if is_new: if is_new:
self._InitGitDir() self._InitGitDir()
else:
self._UpdateHooks()
self._InitRemote() self._InitRemote()
if is_new: if is_new:
@ -1878,11 +1880,21 @@ 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()
m = self.manifest.manifestProject.config
for key in ['user.name', 'user.email']:
if m.Has(key, include_defaults = False):
self.config.SetString(key, m.GetString(key))
if self.manifest.IsMirror: if self.manifest.IsMirror:
self.config.SetString('core.bare', 'true') self.config.SetString('core.bare', 'true')
else: else:
self.config.SetString('core.bare', None) self.config.SetString('core.bare', None)
def _UpdateHooks(self):
if os.path.exists(self.gitdir):
# Always recreate hooks since they can have been changed
# since the latest update.
hooks = self._gitdir_path('hooks') hooks = self._gitdir_path('hooks')
try: try:
to_rm = os.listdir(hooks) to_rm = os.listdir(hooks)
@ -1892,11 +1904,6 @@ class Project(object):
os.remove(os.path.join(hooks, old_hook)) os.remove(os.path.join(hooks, old_hook))
self._InitHooks() self._InitHooks()
m = self.manifest.manifestProject.config
for key in ['user.name', 'user.email']:
if m.Has(key, include_defaults = False):
self.config.SetString(key, m.GetString(key))
def _InitHooks(self): def _InitHooks(self):
hooks = self._gitdir_path('hooks') hooks = self._gitdir_path('hooks')
if not os.path.exists(hooks): if not os.path.exists(hooks):