Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

mercurial.util.canonpath was moved to scmutil

Changeset 8de0fdbb7e44…

Parent 1187474d010f…

by Adrian Buehlmann

Changes to 2 files · Browse files at 8de0fdbb7e44 Showing diff from parent 1187474d010f Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​run.py Stacked
 
22
23
24
25
 
26
27
28
 
168
169
170
171
 
172
173
174
 
22
23
24
 
25
26
27
28
 
168
169
170
 
171
172
173
174
@@ -22,7 +22,7 @@
 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 @@ -168,7 +168,7 @@
  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
Change 1 of 2 Show Entire File tortoisehg/​util/​hglib.py Stacked
 
15
16
17
 
18
19
20
 
323
324
325
326
 
327
328
329
330
331
332
 
333
334
335
 
15
16
17
18
19
20
21
 
324
325
326
 
327
328
329
330
331
332
 
333
334
335
336
@@ -15,6 +15,7 @@
 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 @@ -323,13 +324,13 @@
  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)