Backout b78cce2b1430 until a proper solution is found stable
authorChristian Ebert <blacktrash@gmx.net>
Mon, 07 Nov 2011 13:48:11 +0000
branchstable
changeset 998 cc54b798aca4
parent 996 dadecc4f3341
child 999 f89e9c528b38
Backout b78cce2b1430 until a proper solution is found
hgkw/keyword.py
--- a/hgkw/keyword.py	Sat Oct 22 23:21:38 2011 +0200
+++ b/hgkw/keyword.py	Mon Nov 07 13:48:11 2011 +0000
@@ -86,7 +86,7 @@
 from mercurial import scmutil
 from mercurial.hgweb import webcommands
 from mercurial.i18n import _
-import re, shutil, tempfile
+import os, re, shutil, tempfile
 
 commands.optionalrepo += ' kwdemo'
 
@@ -647,7 +647,7 @@
             source = repo.dirstate.copied(dest)
             if 'l' in wctx.flags(source):
                 source = scmutil.canonpath(repo.root, cwd,
-                                           util.realpath(source))
+                                           os.path.realpath(source))
             return kwt.match(source)
 
         candidates = [f for f in repo.dirstate.copies() if