This makes the nautilus-bzr menu options use the convention that menu
items that lead to a dialog end with three dots.
It also fixes the use of viz, merge and gannotate from nautilus-bzr.
Jelmer
--
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: [EMAIL PROTECTED]
# target_branch: lp:bzr-gtk
# testament_sha1: 20cfb039d0c49c4854625bfff5fad4924efbe434
# timestamp: 2008-07-26 00:29:55 +0200
# base_revision_id: [EMAIL PROTECTED]
#
# Begin patch
=== modified file '__init__.py'
--- __init__.py 2008-07-25 15:42:45 +0000
+++ __init__.py 2008-07-25 22:29:51 +0000
@@ -234,7 +234,7 @@
:return: The viz window object.
"""
- from viz import BranchWindow
+ from bzrlib.plugins.gtk.viz import BranchWindow
return BranchWindow(branch, revisions, limit)
=== modified file 'nautilus-bzr.py'
--- nautilus-bzr.py 2008-05-05 18:16:46 +0000
+++ nautilus-bzr.py 2008-07-25 22:29:51 +0000
@@ -19,7 +19,10 @@
from bzrlib.plugin import load_plugins
load_plugins()
-from bzrlib.plugins.gtk import _i18n, cmd_visualise, cmd_gannotate
+from bzrlib.plugins.gtk import _i18n, cmd_gannotate, start_viz_window
+
+print "Bazaar nautilus module initialized"
+
class BzrExtension(nautilus.MenuProvider, nautilus.ColumnProvider, nautilus.InfoProvider):
def __init__(self):
@@ -174,14 +177,13 @@
# We only want to continue here if we get a NotBranchError
try:
- tree, path = WorkingTree.open_containing(file)
+ branch, path = Branch.open_containing(file)
except NotBranchError:
return
- vis = cmd_visualise()
- vis.run(file)
-
- return
+ pp = start_viz_window(branch, [branch.last_revision()])
+ pp.show()
+ gtk.main()
def pull_cb(self, menu, vfs_file):
# We can only cope with local files
@@ -216,8 +218,7 @@
from bzrlib.plugins.gtk.merge import MergeDialog
dialog = MergeDialog(tree, path)
- dialog.display()
- gtk.main()
+ dialog.run()
def get_background_items(self, window, vfs_file):
items = []
@@ -237,7 +238,7 @@
items.append(item)
item = nautilus.MenuItem('BzrNautilus::clone',
- 'Checkout Bazaar branch',
+ 'Checkout Bazaar branch ...',
'Checkout Existing Bazaar Branch')
item.connect('activate', self.clone_cb, vfs_file)
items.append(item)
@@ -254,31 +255,31 @@
return item,
else:
item = nautilus.MenuItem('BzrNautilus::disable',
- 'Disable Bazaar Plugin for the Branch',
+ 'Disable Bazaar Plugin this Branch',
'Disable Bazaar plugin for nautilus')
item.connect('activate', self.toggle_integration, 'False', vfs_file)
items.append(item)
item = nautilus.MenuItem('BzrNautilus::log',
- 'Log',
+ 'History ...',
'Show Bazaar history')
item.connect('activate', self.log_cb, vfs_file)
items.append(item)
item = nautilus.MenuItem('BzrNautilus::pull',
- 'Pull',
+ 'Pull ...',
'Pull from another branch')
item.connect('activate', self.pull_cb, vfs_file)
items.append(item)
item = nautilus.MenuItem('BzrNautilus::merge',
- 'Merge',
+ 'Merge ...',
'Merge from another branch')
item.connect('activate', self.merge_cb, vfs_file)
items.append(item)
item = nautilus.MenuItem('BzrNautilus::commit',
- 'Commit',
+ 'Commit ...',
'Commit Changes')
item.connect('activate', self.commit_cb, vfs_file)
items.append(item)
@@ -341,13 +342,13 @@
items.append(item)
elif wtfiles[path] == 'V':
item = nautilus.MenuItem('BzrNautilus::log',
- 'Log',
+ 'History ...',
'List changes')
item.connect('activate', self.log_cb, vfs_file)
items.append(item)
item = nautilus.MenuItem('BzrNautilus::diff',
- 'Diff',
+ 'View Changes ...',
'Show differences')
item.connect('activate', self.diff_cb, vfs_file)
items.append(item)
@@ -359,13 +360,13 @@
items.append(item)
item = nautilus.MenuItem('BzrNautilus::annotate',
- 'Annotate',
+ 'Annotate ...',
'Annotate File Data')
item.connect('activate', self.annotate_cb, vfs_file)
items.append(item)
item = nautilus.MenuItem('BzrNautilus::commit',
- 'Commit',
+ 'Commit ...',
'Commit Changes')
item.connect('activate', self.commit_cb, vfs_file)
items.append(item)
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWe+LZuQAAuX/gERQACJR7///
flJDir////BQBZ7qbUHRTdjczCNDQkkmSepJ+jE1PKn6NBNNTR4TSPUeoGjQGmZQSiQRsmUxRp6R
6nqNDNNQAADQAANT0QU/Sp6aTIxME0AAaAGg0DZQ0OYExNBhMmTJkYTBNNMjEwBDAJJAEAIaIano
TTCRmiGg09NQaNGiQp8N2/pMSxv80EQ/fgT9Fk4FLGckUTJlY3RWPRCKAdinLGQzOFDJA5Gok+D5
Ww5wcgABdV7Sz+v98LFa3v4LyNowMwzAvn/ABGFrDZs7VtXuE9jVnNubZMjFkuli5jehOM3wk0LD
0LT2NNum50JirG2qVBbuVgq1YMLan6bEf2NFp7FY5kFDQFZGp9xQJi0gkMmGz3YxgkP9JcZ2IdmE
CTPa94LzdZoYDf3MVM5huk6maMbuC+na71/eIws4upwDqnckcV3m8Dgc9pC3UEaCJ83KeJzjdO7M
C5HKpgq2xnU5ZZOd6NMopWRqZSMjKxwY9knb2mIHkO85ylHEjYc9gRoTBVghTYYtT6kTxNSJ4+0C
CYxAKVcXTfWEjNiQHJxAqefS+eh33FjY4SrgmIKdaN1mOIxSG1pNtG9Gx0B9qcbSo8eBsAgWNGr2
+KAcYZlr6p7xhnAPAonqbDaYmsIAmRgyImZQC82FyLk83GHlofOUDHJMEaWopAjniVFRWDz+AxnL
RgpdE17XKq2DmGlI0KV3Kx87KOPUM15irTucVVVC59wrSzSG6TOpjk7eBrWK4HuAekaWkS8sOI4k
WkVvVz5tnknmMwkdJoUCxmm+5xI1YlJsAgciRU9823b0hU6hXLhawkKK1REqlKjBkKyoLB5YavOk
0KHEEK0vfAqPYvKRiMb2poPcUMYEbC8yIkzmlk0cR91pwkSHgduZzFxiSN3F5QN4G8DO5i+uTDKg
H31fRBs5q4mlkvixkNeUniOd2OrGkdaMSWfd27wq9BEos2Adl6YUkkEmkS+kAgA8h5U66JmTP7kb
ETzZmy0nePU0OQ6edjjRg7jm7QXpHSF1HUWnI6TpGLAv5+iynWN21C6hRH55+0yYiC2qEgLvf3hi
KJfbIYeQai2+sLjI3AyoC5zsGO8ww48Pto52kDsBGM3qXtsA0FhmO0opHnduIFwGS82Ol63RSClT
DMNJxoSAspsDkLIgmM5QONMMqOTpM+bJlCCsgwcX4iAMxEZWXkHJOY53sHkaGEZdA8NR/C/TIeWn
hmx/fyBZb/Soi2nhfJ4L6YfWoa8iRY1jhD6ohwiZmY4NXH2mo5eo1IFq/Q9nYeldLBx/j/1rrvMk
evW7Ek/YrJf3Nta3IwGcVPi8nc59IgdQ1FxrHUwRA6pVRiypQRhWiv6I5+BRhhhRGJPdljCrAyBu
C3eWwR5nsKEX2d0wXQYzV48c59RwMbQOPXUzH4U+RD5pnuwBL6jTuvHWyK8xoHs2tCceWzBv5e09
CvMLlYC0g5YWIW/sqclNSn0KJm0RjR2TfFlFgojjUCgEGHSclTL6xz5iytE1qcyTLq4/ADrArpuK
6wPR4j7Uj4M7GWjBljiiAJy509Eld7fE8GkU0utttCKRGoQGGHmLOFrRbpphNAGsltq66yrXFGVs
hdskN5sDEvDbUXjlDOJmyhYCtJbcCChhcSkES4kOYzn5QRDPbrx0eOP6lUZp9Z+IL/ncQzWMhDiY
bqrNnE0SGucRv6xxsy5PJIwzCZV62L9QJkp44BZFynGwvUCN96fcleu5vmxVgsuePw8+yKqdvuiT
SrFSq61xWFTCLbTvAm6CDGOBVKBdKjdFT5dAn5QdAr3JiIMFO0P/F3JFOFCQ74tm5A==
--
bzr-gtk mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.canonical.com/mailman/listinfo/bzr-gtk
