Mercurial > hg-stable

changeset 13120:8568bbdfbafe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 10 Dec 2010 19:20:11 -0600
parents c36dad4f6e54 (current diff) ecf7d6e0eef0 (diff)
children bf763946f8b0
files mercurial/subrepo.py
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/hook.py	Fri Dec 10 13:30:37 2010 -0600
+++ b/mercurial/hook.py	Fri Dec 10 19:20:11 2010 -0600
@@ -135,6 +135,9 @@
             elif cmd.startswith('python:'):
                 if cmd.count(':') >= 2:
                     path, cmd = cmd[7:].rsplit(':', 1)
+                    path = util.expandpath(path)
+                    if repo:
+                        path = os.path.join(repo.root, path)
                     mod = extensions.loadpath(path, 'hghook.%s' % hname)
                     hookfn = getattr(mod, cmd)
                 else: