Trivial patch that makes it possible for us to run when silent
progress bars are being used.
Cheers,
jelmer
--
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: [EMAIL PROTECTED]
# target_branch: lp:bzr-gtk
# testament_sha1: 3540fed88982cd1139d17942eea1bd5a388b4e77
# timestamp: 2008-07-26 00:24:00 +0200
# base_revision_id: [EMAIL PROTECTED]
#
# Begin patch
=== modified file 'branchview/linegraph.py'
--- branchview/linegraph.py 2008-06-30 12:39:07 +0000
+++ branchview/linegraph.py 2008-07-25 22:23:54 +0000
@@ -47,7 +47,7 @@
def update_root_progress(step_number):
"""IFF our container received a root progress bar, then update it."""
if root_progress is not None:
- root_progress.update(None, current_cnt=step_number)
+ root_progress.update(None, step_number)
graph_parents = {}
ghosts = set()
@@ -55,7 +55,7 @@
update_root_progress(1)
progress_bar = ui.ui_factory.nested_progress_bar()
try:
- progress_bar.update(msg="Arranging tree fragments")
+ progress_bar.update("Arranging tree fragments")
for i, (revid, parent_revids) in enumerate(graph.iter_ancestry(start_revs)):
if i % 25 == 0:
progress_bar.tick()
@@ -75,10 +75,10 @@
update_root_progress(2)
progress_bar = ui.ui_factory.nested_progress_bar()
try:
- progress_bar.update(msg="Removing ghosts", total_cnt=len(ghosts))
+ progress_bar.update("Removing ghosts", 0, len(ghosts))
for i, ghost in enumerate(ghosts):
if i % 25 == 0:
- progress_bar.update(None, current_cnt=i)
+ progress_bar.update(None, i)
for ghost_child in graph_children[ghost]:
graph_parents[ghost_child] = [p for p in graph_parents[ghost_child]
if p not in ghosts]
@@ -118,7 +118,7 @@
update_root_progress(3)
progress_bar = ui.ui_factory.nested_progress_bar()
try:
- progress_bar.update(msg="Finding nodes", total_cnt=len(merge_sorted_revisions))
+ progress_bar.update("Finding nodes", 0, len(merge_sorted_revisions))
for (rev_index, (sequence_number,
revid,
merge_depth,
@@ -126,7 +126,7 @@
end_of_merge)) in enumerate(merge_sorted_revisions):
if rev_index % 25 == 0:
- progress_bar.update(None, current_cnt=rev_index)
+ progress_bar.update(None, rev_index)
if maxnum and rev_index >= maxnum:
break
revid_index[revid] = rev_index
@@ -184,10 +184,10 @@
update_root_progress(4)
progress_bar = ui.ui_factory.nested_progress_bar()
try:
- progress_bar.update(msg="Organizing edges", total_cnt=len(branch_ids))
+ progress_bar.update("Organizing edges", len(branch_ids))
for i, branch_id in enumerate(branch_ids):
if i % 25 == 0:
- progress_bar.update(None, current_cnt=i)
+ progress_bar.update(None, i)
branch_line = branch_lines[branch_id]
# Find the col_index for the direct parent branch. This will be the
@@ -314,10 +314,10 @@
update_root_progress(5)
progress_bar = ui.ui_factory.nested_progress_bar()
try:
- progress_bar.update(msg="Pretifying graph", total_cnt=len(lines))
+ progress_bar.update("Pretifying graph", 0, len(lines))
for i, (child_index, parent_index, line_col_indexes) in enumerate(lines):
if i % 25 == 0:
- progress_bar.update(None, current_cnt=i)
+ progress_bar.update(None, i)
(child_col_index, child_color) = linegraph[child_index][1]
(parent_col_index, parent_color) = linegraph[parent_index][1]
=== modified file 'branchview/treeview.py'
--- branchview/treeview.py 2008-07-10 06:23:54 +0000
+++ branchview/treeview.py 2008-07-25 22:23:54 +0000
@@ -109,7 +109,8 @@
gtk.VBox.__init__(self, spacing=0)
loading_msg_widget = ProgressPanel()
- ui.ui_factory.set_nested_progress_bar_widget(loading_msg_widget.get_progress_bar)
+ if getattr(ui.ui_factory, "set_nested_progress_bar_widget", None) is not None:
+ ui.ui_factory.set_nested_progress_bar_widget(loading_msg_widget.get_progress_bar)
self.pack_start(loading_msg_widget, expand=False, fill=True)
self.scrolled_window = gtk.ScrolledWindow()
@@ -276,7 +277,7 @@
"""
self.progress_bar = ui.ui_factory.nested_progress_bar()
- self.progress_bar.update(msg="Loading ancestry graph", total_cnt=5)
+ self.progress_bar.update("Loading ancestry graph", 0, 5)
try:
if self.compact:
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYLWlb4AAsp/gARWQABRZ///
cxXRAL////BQBb7cNVsDNbqu2gtm7W0JJEm1JmIwk8RPSYR5CCaepkGhpoAkkTBJP1RtTCGQNDIA
AAAAJTQiTKZo1NpMKeoxGQ0GQGjEyDIc0xMBGmBGEYAAAAmEYCSRMEE0aGTU2pMJpkMgAAAepFBu
1nPdQHDnC+nDgb88nJcWCiZMr2shYz6hInCmUe5nReynFqxjplohkCIoWPvniXSVGZhCQUDs6xm4
/CuRF60KEZ1yLh1OXPBW6lqMlHaiyomxyXd1PB3/i/wXjB+Se7Gk2dtkq5u2zdAUgy14LZFVy1Ew
4XIrdnz8HRv0zIjsnUZL3sv7klgvizU4tXQSgQNyI4XxZjYOrlrNGrZ4relTbEXYBsoGClmcnGh0
EA/xs1skdCiB0jjhnUrG1zbRC42TTFuBUYw1t5tldJ1MTn5dBkG0ohbU6YhNuSRVMapXQyAkPeDz
cY/gYeTOksHUePc8ZIZJWkCB2tzEGOsqbmOnQzNkRKsdYUa9xF9ljGYdnN73KMLtLDNdpVTdhJKw
u1StScisnEuqwgZGU8A+8pn+7DSgFNYyuc8kbt6QawxHkSK2DqPAoAxUojwHQgSUVJIiQgojOShc
Xn9yHGJGiMa3lZzERxMhgrSiCaJmo1FIaPMC0kQOJWgoRrQQMDanbgImZaftX6lsKyKLVXVmSV1h
4cZGgEByRQyyL6FSBiRWrSZI2ma5FIxcw8WwuxYgrbRsOJruJO1BE4HACsoBorMLG1FpU1asHbi2
DsxcVJ11Mbi4xwwBzeXkGps+hJSV0MzSQXGJJURaULS7MOmjAqSA8Tmy2pSbSuYeoljqJ99kykD6
KiINvmXmNxkudj9qRGrvOuIEc4iBbutubmijlU8ZGG8nzTmEJC7VLb+lhOmoheU1k7U3n7HI74G5
jaSak8IBPApl3IXjHTFrOB2GBfGTvJOZnJhVQehUhPojRQyKJmQmJQIcl24pFO7YHYbyJJCnyQu4
7TMiRvMh5fsOfxMbtiA8zSbV2lh0m0oM5WdXIldxMQ42MNrbU95XVDmHm1+JQsLysIhv72Z/OBal
Ys0jEv65Qioq6MGs3ZZwOgpfgkTFYQvm2RH5aaCegbMs5W9VipELf4E2ggqdOnucG8zcPa9C/ucI
FyqHClqft0a8LIRQuI1/KQPlzYdBqSUE8zgOagxAvTCJInwuRqy4oT01joAMWmY7B5yMZxIjgQLA
kDmcCcurcjNg6ESXShNY7BJrA8oHfCN5T5d3FJfnLpNgzJiYVBPRsMRUkpl4GJjIddE1yXNNAvR6
2g+PqE4ko5I6PeUz5OMJfhFU12zHLN0CNyfkEV4eJGZq9/ofa7axuHAx4dZqmMxxUlvUjlnnCcVQ
X9s+rA7cQk/dlMJKlNCmybqqEp1ZdN5z9mqPFbowIAwG0HxRc5KoBiJxOQQ3GjLHc6lqJsBG16yY
vvBkvMyShbszEfxK90ICydiKUJynuiR4kJCuJqalbbaEdaRBQxhYj1ljy2nIo9h3ue5iJ5xteMV1
qrLaaCnQ56YQwAw9GfWEepESJIL3AVJLlv2eDjBk+VyFysrU4FGjLtZm2VcMPKywSLHSDTGMs56O
p4p0/MCZGiQnMf5C17u67e9UKzdnEPMofJ3mTAiGNDqR217ZDj3UOIkqucMXoDRByrPlC1wPVFtS
2DoyMWOGMuauOXU0f3RwwxYwYfYDB9RXut9PXodU+Dqd0EiajnqVfoqSRd5EtLCNRfe9E5sXsA8C
gs+uMewMW1O+IEDG7MDRaYBb/xdyRThQkILWlb4=
--
bzr-gtk mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.canonical.com/mailman/listinfo/bzr-gtk
