Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

status: hide merge column unless working dir has two parents

Changeset 05f7313b5f5c…

Parent a961a823bb4f…

by Steve Borho

Changes to one file · Browse files at 05f7313b5f5c Showing diff from parent a961a823bb4f Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​status.py Stacked
 
276
277
278
279
 
280
281
282
 
292
293
294
295
296
297
298
299
 
 
 
 
 
 
300
301
302
 
276
277
278
 
279
280
281
282
 
292
293
294
 
 
 
 
 
295
296
297
298
299
300
301
302
303
@@ -276,7 +276,7 @@
  stat_cell = gtk.CellRendererText()     self.selcb = None - if len(self.repo.changectx(None).parents()) != 2: + if len(self.repo['.'].parents()) != 2:   # show file selection checkboxes only when applicable   col0 = gtk.TreeViewColumn('', toggle_cell)   col0.add_attribute(toggle_cell, 'active', FM_CHECKED) @@ -292,11 +292,12 @@
  col1.set_resizable(False)   self.filetree.append_column(col1)   - col = gtk.TreeViewColumn(_('ms'), stat_cell) - col.add_attribute(stat_cell, 'text', FM_MERGE_STATUS) - col.set_sort_column_id(4) - col.set_resizable(False) - self.filetree.append_column(col) + if len(self.repo['.'].parents()) == 2: + col = gtk.TreeViewColumn(_('ms'), stat_cell) + col.add_attribute(stat_cell, 'text', FM_MERGE_STATUS) + col.set_sort_column_id(4) + col.set_resizable(False) + self.filetree.append_column(col)     col2 = gtk.TreeViewColumn(_('path'), path_cell)   col2.add_attribute(path_cell, 'text', FM_PATH_UTF8)