pathutil: tease out a new library to break an import cycle from canonpath use
[ original upstream message ]
--- a/hgkw/keyword.py Mon Nov 25 22:00:46 2013 +0100
+++ b/hgkw/keyword.py Wed Nov 06 18:19:04 2013 -0500
@@ -83,7 +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 import scmutil, pathutil
from mercurial.hgweb import webcommands
from mercurial.i18n import _
import os, re, shutil, tempfile
@@ -676,7 +676,7 @@
expansion. '''
source = repo.dirstate.copied(dest)
if 'l' in wctx.flags(source):
- source = scmutil.canonpath(repo.root, cwd,
+ source = pathutil.canonpath(repo.root, cwd,
os.path.realpath(source))
return kwt.match(source)