Group :: Development/Other
RPM: bzr-gtk
Main Changelog Spec Patches Sources Download Gear Bugs and FR Repocop
Patch: bzr-gtk-disable-nautilus-pull.patch
Download
Download
Index: bzr-gtk-0.95.0/nautilus-bzr.py
===================================================================
--- bzr-gtk-0.95.0.orig/nautilus-bzr.py
+++ bzr-gtk-0.95.0/nautilus-bzr.py
@@ -185,24 +185,6 @@ class BzrExtension(nautilus.MenuProvider
pp.show()
gtk.main()
- def pull_cb(self, menu, vfs_file):
- # We can only cope with local files
- if vfs_file.get_uri_scheme() != 'file':
- return
-
- file = vfs_file.get_uri()
-
- # We only want to continue here if we get a NotBranchError
- try:
- tree, path = WorkingTree.open_containing(file)
- except NotBranchError:
- return
-
- from bzrlib.plugins.gtk.pull import PullDialog
- dialog = PullDialog(tree, path)
- dialog.display()
- gtk.main()
-
def merge_cb(self, menu, vfs_file):
# We can only cope with local files
if vfs_file.get_uri_scheme() != 'file':
@@ -267,12 +249,6 @@ class BzrExtension(nautilus.MenuProvider
item.connect('activate', self.log_cb, vfs_file)
items.append(item)
- item = nautilus.MenuItem('BzrNautilus::pull',
- 'Pull ...',
- 'Pull from another branch')
- item.connect('activate', self.pull_cb, vfs_file)
- items.append(item)
-
item = nautilus.MenuItem('BzrNautilus::merge',
'Merge ...',
'Merge from another branch')