|
@@ -383,14 +383,15 @@ class GitApplyTree(PatchTree):
|
|
|
reporoot = (runcmd("git rev-parse --show-toplevel".split(), self.dir) or '').strip()
|
|
|
if not reporoot:
|
|
|
raise Exception("Cannot get repository root for directory %s" % self.dir)
|
|
|
- commithook = os.path.join(reporoot, '.git', 'hooks', 'commit-msg')
|
|
|
- commithook_backup = commithook + '.devtool-orig'
|
|
|
- applyhook = os.path.join(reporoot, '.git', 'hooks', 'applypatch-msg')
|
|
|
- applyhook_backup = applyhook + '.devtool-orig'
|
|
|
- if os.path.exists(commithook):
|
|
|
- shutil.move(commithook, commithook_backup)
|
|
|
- if os.path.exists(applyhook):
|
|
|
- shutil.move(applyhook, applyhook_backup)
|
|
|
+ hooks_dir = os.path.join(reporoot, '.git', 'hooks')
|
|
|
+ hooks_dir_backup = hooks_dir + '.devtool-orig'
|
|
|
+ if os.path.lexists(hooks_dir_backup):
|
|
|
+ raise Exception("Git hooks backup directory already exists: %s" % hooks_dir_backup)
|
|
|
+ if os.path.lexists(hooks_dir):
|
|
|
+ shutil.move(hooks_dir, hooks_dir_backup)
|
|
|
+ os.mkdir(hooks_dir)
|
|
|
+ commithook = os.path.join(hooks_dir, 'commit-msg')
|
|
|
+ applyhook = os.path.join(hooks_dir, 'applypatch-msg')
|
|
|
with open(commithook, 'w') as f:
|
|
|
# NOTE: the formatting here is significant; if you change it you'll also need to
|
|
|
# change other places which read it back
|
|
@@ -439,12 +440,9 @@ class GitApplyTree(PatchTree):
|
|
|
os.remove(tmpfile)
|
|
|
return output
|
|
|
finally:
|
|
|
- os.remove(commithook)
|
|
|
- os.remove(applyhook)
|
|
|
- if os.path.exists(commithook_backup):
|
|
|
- shutil.move(commithook_backup, commithook)
|
|
|
- if os.path.exists(applyhook_backup):
|
|
|
- shutil.move(applyhook_backup, applyhook)
|
|
|
+ shutil.rmtree(hooks_dir)
|
|
|
+ if os.path.lexists(hooks_dir_backup):
|
|
|
+ shutil.move(hooks_dir_backup, hooks_dir)
|
|
|
|
|
|
|
|
|
class QuiltTree(PatchSet):
|