Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

history: do not disable 'hide merges' when graph column is shown

selecting the 'hide merges' filter option now implicitly disables the graph

Changeset c9fcf21829ca…

Parent e29f7b593ef6…

by Adrian Buehlmann

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

Change 1 of 4 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
383
384
385
386
 
387
388
389
 
584
585
586
 
 
 
 
587
588
589
 
590
591
592
 
595
596
597
598
 
599
600
601
602
603
604
 
605
606
607
 
611
612
613
614
 
615
616
617
 
383
384
385
 
386
387
388
389
 
584
585
586
587
588
589
590
591
592
 
593
594
595
596
 
599
600
601
 
602
603
604
605
606
607
 
608
609
610
611
 
615
616
617
 
618
619
620
621
@@ -383,7 +383,7 @@
    def update_hide_merges_button(self):   compatible = self.filter in ['all', 'branch', 'custom'] - if not self.graphcol and compatible: + if compatible:   self.hidemerges.set_sensitive(True)   else:   self.hidemerges.set_active(False) @@ -584,9 +584,13 @@
  if self.filter != 'custom':   self.filterentry.set_text('')   + graphcol = self.graphcol + if self.no_merges: + graphcol = False +   if self.filter == 'branch':   branch = opts.get('branch', None) - self.graphview.refresh(self.graphcol, None, opts) + self.graphview.refresh(graphcol, None, opts)   ftitle(_('%s branch') % branch)   elif self.filter == 'custom':   npats = hglib.normpats(pats) @@ -595,13 +599,13 @@
  if kind == 'path' and not os.path.isdir(name):   ftitle(_('file history: ') + hglib.toutf(name))   opts['filehist'] = name - self.graphview.refresh(self.graphcol, [name], opts) + self.graphview.refresh(graphcol, [name], opts)   if not opts.get('filehist'):   ftitle(_('custom filter'))   self.graphview.refresh(False, npats, opts)   elif self.filter == 'all':   ftitle(None) - self.graphview.refresh(self.graphcol, None, opts) + self.graphview.refresh(graphcol, None, opts)   elif self.filter == 'only_merges':   ftitle(_('merges'))   opts['only_merges'] = True @@ -611,7 +615,7 @@
  range = [self.currevid, 0]   opts['noheads'] = True   opts['revrange'] = range - self.graphview.refresh(self.graphcol, None, opts) + self.graphview.refresh(graphcol, None, opts)   elif self.filter == 'tagged':   ftitle(_('tagged revisions'))   tagged = []