Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0.1, 1.0.2, and 1.0.3

stable thgmq: check duplicates before saving reordered series file

Once series file broken, 'hgtk log' doesn't start at all.
So it seems safer to check consistency before saving series file.

Changeset d38af8bd2e69…

Parent d0057328f8f4…

by Yuya Nishihara

Changes to one file · Browse files at d38af8bd2e69 Showing diff from parent d0057328f8f4 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgtk/​thgmq.py Stacked
 
11
12
13
14
 
15
16
17
 
546
547
548
 
 
549
550
551
 
11
12
13
 
14
15
16
17
 
546
547
548
549
550
551
552
553
@@ -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 @@ -546,6 +546,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()