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: replace 'branches' filter with 'Compact Graph' view setting

Changeset 59ed6e42c31a…

Parent dd3bd11f23d9…

by Adrian Buehlmann

Changes to one file · Browse files at 59ed6e42c31a Showing diff from parent dd3bd11f23d9 Diff from another changeset...

Change 1 of 8 Show Entire File hggtk/​history.py Stacked
 
127
128
129
 
 
 
 
 
 
 
130
131
132
 
236
237
238
 
 
 
 
 
 
 
 
 
239
240
241
 
346
347
348
 
349
350
351
 
359
360
361
 
362
363
364
 
369
370
371
 
372
373
374
 
386
387
388
389
 
390
391
392
 
421
422
423
424
425
426
427
428
429
 
622
623
624
625
626
627
628
629
630
631
 
127
128
129
130
131
132
133
134
135
136
137
138
139
 
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
 
362
363
364
365
366
367
368
 
376
377
378
379
380
381
382
 
387
388
389
390
391
392
393
 
405
406
407
 
408
409
410
411
 
440
441
442
 
 
 
443
444
445
 
638
639
640
 
 
 
 
641
642
643
@@ -127,6 +127,13 @@
  if self.graphcol != active:   self.graphcol = active   self.reload_log() + self.compactgraph_button.set_sensitive(self.graphcol) + + def toggle_compactgraph(self, button): + active = button.get_active() + if self.compactgraph != active: + self.compactgraph = active + self.reload_log()     def toggle_show_filterbar(self, button, property):   self.show_filterbar = button.get_active() @@ -236,6 +243,15 @@
  button.set_active(self.graphcol)   button.set_draw_as_radio(True)   menu.append(button) + + button = gtk.CheckMenuItem(_('Compact Graph')) + button.connect('toggled', self.toggle_compactgraph) + button.set_active(self.compactgraph) + button.set_draw_as_radio(True) + button.set_sensitive(self.graphcol) + menu.append(button) + self.compactgraph_button = button +   button = gtk.CheckMenuItem(_('Show Rev'))   button.connect('toggled', self.toggle_view_column,   'rev-column-visible') @@ -346,6 +362,7 @@
  settings['branch-color'] = self.graphview.get_property('branch-color')   settings['show-filterbar'] = self.show_filterbar   settings['graphcol'] = self.graphcol + settings['compactgraph'] = self.compactgraph   for col in ('rev', 'date', 'id', 'branch', 'utc', 'age', 'tag'):   vis = self.graphview.get_property(col+'-column-visible')   settings['glog-vis-'+col] = vis @@ -359,6 +376,7 @@
  self.branch_color = False   self.show_filterbar = True   self.graphcol = True + self.compactgraph = False   self.showcol = {}   try:   self.setting_vpos = settings['glog-vpane'] @@ -369,6 +387,7 @@
  vis = settings['glog-vis-'+col]   self.showcol[col] = vis   self.graphcol = settings['graphcol'] + self.compactgraph = settings['compactgraph']   except KeyError:   pass   @@ -386,7 +405,7 @@
  opts = {'date': None, 'no_merges':False, 'only_merges':False,   'keyword':[], 'branch':None, 'pats':[], 'filehist':None,   'revrange':[], 'revlist':[], 'noheads':False, - 'branch-view':False, 'rev':[] } + 'branch-view':self.compactgraph, 'rev':[] }   opts.update(kwopts)     # handle strips, rebases, etc @@ -421,9 +440,6 @@
  elif self.filter == 'all':   ftitle(None)   self.graphview.refresh(self.graphcol, None, opts) - elif self.filter == 'branches': - opts['branch-view'] = True - self.graphview.refresh(self.graphcol, None, opts)   elif self.filter == 'new':   ftitle(_('new revisions'))   assert len(self.repo) > self.origtip @@ -622,10 +638,6 @@
  all.connect('toggled', self.filter_selected, 'all')   filterbox.pack_start(all, False)   - all_compact = gtk.RadioButton(all, _('branches')) - all_compact.connect('toggled', self.filter_selected, 'branches') - filterbox.pack_start(all_compact, False) -   self.newbutton = gtk.RadioButton(all, _('new'))   self.newbutton.connect('toggled', self.filter_selected, 'new')   filterbox.pack_start(self.newbutton, False)