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

history: update 'column-order' value to enable newly added columns

If 'column-order' value is stored in GLog file, it ignores newly introduced
columns and keeps old columns. In the results, histdetails dialog never show
new columns. So if it detects adding/removing columns, we must update
'column-order' value, even as keep the order of columns.

Changeset be0fffbb66a8

Parent 1640dba0fc6b

by Yuki KODAMA

Changes to one file · Browse files at be0fffbb66a8 Showing diff from parent 1640dba0fc6b Diff from another changeset...

 
662
663
664
665
 
 
 
 
 
 
 
 
 
 
 
 
666
667
668
 
662
663
664
 
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
@@ -662,7 +662,18 @@
  if key in settings:   self.showcol[col] = settings[key]   self.filter_mode = settings.get('filter-mode', 1) - self.column_order = settings.get('column-order', DEFAULT_COLS) + order = settings.get('column-order', DEFAULT_COLS) + order_list, def_list = order.split(), DEFAULT_COLS.split() + order_len, def_len = len(order_list), len(def_list) + if order_len != def_len: + # add newly added columns if exists + added = set(def_list).difference(set(order_list)) + if added: + order_list += list(added) + # remove obsoleted columns if exists + order_list = [c for c in order_list if c in def_list] + order = ' '.join(order_list) + self.column_order = order     def show_toolbar_on_start(self):   return self.show_toolbar