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

hglib: expandpats, revpair moved from cmdutil to scmutil

Changeset 521aac34b275…

Parent 083e41414c96…

by Steve Borho

Changes to 2 files · Browse files at 521aac34b275 Showing diff from parent 083e41414c96 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​visdiff.py Stacked
 
180
181
182
183
 
184
185
186
 
191
192
193
194
 
195
196
197
 
180
181
182
 
183
184
185
186
 
191
192
193
 
194
195
196
197
@@ -180,7 +180,7 @@
  else:   ctx1a = p[0]   else: - n1, n2 = cmdutil.revpair(repo, revs) + n1, n2 = hglib.revpair(repo, revs)   ctx1a, ctx2 = repo[n1], repo[n2]   p = ctx2.parents()   if not revs and len(p) > 1: @@ -191,7 +191,7 @@
  _('You likely need to refresh this application'))   return None   - pats = cmdutil.expandpats(pats) + pats = hglib.expandpats(pats)   m = match.match(repo.root, '', pats, None, None, 'relpath')   n2 = ctx2.node()   mod_a, add_a, rem_a = map(set, repo.status(ctx1a.node(), n2, m)[:3])
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 + from mercurial.scmutil import revrange, expandpats, revpair  except (ImportError, AttributeError):   # hg <= 1.8 - from mercurial.cmdutil import revrange + from mercurial.cmdutil import revrange, expandpats, revpair  demandimport.enable()    def revsetmatch(ui, pattern):