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

hglib: add a wrapper for mercurial.revset.match interface change

Changeset 9c6621a6f8a4…

Parent 867bbf5b44cb…

by Steve Borho

Changes to 4 files · Browse files at 9c6621a6f8a4 Showing diff from parent 867bbf5b44cb Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​compress.py Stacked
 
125
126
127
128
 
129
130
131
 
125
126
127
 
128
129
130
131
@@ -125,7 +125,7 @@
    def commit(self):   tip, base = self.revs - func = revset.match(self.repo.ui, '%s::%s' % (base, tip)) + func = hglib.revsetmatch(self.repo.ui, '%s::%s' % (base, tip))   revcount = len(self.repo)   revs = [c for c in func(self.repo, range(revcount)) if c != base]   descs = [self.repo[c].description() for c in revs]
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
1127
1128
1129
1130
 
1131
1132
1133
 
1127
1128
1129
 
1130
1131
1132
1133
@@ -1127,7 +1127,7 @@
  B, A = self.menuselection   else:   A, B = self.menuselection - func = revset.match(self.repo.ui, '%s::%s' % (A, B)) + func = hglib.revsetmatch(self.repo.ui, '%s::%s' % (A, B))   return [c for c in func(self.repo, range(len(self.repo)))]     def exportPair():
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​revset.py Stacked
 
377
378
379
380
 
381
382
383
 
377
378
379
 
380
381
382
383
@@ -377,7 +377,7 @@
  cwd = os.getcwd()   try:   os.chdir(self.repo.root) - func = revset.match(self.repo.ui, self.text) + func = hglib.revsetmatch(self.repo.ui, self.text)   l = []   for c in func(self.repo, range(len(self.repo))):   l.append(c)
Change 1 of 2 Show Entire File tortoisehg/​util/​hglib.py Stacked
 
13
14
15
16
 
17
18
19
 
37
38
39
 
 
 
 
 
 
 
 
40
41
42
 
13
14
15
 
16
17
18
19
 
37
38
39
40
41
42
43
44
45
46
47
48
49
50
@@ -13,7 +13,7 @@
   from mercurial import ui, util, extensions, match, bundlerepo, cmdutil  from mercurial import dispatch, encoding, templatefilters, filemerge, error -from mercurial import demandimport +from mercurial import demandimport, revset    demandimport.disable()  try: @@ -37,6 +37,14 @@
  from mercurial.url import hidepassword, removeauth  demandimport.enable()   +def revsetmatch(ui, pattern): + try: + # hg >= 1.9 + return revset.match(ui, pattern) + except TypeError: + # hg <= 1.8 + return revset.match(pattern) +  _encoding = encoding.encoding  _encodingmode = encoding.encodingmode  _fallbackencoding = encoding.fallbackencoding