Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

Merge with stable

Changeset 2969e5a9ada6…

Parents 17b7fa51cd63…

Parents 437f9ffbd168…

by Yuki KODAMA

Changes to one file · Browse files at 2969e5a9ada6 Showing diff from parent 17b7fa51cd63 437f9ffbd168 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgtk/​thgmq.py Stacked
 
11
12
13
14
 
15
16
17
 
476
477
478
479
 
 
480
481
 
482
483
484
 
 
 
485
486
487
 
546
547
548
 
 
549
550
551
 
11
12
13
 
14
15
16
17
 
476
477
478
 
479
480
481
 
482
483
 
 
484
485
486
487
488
489
 
548
549
550
551
552
553
554
555
@@ -11,7 +11,7 @@
 import gobject  import pango   -from mercurial import error +from mercurial import error, util    from tortoisehg.util.i18n import _  from tortoisehg.util import hglib @@ -476,12 +476,14 @@
  if maxidx < idx:   maxidx = idx   - # find index of first unapplied patch in TreeView + # find index of first unapplied patch after last applied one in TreeView + uminidx = None   for i, row in enumerate(model): - if self.is_unapplied(row[MQ_NAME]): + if uminidx is None and self.is_unapplied(row[MQ_NAME]):   uminidx = i - break - else: + elif self.is_applied(row[MQ_NAME]): + uminidx = None + if uminidx is None:   return False     # check whether operation is possible @@ -546,6 +548,8 @@
  series = q.full_series[:]   for pos, qpos in zip(dirty, qdirty):   q.full_series[qpos] = series[model[pos][MQ_INDEX]] + if len(set(q.full_series)) != len(q.full_series): # found duplicates + raise util.Abort(_('series become inconsistent during reorder'))   q.series_dirty = True   q.save_dirty()