Missed one spot in my previous patch. Should be fixed now.
Cheers,
Jelmer
--
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: [EMAIL PROTECTED]
# target_branch: lp:bzr-gtk
# testament_sha1: c8ead9a49ea14c6d726477ed07d1efb670b837e6
# timestamp: 2008-07-26 00:26:38 +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:26:32 +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", 0, 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
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
--
bzr-gtk mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.canonical.com/mailman/listinfo/bzr-gtk
