keyword: backout realpath change (issue3071) stable
authorMatt Mackall <mpm@selenic.com>
Sun, 30 Oct 2011 12:10:11 -0500
branchstable
changeset 15387 87248de09135
parent 15386 6051d8e7e133
child 15388 eb6c0d47c3d5
child 15395 d2bd51fdd4b7
keyword: backout realpath change (issue3071)
hgext/keyword.py
--- a/hgext/keyword.py	Sun Oct 30 12:10:09 2011 -0500
+++ b/hgext/keyword.py	Sun Oct 30 12:10:11 2011 -0500
@@ -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