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

stable update: fix inoperable Shelve dialog on update

Fixes #666

Changeset 745097fd7796…

Parent 5987c2a10b62…

by Yuki KODAMA

Changes to one file · Browse files at 745097fd7796 Showing diff from parent 5987c2a10b62 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​update.py Stacked
 
254
255
256
257
258
259
260
261
262
 
 
 
 
 
 
 
 
263
264
265
 
254
255
256
 
 
 
 
 
 
257
258
259
260
261
262
263
264
265
266
267
@@ -254,12 +254,14 @@
  if ret['discard']:   cmdline.append('--clean')   elif ret['shelve']: - from tortoisehg.hgtk import thgshelve - dlg = thgshelve.run(ui.ui()) - dlg.set_transient_for(self) - dlg.set_modal(True) - dlg.display() - dlg.connect('destroy', lambda w: self.update()) + def launch_shelve(): + from tortoisehg.hgtk import thgshelve + dlg = thgshelve.run(ui.ui()) + dlg.set_transient_for(self) + dlg.set_modal(True) + dlg.display() + dlg.connect('destroy', lambda w: self.update()) + gtklib.idle_add_single_call(launch_shelve)   return # retry later, no need to destroy   elif ret['merge']:   pass # no args