This changes the progress bars in bzr-gtk back to provide the old
behaviour; the progress bar widget is not automatically unset after the
first subsequent progress bar finishes.
I don't think there is any other way of doing progress bars
appropriately; a single call to bzrlib may spawn more than one progress
bar, and in the current situation we would be displaying all but the
first progress bar in a separate window.
Ideal would be if each Bazaar operation could support passing in a
progress bar object that it should use. Since this is unlikely to
happen, we will need some global state to keep track of the proper
progress bar widget to use.
I think we should have a "_grab_progress" method on all bzr-gtk windows
that gets called before we do a bzrlib operation, which takes care of
changing the currently active progress bar widget.
Cheers,
Jelmer
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jel...@samba.org-20090613194202-jsg119zbqyh3gddt
# target_branch: bzr+ssh://bazaar.launchpad.net/%7Ebzr-gtk/bzr-\
# gtk/trunk/
# testament_sha1: 92e3289199b77fe670be0b18ad8095297a0aa1d8
# timestamp: 2009-06-13 21:43:43 +0200
# base_revision_id: v.ladeuil...@free.fr-20090612154743-\
# e85g3jqrmqcb64xx
#
# Begin patch
=== modified file 'branchview/treeview.py'
--- branchview/treeview.py 2009-06-12 11:34:44 +0000
+++ branchview/treeview.py 2009-06-13 19:41:19 +0000
@@ -213,7 +213,8 @@
return self.get_property('parents')
def add_tag(self, tag, revid=None):
- if revid is None: revid = self.revision.revision_id
+ if revid is None:
+ revid = self.revision.revision_id
try:
self.branch.unlock()
=== modified file 'ui.py'
--- ui.py 2009-06-12 11:34:44 +0000
+++ ui.py 2009-06-13 19:42:02 +0000
@@ -201,7 +201,6 @@
pbw = self._progress_bar_widget
if pbw:
pbw.finished()
- self.set_progress_bar_widget(None)
def _progress_updated(self, task):
"""See UIFactory._progress_updated"""
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWc+/6vQAAlNfgARQUWv//1MZ
AQC////wUATeu3thUjcw7ZQGwkpMqaNk09KbBTyaIPNSPRBoDQZDAAAAAAAAAAAJSAmEao9MRNPR
A0BoNMIABklGnlND1HqA09RtRkAAAAAkkEaBNoTQ0Ak0wJNHqep6NTam1Hl1/ga8tY/19yk+xs35
8wUxht0c4QZgvYCJq0K8zXP59MhoFGehNUbgjQxjGHvLJvTpmVsHsK+HA9eLazcqzhxn7JYrSRJ7
1YjxWt58tClJ1azSX4NtzYUAYyHAZnFefuiuewzRShQLF0RMD3OyNN9FEs0fCHkmH27C2EcxSlcA
RFJO4sBMzgpwBMSAYE9LDYzhcIGCycViA0gEOUnAq2Fg3d1uIgciC7Ctk76F065RmUoV5aLcEamC
VBY/uO6/z5WgdELNyLoMtuGoqp5du2tjRE5GjmSCtEIpoVUkHucyYbbmXDyTq9mBFKsIjF+caz/j
bfc1FysQoKKqVZAatWPVNxDbQODsRwWYGJflfYPtUxggBFhMtEpAsHjS+XEjl1CzUQMIYgwosv0a
HzKGZF5F320EIz1BMwL5FKw4zrsN1c6cbEOVd9SQO167x9itW+iEWSFlzqwMQGPlOlTFYMUMgOS0
unFG8RJtBHQLWPMhDOBUsfXC2sjKocjC9VzhxKMFKyyVPoA/EpAxxEGs1vtNWsd2SAyZD6h2c78s
YolkYj6gYxMmGCYoXBilFg6B5bGDcMB5jBx8i4mSPoOMA9TE8DkRHB3jDh5WiSSerRmQoeqNpBGn
eIyVkoI5qoaFvJNEAPnFMSChAMxP18qpWx4ImCtKESSnLRw+eQRxCGE0Ch5VS1XkRg06oZklXbAv
oxLkdp3ClKJspnTx+t0uKYZB3KiTfyOnJj0No9nFFkTe2XHg1tphfqRSKcHlQF+dJV9kXRFyLZdA
vR3c/vUj6kfS87x202ZAZnE3di5xXabQtV7dw9LsMokrvqi24+HqP8Hj8HakrKNA+Rwi6RiaeWQ9
JTu+TmB0CwoFsrQ8tYAjWUIdAccytV+WJoVpGdhtxa9c5GkLA6AO47+lSG1D8QuoOpSTLEbVijak
VYn4WLeicCLKBs1Z9zvKlM5rgMTE7/AYVJVSEP9xDEsRMoDTxSr8oR+IFBgANfcAdCX749TxJn6P
cs9h28Ye92nVU+qOam4DAebDUk9FAoIiHZL7hqA4o+IFZZoDoQDUBOfotD8gcTMpNAqVEDUwloUE
EtwEE5bRsTrUVIgwJg64EFI+5u3lIB8+xvJIK60uCScHV4Wz1ZmiM9DQ3CiEgOBZtkSJAxqLCpeg
HmpVoicLcEOekD0oDoIw6GVIj1PnDAn3mI5xAIGpJXWZvDqoGrMoYDGAUMERwwxw5GcSIMM8P6SV
2lCGBxYSQFItlQFAHmtj3GwwIFx6FRAtv3A4IdecypJwaN8DCkwsS54X+1OCFw4lssvNaiuwIogd
W0Xm0eJlM0c6bwIHBMcTnKSADBowlRQabUSyH+LuSKcKEhn3/V6A
--
bzr-gtk mailing list
bzr-gtk@lists.ubuntu.com
Modify settings or unsubscribe at:
https://lists.canonical.com/mailman/listinfo/bzr-gtk
