# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1383779944 18000
# Node ID e3461e8199222cc987eef6df74091539e3f50911
# Parent  2a1cad657b6d59e2f1d274461f0fbd208c9e06d7
pathutil: tease out a new library to break an import cycle from canonpath use

[ original upstream message ]

diff -r 2a1cad657b6d -r e3461e819922 hgkw/keyword.py
--- 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)