Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

Merge with stable

Changeset 4a37ab121150…

Parents b25b1abdfcd8…

Parents 1e6113192023…

by Steve Borho

Changes to 3 files · Browse files at 4a37ab121150 Showing diff from parent b25b1abdfcd8 1e6113192023 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​gdialog.py Stacked
 
884
885
886
887
 
888
889
890
 
884
885
886
 
887
888
889
890
@@ -884,7 +884,7 @@
  return # close dialog   # Cancel button or dialog closing by the user   elif response_id in (gtk.RESPONSE_CLOSE, gtk.RESPONSE_DELETE_EVENT): - if self.cmd.is_alive(): + if hasattr(self, 'cmd') and self.cmd.is_alive():   ret = Confirm(_('Confirm Abort'), [], self,   _('Do you want to abort?')).run()   if ret == gtk.RESPONSE_YES:
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​guess.py Stacked
 
307
308
309
310
 
311
312
 
 
313
314
315
 
307
308
309
 
310
311
 
312
313
314
315
316
@@ -307,9 +307,10 @@
    def search_wait(self, thread, q):   canmodel = self.cantree.get_model() - while q.qsize(): + while canmodel and q.qsize():   source, dest, sim = q.get(0) - canmodel.append( [source, hglib.toutf(source), dest, hglib.toutf(dest), sim, True] ) + canmodel.append( [source, hglib.toutf(source), dest, + hglib.toutf(dest), sim, True] )   if thread.isAlive():   return True   else:
Change 1 of 3 Show Entire File tortoisehg/​hgtk/​thgshelve.py Stacked
 
53
54
55
56
 
57
58
59
60
61
62
63
64
65
 
 
 
 
66
67
68
 
78
79
80
81
82
83
84
85
 
 
 
 
 
86
87
88
 
95
96
97
98
 
99
100
101
 
53
54
55
 
56
57
58
59
60
61
 
 
 
 
62
63
64
65
66
67
68
 
78
79
80
 
 
 
 
 
81
82
83
84
85
86
87
88
 
95
96
97
 
98
99
100
101
@@ -53,16 +53,16 @@
    def save_settings(self):   settings = GStatus.save_settings(self) - settings['gshelve'] = self.vpaned.get_position() + #settings['gshelve'] = self.vpaned.get_position()   return settings       def load_settings(self, settings):   GStatus.load_settings(self, settings) - if settings: - self._setting_vpos = settings['gshelve'] - else: - self._setting_vpos = -1 + #if settings: + # self._setting_vpos = settings['gshelve'] + #else: + # self._setting_vpos = -1       def get_tbbuttons(self): @@ -78,11 +78,11 @@
    def get_body(self):   status_body = GStatus.get_body(self) - vbox = gtk.VBox() # For named shelf collection - self.vpaned = gtk.VPaned() - self.vpaned.add1(vbox) - self.vpaned.add2(status_body) - self.vpaned.set_position(self._setting_vpos) + #vbox = gtk.VBox() # For named shelf collection + #self.vpaned = gtk.VPaned() + #self.vpaned.add1(vbox) + #self.vpaned.add2(status_body) + #self.vpaned.set_position(self._setting_vpos)   self.activate_shelve_buttons(True)     self.patch_text = gtk.TextView() @@ -95,7 +95,7 @@
  scroller.add(self.patch_text)   self.diff_notebook.append_page(scroller, gtk.Label(_('Shelf Contents')))   self.diff_notebook.show_all() - return self.vpaned + return status_body     def get_custom_menus(self):   def shelve(menuitem, files):