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

status: add visual diff tool button

Fixes #458

Changeset 5621d711fa0c…

Parent 700edd241e1f…

by Steve Borho

Changes to one file · Browse files at 5621d711fa0c Showing diff from parent 700edd241e1f Diff from another changeset...

Change 1 of 3 Show Entire File hggtk/​status.py Stacked
 
150
151
152
153
154
 
 
155
156
157
 
425
426
427
 
428
429
430
 
992
993
994
 
 
 
 
 
 
 
 
 
995
996
997
 
150
151
152
 
 
153
154
155
156
157
 
425
426
427
428
429
430
431
 
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
@@ -150,8 +150,8 @@
  self.save_clicked, tip=_('Save selected changes'))]   else:   tbuttons += [ - self.make_toolbutton(gtk.STOCK_MEDIA_REWIND, _('Visual'), - self.revert_clicked, + self.make_toolbutton(gtk.STOCK_JUSTIFY_FILL, _('_Diff'), + self.diff_clicked,   tip=_('Visual diff checked files')),   self.make_toolbutton(gtk.STOCK_MEDIA_REWIND, _('Re_vert'),   self.revert_clicked, @@ -425,6 +425,7 @@
  self.selcb.set_active(file_count and file_count == check_count)     sensitive = check_count and not self.merging + self.get_toolbutton(_('_Diff')).set_sensitive(sensitive)   self.get_toolbutton(_('Re_vert')).set_sensitive(sensitive)   self.get_toolbutton(_('_Add')).set_sensitive(sensitive)   self.get_toolbutton(_('_Remove')).set_sensitive(sensitive) @@ -992,6 +993,15 @@
  finally:   fp.close()   + def diff_clicked(self, toolbutton, data=None): + diff_list = self.relevant_checked_files('MAR!') + if len(diff_list) > 0: + self._do_diff(diff_list, self.opts) + else: + gdialog.Prompt(_('Nothing Diffed'), + _('No diffable files selected'), self).run() + return True +   def revert_clicked(self, toolbutton, data=None):   revert_list = self.relevant_checked_files('MAR!')   if len(revert_list) > 0: