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

stable gdialog: remove modal argument from _do_diff()

It needs to always be modal in order for it to be closable

Changeset ac4b569854a7…

Parent 5527a5c0dcf2…

by Steve Borho

Changes to 3 files · Browse files at ac4b569854a7 Showing diff from parent 5527a5c0dcf2 Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​datamine.py Stacked
 
165
166
167
168
 
169
170
171
 
612
613
614
615
 
616
617
618
 
165
166
167
 
168
169
170
171
 
612
613
614
 
615
616
617
618
@@ -165,7 +165,7 @@
  return True     def grep_thgdiff(self, treeview): - self._do_diff([], {'change' : self.currev}, modal=True) + self._do_diff([], {'change' : self.currev})     def grep_row_act(self, tree, path, column):   'Default action is the first entry in the context menu' @@ -612,7 +612,7 @@
  return True     def annotate_thgdiff(self, treeview): - self._do_diff([], {'change' : self.currev}, modal=True) + self._do_diff([], {'change' : self.currev})     def toggle_annatate_columns(self, button, treeview, col):   b = button.get_active()
Change 1 of 1 Show Entire File hggtk/​gdialog.py Stacked
 
402
403
404
405
 
406
407
408
409
410
411
412
413
414
 
 
415
416
417
 
402
403
404
 
405
406
407
408
409
410
411
 
 
 
412
413
414
415
416
@@ -402,16 +402,15 @@
    return True, textout   - def _do_diff(self, canonpats, options, modal=False): + def _do_diff(self, canonpats, options):   from hggtk import visdiff   options['canonpats'] = canonpats   dialog = visdiff.run(self.ui, **options)   if not dialog:   return   dialog.show_all() - if modal: - dialog.run() - dialog.hide() + dialog.run() + dialog.hide()     def _diff_file(self, stat, file):   self._do_diff(file and [file] or [], self.opts)
Change 1 of 1 Show Entire File hggtk/​history.py Stacked
 
560
561
562
563
 
564
565
566
567
568
 
569
570
571
 
560
561
562
 
563
564
565
566
567
 
568
569
570
571
@@ -560,12 +560,12 @@
    def vdiff_change(self, menuitem, pats=[]):   rev = self.currow[treemodel.REVID] - self._do_diff(pats, {'change' : rev}, modal=True) + self._do_diff(pats, {'change' : rev})     def vdiff_local(self, menuitem, pats=[]):   rev = self.currow[treemodel.REVID]   opts = {'rev' : ["%s" % rev]} - self._do_diff(pats, opts, modal=True) + self._do_diff(pats, opts)     def diff_revs(self, menuitem):   rev0, rev1 = self.revs