# HG changeset patch # User Yuki KODAMA <endflow....@gmail.com> # Date 1257087255 -32400 # Branch stable # Node ID a83047e248c98b9e200646354c2b644dc64595ae # Parent 393df20e3c8d323a29bbb031b8b7b2a17d41ad98 update: fix inoperable Shelve dialog on update
Fixes #666
diff --git a/tortoisehg/hgtk/update.py b/tortoisehg/hgtk/update.py
--- a/tortoisehg/hgtk/update.py
+++ b/tortoisehg/hgtk/update.py
@@ -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
thg-kuy-stable_rev4830.patch
Description: Binary data
------------------------------------------------------------------------------ Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference
_______________________________________________ Tortoisehg-develop mailing list Tortoisehg-develop@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
