Bugfix: get the parser if no vcs found in install_hook

This commit is contained in:
Florian Rathgeber 2013-09-14 16:53:39 +01:00
parent e761600ca5
commit fafa844dce

View file

@ -138,12 +138,14 @@ def _get_files(repo, **kwargs):
def find_vcs(): def find_vcs():
if os.path.isdir('.git'): _, git_dir, _ = run('git rev-parse --git-dir')
if not os.path.isdir('.git/hooks'): if git_dir and os.path.isdir(git_dir[0]):
os.mkdir('.git/hooks') if not os.path.isdir(os.path.join(git_dir[0], 'hooks')):
return '.git/hooks/pre-commit' os.mkdir(os.path.join(git_dir[0], 'hooks'))
elif os.path.isdir('.hg'): return os.path.join(git_dir[0], 'hooks', 'pre-commit')
return '.hg/hgrc' _, hg_dir, _ = run('hg root')
if hg_dir and os.path.isdir(hg_dir[0]):
return os.path.join(hg_dir[0], '.hg', 'hgrc')
return '' return ''
@ -193,7 +195,7 @@ def install_hook():
vcs = find_vcs() vcs = find_vcs()
if not vcs: if not vcs:
p = get_parser() p = get_parser()[0]
sys.stderr.write('Error: could not find either a git or mercurial ' sys.stderr.write('Error: could not find either a git or mercurial '
'directory. Please re-run this in a proper ' 'directory. Please re-run this in a proper '
'repository.') 'repository.')