This makes us use Branch._get_nick(local=True) rather than Branch.nick everywhere, since the latter *might* look at the master branches' nick (which is often remote).
There was an open bug about this, but I can't find it at the moment. Cheers, Jelmer
# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: [email protected] # target_branch: lp:bzr-gtk # testament_sha1: 20514135251239bf2d673e81d97a0654df7a3ec1 # timestamp: 2009-05-04 22:07:35 +0200 # base_revision_id: [email protected] # # Begin patch === modified file 'annotate/gannotate.py' --- annotate/gannotate.py 2008-04-29 08:17:01 +0000 +++ annotate/gannotate.py 2009-05-04 20:06:58 +0000 @@ -139,7 +139,7 @@ current_revision.timestamp = time.time() current_revision.message = '[Not yet committed]' current_revision.parent_ids = tree.get_parent_ids() - current_revision.properties['branch-nick'] = self.branch.nick + current_revision.properties['branch-nick'] = self.branch._get_nick(local=True) current_revno = '%d?' % (self.branch.revno() + 1) repository = self.branch.repository if self.revision_id == CURRENT_REVISION: === modified file 'nautilus-bzr.py' --- nautilus-bzr.py 2008-07-27 12:01:06 +0000 +++ nautilus-bzr.py 2009-05-04 20:06:58 +0000 @@ -86,7 +86,8 @@ from bzrlib.plugins.gtk.diff import DiffWindow window = DiffWindow() - window.set_diff(tree.branch.nick, tree, tree.branch.basis_tree()) + window.set_diff(tree.branch._get_nick(local=True), tree, + tree.branch.basis_tree()) window.show() return === modified file 'olive/__init__.py' --- olive/__init__.py 2008-10-28 15:11:19 +0000 +++ olive/__init__.py 2009-05-04 20:06:58 +0000 @@ -665,7 +665,8 @@ """ Statistics/Differences... menu handler. """ window = DiffWindow(parent=self.window) parent_tree = self.wt.branch.repository.revision_tree(self.wt.branch.last_revision()) - window.set_diff(self.wt.branch.nick, self.wt, parent_tree) + window.set_diff(self.wt.branch._get_nick(local=True), self.wt, + parent_tree) window.show() def on_menuitem_stats_infos_activate(self, widget): === modified file 'olive/menu.py' --- olive/menu.py 2008-07-24 19:33:17 +0000 +++ olive/menu.py 2009-05-04 20:06:58 +0000 @@ -310,7 +310,7 @@ wt = WorkingTree.open_containing(self.path)[0] window = DiffWindow(self.app) parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision()) - window.set_diff(wt.branch.nick, wt, parent_tree) + window.set_diff(wt.branch._get_nick(local=True), wt, parent_tree) window.set_file(wt.relpath(self.path + os.sep + self.selected)) window.show() @@ -367,7 +367,7 @@ wt = WorkingTree.open_containing(self.path)[0] window = DiffWindow(self.app) parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision()) - window.set_diff(wt.branch.nick, wt, parent_tree) + window.set_diff(wt.branch._get_nick(local=True), wt, parent_tree) window.show() def view_remote(self, action): === modified file 'viz/branchwin.py' --- viz/branchwin.py 2009-04-10 01:35:07 +0000 +++ viz/branchwin.py 2009-05-04 20:06:58 +0000 @@ -55,7 +55,7 @@ else: self.compact_view = False - self.set_title(branch.nick + " - revision history") + self.set_title(branch._get_nick(local=True) + " - revision history") # user-configured window size size = self._load_size('viz-window-size') @@ -624,7 +624,7 @@ rev_tree = self.branch.repository.revision_tree(revid) parent_tree = self.branch.repository.revision_tree(parentid) - description = revid + " - " + self.branch.nick + description = revid + " - " + self.branch._get_nick(local=True) window.set_diff(description, rev_tree, parent_tree) window.show() # 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
