Mercurial > public > mercurial-scm > hg-stable

diff hgext/keyword.py @ 20033:f962870712da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pathutil: tease out a new library to break an import cycle from canonpath use
author Augie Fackler <raf@durin42.com>
date Wed, 06 Nov 2013 18:19:04 -0500
parents de16c673455b
children 7ad2ae7792ad
line wrap: on
line diff
--- a/hgext/keyword.py	Wed Nov 06 14:38:34 2013 -0500
+++ b/hgext/keyword.py	Wed Nov 06 18:19:04 2013 -0500
@@ -84,7 +84,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
@@ -673,7 +673,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)