# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1292030411 21600
# Node ID 8568bbdfbafe2c0bbca984ff284a9a3b95e9c08d
# Parent  c36dad4f6e546710841e82f444ecf401e8746953# Parent  ecf7d6e0eef048771314ce1c85bbd4aed7391bca
merge with stable

diff -r c36dad4f6e54 -r 8568bbdfbafe mercurial/hook.py
--- 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:
diff -r c36dad4f6e54 -r 8568bbdfbafe mercurial/subrepo.py
diff -r c36dad4f6e54 -r 8568bbdfbafe tests/test-subrepo-relative-path.t