[thg-dev] thgshelve: fix obsoleted 'GStatus.merging'

[Yuki KODAMA]

# HG changeset patch
# User Yuki KODAMA <endflow....@gmail.com>
# Date 1254066643 -32400
# Node ID 30246dc350e4890214b2e6b3b1f6d8f97edfcfe7
# Parent  dffb0a41561a594540ef4745cf45d4aaa34d42ef
thgshelve: fix obsoleted 'GStatus.merging'

'GStatus.merging' was eliminated at <00999fa85730>.

diff --git a/tortoisehg/hgtk/thgshelve.py b/tortoisehg/hgtk/thgshelve.py
--- a/tortoisehg/hgtk/thgshelve.py
+++ b/tortoisehg/hgtk/thgshelve.py
@@ -102,7 +102,7 @@
         def shelve(menuitem, files):
             self.shelve_selected(files)
             self.activate_shelve_buttons(True)
-        if self.merging:
+        if self.is_merge():
             return ()
         else:
             return ((_('_shelve'), shelve, 'MAR'),)

------------------------------------------------------------------------------
Come build with us! The BlackBerry&reg; 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&#45;12, 2009. Register now&#33;
http://p.sf.net/sfu/devconf
_______________________________________________
Tortoisehg-develop mailing list
Tortoisehg-develop@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop