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

status: use self.merging instead of hasattr()

Changeset e3cfe8f12798…

Parent 17b4f566bffd…

by Steve Borho

Changes to one file · Browse files at e3cfe8f12798 Showing diff from parent 17b4f566bffd Diff from another changeset...

Change 1 of 4 Show Entire File hggtk/​status.py Stacked
 
603
604
605
606
 
607
608
609
 
985
986
987
988
 
989
990
991
 
994
995
996
997
 
998
999
1000
 
1021
1022
1023
1024
 
1025
1026
1027
 
603
604
605
 
606
607
608
609
 
985
986
987
 
988
989
990
991
 
994
995
996
 
997
998
999
1000
 
1021
1022
1023
 
1024
1025
1026
1027
@@ -603,7 +603,7 @@
  self._show_diff_hunks(files)     # clear buffer after a merge commit - if not files and hasattr(self, 'merge_diff_text'): + if not files and self.merging:   self.merge_diff_text.set_buffer(gtk.TextBuffer())     self.filetree.show() @@ -985,7 +985,7 @@
  finally:   difftext.close()   - if hasattr(self, 'merge_diff_text'): + if self.merging:   return   self._hg_call_wrapper('Diff', dohgdiff)   @@ -994,7 +994,7 @@
  self._diffpane.handler_block(self._diffpane_moved_id)     if togglebutton.get_active(): - if hasattr(self, 'merge_diff_text'): + if self.merging:   self.merge_sel_changed(self.filetree.get_selection(), True)   else:   self.tree_sel_changed(self.filetree.get_selection(), True) @@ -1021,7 +1021,7 @@
  elif paned.get_position() < sizemax - 55:   self.showdiff_toggle.set_active(True)   selection = self.filetree.get_selection() - if hasattr(self, 'merge_diff_text'): + if self.merging:   self.merge_sel_changed(selection, True)   else:   self.tree_sel_changed(selection, True)