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: show selected filter in status bar

Changeset e5ea0f519b09…

Parent 38d136e6378c…

by Adrian Buehlmann

Changes to 2 files · Browse files at e5ea0f519b09 Showing diff from parent 38d136e6378c Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgtk/​gtklib.py Stacked
 
92
93
94
 
 
95
96
97
 
118
119
120
 
 
 
121
122
123
 
92
93
94
95
96
97
98
99
 
120
121
122
123
124
125
126
127
128
@@ -92,6 +92,8 @@
  self.pack_end(self.right1_label, False, False, padding=20)   self.pack_end(self.pbox, False, False, padding=1)   self.pbox.set_child_visible(False) + self.right2_label = gtk.Label() + self.pack_end(self.right2_label, False, False, padding=5)   self.show_all()     def _pulse_timer(self, now=False): @@ -118,6 +120,9 @@
  def set_right1_text(self, msg):   self.right1_label.set_text(str(msg))   + def set_right2_text(self, msg): + self.right2_label.set_text(str(msg)) +   def set_pulse_step(self, val):   self.pbar.set_pulse_step(val)  
Change 1 of 3 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
606
607
608
 
 
609
610
611
612
 
613
614
615
 
621
622
623
 
624
625
626
 
627
628
629
630
 
631
632
633
634
635
636
 
637
638
639
 
643
644
645
 
646
647
648
649
650
 
651
652
653
654
655
 
 
 
 
 
 
 
 
 
 
656
657
658
 
606
607
608
609
610
611
612
613
614
615
616
617
618
 
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
 
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
@@ -606,10 +606,13 @@
  if self.no_merges:   graphcol = False   + filterprefix = _('Filter') + filtertext = filterprefix + ': '   if self.filter == 'branch':   branch = opts.get('branch', None)   self.graphview.refresh(graphcol, None, opts)   ftitle(_('%s branch') % branch) + filtertext += _("Branch '%s'") % branch   elif self.filter == 'custom':   npats = hglib.normpats(pats)   if len(npats) == 1: @@ -621,19 +624,23 @@
  if not opts.get('filehist'):   ftitle(_('custom filter'))   self.graphview.refresh(False, npats, opts) + filtertext += self.filtercombo.get_active_text()   elif self.filter == 'all':   ftitle(None)   self.graphview.refresh(graphcol, None, opts) + filtertext = ''   elif self.filter == 'only_merges':   ftitle(_('merges'))   opts['only_merges'] = True   self.graphview.refresh(False, [], opts) + filtertext += _('only Merges')   elif self.filter == 'ancestry':   ftitle(_('revision ancestry'))   range = [self.currevid, 0]   opts['noheads'] = True   opts['revrange'] = range   self.graphview.refresh(graphcol, None, opts) + filtertext += _("Ancestry of %s") % self.currevid   elif self.filter == 'tagged':   ftitle(_('tagged revisions'))   tagged = [] @@ -643,16 +650,28 @@
  tagged.insert(0, hr)   opts['revlist'] = tagged   self.graphview.refresh(False, [], opts) + filtertext += _("Tagged Revisions")   elif self.filter == 'parents':   ftitle(_('working parents'))   repo_parents = [x.rev() for x in self.repo.parents()]   opts['revlist'] = [str(x) for x in repo_parents]   self.graphview.refresh(False, [], opts) + filtertext += _("Parents")   elif self.filter == 'heads':   ftitle(_('heads'))   heads = [self.repo[x].rev() for x in self.repo.heads()]   opts['revlist'] = [str(x) for x in heads]   self.graphview.refresh(False, [], opts) + filtertext += _("Heads") + + nomergestext = _('no Merges') + if self.no_merges: + if filtertext: + filtertext += ', %s' % nomergestext + else: + filtertext = '%s: %s' % (filterprefix, nomergestext) + + self.stbar.set_right2_text(filtertext)     # refresh MQ widget if exists   if hasattr(self, 'mqwidget'):