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

history: add synchronize toolbar button

Do not add button if the changelog dialog was launched
from the synchronize tool

Fixes #177

Changeset ec6d9ad8bc5e…

Parent 780633b84072…

by Steve Borho

Changes to 2 files · Browse files at ec6d9ad8bc5e Showing diff from parent 780633b84072 Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​history.py Stacked
 
41
42
43
44
 
45
46
47
 
59
60
61
 
 
 
 
 
 
 
 
 
 
 
 
 
 
62
63
64
 
41
42
43
 
44
45
46
47
 
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
@@ -41,7 +41,7 @@
  self.ui.quiet = False     def get_tbbuttons(self): - return [ + tbar = [   self.make_toolbutton(gtk.STOCK_REFRESH,   _('Re_fresh'),   self._refresh_clicked, @@ -59,6 +59,20 @@
  tip=_('Search Repository History')),   gtk.SeparatorToolItem()   ] + self.changeview.get_tbbuttons() + if not self.opts.get('from-synch'): + tbar += [ + gtk.SeparatorToolItem(), + self.make_toolbutton(gtk.STOCK_NETWORK, + _('Synchronize'), + self._synch_clicked, + tip=_('Launch synchronize tool')), + ] + return tbar + + def _synch_clicked(self, toolbutton, data): + from synch import SynchDialog + dlg = SynchDialog([], False) + dlg.show_all()     def toggle_view_column(self, button, property):   active = button.get_active()
Change 1 of 1 Show Entire File hggtk/​synch.py Stacked
 
304
305
306
307
 
308
309
310
 
304
305
306
 
307
308
309
310
@@ -304,7 +304,7 @@
  def _view_pulled_changes(self, button):   from history import GLog   countpulled = len(self.repo.changelog) - self.origchangecount - opts = {'limit' : countpulled } + opts = {'limit' : countpulled, 'from-synch' : True}   dialog = GLog(self.ui, None, None, [], opts)   dialog.display()