Subject says it all. Trivial patch that removes a reference to Olive
from the merge dialog.
Cheers,
Jelmer
--
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: [EMAIL PROTECTED]
# target_branch: lp:bzr-gtk
# testament_sha1: 31bcf5a34cdc859d82e667ec5cbdfd1321669273
# timestamp: 2008-07-26 00:28:17 +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:
=== modified file 'merge.py'
--- merge.py 2008-07-25 15:42:45 +0000
+++ merge.py 2008-07-25 22:28:09 +0000
@@ -37,7 +37,7 @@
def __init__(self, wt, wtpath, default_branch_path=None, parent=None):
""" Initialize the Merge dialog. """
- gtk.Dialog.__init__(self, title="Olive - Merge",
+ gtk.Dialog.__init__(self, title="Merge changes",
parent=parent,
flags=0,
buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
# 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
