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

adapt to mq code renamings in mercurial's 6a0070d00bc8

Changeset b2c46942c5fc…

Parent a709cca2b227…

by Adrian Buehlmann

Changes to 5 files · Browse files at b2c46942c5fc Showing diff from parent a709cca2b227 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​mq.py Stacked
 
279
280
281
282
 
283
284
285
 
450
451
452
453
 
454
455
456
 
741
742
743
744
 
745
746
747
 
279
280
281
 
282
283
284
285
 
450
451
452
 
453
454
455
456
 
741
742
743
 
744
745
746
747
@@ -279,7 +279,7 @@
  return   def checkGuardsOrComments():   cont = True - for p in self.repo.mq.full_series: + for p in self.repo.mq.fullseries:   if '#' in p:   cont = QuestionMsgBox('Confirm qreorder',   _('<p>ATTENTION!<br>' @@ -450,7 +450,7 @@
  f = item.font()   f.setItalic(True)   item.setFont(f) - patchguards = repo.mq.series_guards[idx] + patchguards = repo.mq.seriesguards[idx]   if patchguards:   for guard in patchguards:   self.allguards.add(guard[1:]) @@ -741,7 +741,7 @@
  return   def checkGuardsOrComments():   cont = True - for p in self.repo.mq.full_series: + for p in self.repo.mq.fullseries:   if '#' in p:   cont = QuestionMsgBox('Confirm qreorder',   _('<p>ATTENTION!<br>'
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​qfold.py Stacked
 
46
47
48
49
 
50
51
52
 
46
47
48
 
49
50
51
52
@@ -46,7 +46,7 @@
    self.repo = repo   q = self.repo.mq - q.parse_series() + q.parseseries()   self.patches = [p for p in q.series if p in patches]     class PatchListWidget(QListWidget):
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​qqueue.py Stacked
 
218
219
220
221
 
222
223
224
 
218
219
220
 
221
222
223
224
@@ -218,7 +218,7 @@
  self.pl.clear()   patches = []   if q == self.repo.thgactivemqname: - patches = self.repo.mq.full_series + patches = self.repo.mq.fullseries   else:   if q == 'patches':   sf = '/.hg/patches/series'
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
1015
1016
1017
1018
 
1019
1020
1021
 
1237
1238
1239
1240
 
1241
1242
1243
 
1015
1016
1017
 
1018
1019
1020
1021
 
1237
1238
1239
 
1240
1241
1242
1243
@@ -1015,7 +1015,7 @@
  q = self.repo.mq   ispushable = False   unapplied = 0 - for i in xrange(q.series_end(), len(q.series)): + for i in xrange(q.seriesend(), len(q.series)):   pushable, reason = q.pushable(i)   if pushable:   if unapplied == 0: @@ -1237,7 +1237,7 @@
  def qreorderact():   def checkGuardsOrComments():   cont = True - for p in self.repo.mq.full_series: + for p in self.repo.mq.fullseries:   if '#' in p:   cont = QuestionMsgBox('Confirm qreorder',   _('<p>ATTENTION!<br>'
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​thgrepo.py Stacked
 
306
307
308
309
 
310
311
312
 
306
307
308
 
309
310
311
312
@@ -306,7 +306,7 @@
  if MQ not in use.'''   if not hasattr(self, 'mq'): return []   - self.mq.parse_series() + self.mq.parseseries()   return self.mq.series[:]     @property