1. Brendan Cully
  2. tortoisehg/thg

Commits

Adrian Buehlmann  committed 8de0fdb

mercurial.util.canonpath was moved to scmutil

  • Participants
  • Parent commits 1187474
  • Branches default

Comments (0)

Files changed (2)

File tortoisehg/hgqt/run.py

View file
  • Ignore whitespace
 from PyQt4.QtGui import *
 
 import mercurial.ui as uimod
-from mercurial import hg, util, fancyopts, cmdutil, extensions, error
+from mercurial import hg, scmutil, util, fancyopts, cmdutil, extensions, error
 
 from tortoisehg.hgqt.i18n import agettext as _
 from tortoisehg.util import hglib, paths, shlib, i18n
     files = []
     for f in lines:
         try:
-            cpath = util.canonpath(root, cwd, f)
+            cpath = scmutil.canonpath(root, cwd, f)
             # canonpath will abort on .hg/ paths
         except util.Abort:
             continue

File tortoisehg/util/hglib.py

View file
  • Ignore whitespace
 from mercurial.cmdutil import updatedir
 from mercurial import ui, util, extensions, match, bundlerepo, url, cmdutil
 from mercurial import dispatch, encoding, templatefilters, filemerge, error
+from mercurial import scmutil
 
 _encoding = encoding.encoding
 _encodingmode = encoding.encodingmode
     root = paths.find_root(cwd)
     for f in list:
         try:
-            canonpats.append(util.canonpath(root, cwd, f))
+            canonpats.append(scmutil.canonpath(root, cwd, f))
         except util.Abort:
             # Attempt to resolve case folding conflicts.
             fu = f.upper()
             cwdu = cwd.upper()
             if fu.startswith(cwdu):
-                canonpats.append(util.canonpath(root, cwd, f[len(cwd+os.sep):]))
+                canonpats.append(scmutil.canonpath(root, cwd, f[len(cwd+os.sep):]))
             else:
                 # May already be canonical
                 canonpats.append(f)