--- a/hgkw/keyword.py Sat Apr 09 15:52:19 2011 -0500
+++ b/hgkw/keyword.py Wed Apr 20 21:41:41 2011 +0200
@@ -83,6 +83,7 @@
from mercurial import commands, context, cmdutil, dispatch, filelog, extensions
from mercurial import localrepo, match, patch, templatefilters, templater, util
+from mercurial import scmutil
from mercurial.hgweb import webcommands
from mercurial.i18n import _
import os, re, shutil, tempfile
@@ -619,8 +620,8 @@
expansion. '''
source = repo.dirstate.copied(dest)
if 'l' in wctx.flags(source):
- source = util.canonpath(repo.root, cwd,
- os.path.realpath(source))
+ source = scmutil.canonpath(repo.root, cwd,
+ os.path.realpath(source))
return kwt.match(source)
candidates = [f for f in repo.dirstate.copies() if