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

hglib: match functions moved from cmdutil to scmutil

Changeset 5ca25358fa57…

Parent 521aac34b275…

by Steve Borho

Changes to 4 files · Browse files at 5ca25358fa57 Showing diff from parent 521aac34b275 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​purge.py Stacked
 
9
10
11
12
 
13
14
15
 
203
204
205
206
 
207
208
209
 
9
10
11
 
12
13
14
15
 
203
204
205
 
206
207
208
209
@@ -9,7 +9,7 @@
 import stat  import shutil   -from mercurial import cmdutil, hg, ui +from mercurial import hg, ui    from tortoisehg.util import hglib  from tortoisehg.hgqt.i18n import _, ngettext @@ -203,7 +203,7 @@
  failures.append(trashcan)     self.showMessage.emit('') - match = cmdutil.match(repo, [], {}) + match = hglib.matchall(repo)   match.dir = directories.append   status = repo.status(match=match, ignored=opts['ignored'],   unknown=opts['unknown'], clean=False)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​status.py Stacked
 
398
399
400
401
 
402
403
404
 
398
399
400
 
401
402
403
404
@@ -398,7 +398,7 @@
  else:   # status and commit only pre-check MAR files   precheckfn = lambda x: x < 4 - m = cmdutil.match(self.repo, self.pats) + m = hglib.match(self.repo, self.pats)   status = self.repo.status(match=m, **stopts)   # Record all matched files as initially checked   for i, stat in enumerate(StatusType.preferredOrder):
Change 1 of 2 Show Entire File tortoisehg/​util/​cachethg.py Stacked
 
8
9
10
11
 
12
13
14
 
201
202
203
204
 
205
206
207
 
8
9
10
 
11
12
13
14
 
201
202
203
 
204
205
206
207
@@ -8,7 +8,7 @@
 import os  import sys   -from mercurial import hg, cmdutil, util, ui, node, merge, error +from mercurial import hg, util, ui, node, merge, error  from tortoisehg.util import paths, debugthg, hglib    debugging = False @@ -201,7 +201,7 @@
  tc1 = GetTickCount()     try: - matcher = cmdutil.match(repo, [pdir]) + matcher = hglib.match(repo, [pdir])   repostate = repo.status(match=matcher, ignored=True,   clean=True, unknown=True)   except util.Abort, inst:
Change 1 of 1 Show Entire File tortoisehg/​util/​hglib.py Stacked
 
43
44
45
46
 
47
48
49
 
50
51
52
 
43
44
45
 
46
47
48
 
49
50
51
52
@@ -43,10 +43,10 @@
  from mercurial.url import readauthforuri  try:   # hg >= 1.9 - from mercurial.scmutil import revrange, expandpats, revpair + from mercurial.scmutil import revrange, expandpats, revpair, match, matchall  except (ImportError, AttributeError):   # hg <= 1.8 - from mercurial.cmdutil import revrange, expandpats, revpair + from mercurial.cmdutil import revrange, expandpats, revpair, match, matchall  demandimport.enable()    def revsetmatch(ui, pattern):