Mercurial > public > mercurial-scm > hg
diff mercurial/match.py @ 20033:f962870712da
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 | 681f7b9213a4 |
| children | 906358d0350e |
line wrap: on
line diff
--- a/mercurial/match.py Wed Nov 06 14:38:34 2013 -0500 +++ b/mercurial/match.py Wed Nov 06 18:19:04 2013 -0500 @@ -6,7 +6,7 @@ # GNU General Public License version 2 or any later version. import re -import scmutil, util, fileset +import util, fileset, pathutil from i18n import _ def _rematcher(pat): @@ -317,7 +317,7 @@ pats = [] for kind, name in [_patsplit(p, default) for p in names]: if kind in ('glob', 'relpath'): - name = scmutil.canonpath(root, cwd, name, auditor) + name = pathutil.canonpath(root, cwd, name, auditor) elif kind in ('relglob', 'path'): name = util.normpath(name) elif kind in ('listfile', 'listfile0'):