/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to nautilus-bzr.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-01 10:46:10 UTC
  • mfrom: (750.1.4 bzr-gtk)
  • Revision ID: jelmer@samba.org-20111201104610-28d43twnvlmosnt8
Use translations in nautilus-bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
2
2
#
3
3
# Copyright (C) 2006 Jeff Bailey
4
4
# Copyright (C) 2006 Wouter van Heyst
5
 
# Copyright (C) 2006-2008 Jelmer Vernooij <jelmer@samba.org>
6
 
#
7
 
# Published under the GNU GPL
8
 
 
9
 
import gtk
10
 
import nautilus
11
 
import bzrlib
12
 
from bzrlib.branch import Branch
13
 
from bzrlib.bzrdir import BzrDir
14
 
from bzrlib.errors import NotBranchError, NoWorkingTree, UnsupportedProtocol
15
 
from bzrlib.tree import file_status
16
 
from bzrlib.workingtree import WorkingTree
17
 
from bzrlib.config import GlobalConfig
 
5
# Copyright (C) 2006-2011 Jelmer Vernooij <jelmer@samba.org>
 
6
#
 
7
# This program is free software; you can redistribute it and/or modify
 
8
# it under the terms of the GNU General Public License as published by
 
9
# the Free Software Foundation; either version 3 of the License, or
 
10
# (at your option) any later version.
 
11
 
 
12
# This program is distributed in the hope that it will be useful,
 
13
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
14
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
15
# GNU General Public License for more details.
 
16
 
 
17
# You should have received a copy of the GNU General Public License
 
18
# along with this program; if not, write to the Free Software
 
19
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
20
 
 
21
# Installation:
 
22
# setup.py can install nautilus-bzr to the right system folder, if pkg-config
 
23
# is present.
 
24
#
 
25
# You can also install nautilus-bzr manually by copying it (or linking it from)
 
26
# ~/.local/share/nautilus-python/extensions/nautilus-bzr.py
 
27
 
 
28
from gi.repository import Gtk, GObject, Nautilus
 
29
from bzrlib.controldir import ControlDir
 
30
from bzrlib.errors import (
 
31
    NotBranchError,
 
32
    NoWorkingTree,
 
33
    )
 
34
from bzrlib.ignores import tree_ignores_add_patterns
 
35
from bzrlib.tree import InterTree
18
36
 
19
37
from bzrlib.plugin import load_plugins
20
38
load_plugins()
21
39
 
22
 
from bzrlib.plugins.gtk import _i18n, cmd_visualise, cmd_gannotate
23
 
 
24
 
class BzrExtension(nautilus.MenuProvider, nautilus.ColumnProvider, nautilus.InfoProvider):
 
40
from bzrlib.plugins.gtk.i18n import _i18n
 
41
 
 
42
 
 
43
class BazaarExtension(Nautilus.MenuProvider, Nautilus.ColumnProvider,
 
44
        Nautilus.InfoProvider, Nautilus.PropertyPageProvider,
 
45
        Nautilus.LocationWidgetProvider, GObject.GObject):
 
46
    """Nautilus extension providing Bazaar integration."""
 
47
 
25
48
    def __init__(self):
26
49
        pass
27
50
 
28
 
    def add_cb(self, menu, vfs_file):
29
 
        # We can only cope with local files
30
 
        if vfs_file.get_uri_scheme() != 'file':
31
 
            return
32
 
 
33
 
        file = vfs_file.get_uri()
34
 
        try:
35
 
            tree, path = WorkingTree.open_containing(file)
36
 
        except NotBranchError:
37
 
            return
38
 
 
 
51
    @classmethod
 
52
    def _open_bzrdir(cls, vfs_file):
 
53
        uri = vfs_file.get_uri()
 
54
        controldir, path = ControlDir.open_containing(uri)
 
55
        return controldir, path
 
56
 
 
57
    @classmethod
 
58
    def _open_tree(cls, vfs_file):
 
59
        controldir, path = cls._open_bzrdir(vfs_file)
 
60
        return controldir.open_workingtree(), path
 
61
 
 
62
    def add_cb(self, menu, tree, path):
39
63
        tree.add(path)
40
64
 
41
 
        return
42
 
 
43
 
    def ignore_cb(self, menu, vfs_file):
44
 
        # We can only cope with local files
45
 
        if vfs_file.get_uri_scheme() != 'file':
46
 
            return
47
 
 
48
 
        file = vfs_file.get_uri()
49
 
        try:
50
 
            tree, path = WorkingTree.open_containing(file)
51
 
        except NotBranchError:
52
 
            return
53
 
 
54
 
        #FIXME
55
 
 
56
 
        return
57
 
 
58
 
    def unignore_cb(self, menu, vfs_file):
59
 
        # We can only cope with local files
60
 
        if vfs_file.get_uri_scheme() != 'file':
61
 
            return
62
 
 
63
 
        file = vfs_file.get_uri()
64
 
        try:
65
 
            tree, path = WorkingTree.open_containing(file)
66
 
        except NotBranchError:
67
 
            return
68
 
 
69
 
        #FIXME
70
 
 
71
 
        return
72
 
 
73
 
    def diff_cb(self, menu, vfs_file):
74
 
        # We can only cope with local files
75
 
        if vfs_file.get_uri_scheme() != 'file':
76
 
            return
77
 
 
78
 
        file = vfs_file.get_uri()
79
 
        try:
80
 
            tree, path = WorkingTree.open_containing(file)
81
 
        except NotBranchError:
82
 
            return
83
 
 
 
65
    def ignore_cb(self, menu, tree, path):
 
66
        # We can only cope with local files
 
67
        tree_ignores_add_patterns(tree, [path])
 
68
        #FIXME: Add path to ignore file
 
69
 
 
70
    def unignore_cb(self, menu, tree, path):
 
71
        pass
 
72
        # We can only cope with local files
 
73
        #FIXME
 
74
 
 
75
    def diff_cb(self, menu, tree, path=None):
84
76
        from bzrlib.plugins.gtk.diff import DiffWindow
85
77
        window = DiffWindow()
86
 
        window.set_diff(tree.branch.nick, tree, tree.branch.basis_tree())
 
78
        window.set_diff(tree.branch._get_nick(local=True), tree, 
 
79
                        tree.branch.basis_tree())
87
80
        window.show()
88
81
 
89
 
        return
90
 
 
91
82
    def newtree_cb(self, menu, vfs_file):
92
 
        # We can only cope with local files
93
 
        if vfs_file.get_uri_scheme() != 'file':
94
 
            return
95
 
 
96
 
        file = vfs_file.get_uri()
97
 
 
98
 
        # We only want to continue here if we get a NotBranchError
99
 
        try:
100
 
            tree, path = WorkingTree.open_containing(file)
101
 
        except NotBranchError:
102
 
            BzrDir.create_standalone_workingtree(file)
103
 
 
104
 
    def remove_cb(self, menu, vfs_file):
105
 
        # We can only cope with local files
106
 
        if vfs_file.get_uri_scheme() != 'file':
107
 
            return
108
 
 
109
 
        file = vfs_file.get_uri()
110
 
        try:
111
 
            tree, path = WorkingTree.open_containing(file)
112
 
        except NotBranchError:
113
 
            return
114
 
 
 
83
        controldir, path = self._open_bzrdir(vfs_file)
 
84
        controldir.create_workingtree()
 
85
 
 
86
    def remove_cb(self, menu, tree, path):
115
87
        tree.remove(path)
116
88
 
117
 
    def annotate_cb(self, menu, vfs_file):
118
 
        # We can only cope with local files
119
 
        if vfs_file.get_uri_scheme() != 'file':
120
 
            return
121
 
 
122
 
        file = vfs_file.get_uri()
123
 
 
124
 
        vis = cmd_gannotate()
125
 
        vis.run(file)
 
89
    def annotate_cb(self, menu, tree, path, file_id):
 
90
        from bzrlib.plugins.gtk.annotate.gannotate import GAnnotateWindow
 
91
        win = GAnnotateWindow()
 
92
        win.show()
 
93
        win.annotate(tree, tree.branch, file_id)
 
94
        Gtk.main()
126
95
 
127
96
    def clone_cb(self, menu, vfs_file=None):
128
 
        # We can only cope with local files
129
 
        if vfs_file.get_uri_scheme() != 'file':
130
 
            return
131
 
 
132
97
        from bzrlib.plugins.gtk.branch import BranchDialog
133
 
        
 
98
        controldir, path = self._open_bzrdir(vfs_file)
 
99
 
134
100
        dialog = BranchDialog(vfs_file.get_name())
135
101
        response = dialog.run()
136
 
        if response != gtk.RESPONSE_NONE:
 
102
        if response != Gtk.ResponseType.NONE:
137
103
            dialog.hide()
138
104
            dialog.destroy()
139
 
 
140
 
    def commit_cb(self, menu, vfs_file=None):
141
 
        # We can only cope with local files
142
 
        if vfs_file.get_uri_scheme() != 'file':
143
 
            return
144
 
 
145
 
        file = vfs_file.get_uri()
146
 
        tree = None
147
 
        branch = None
148
 
        try:
149
 
            tree, path = WorkingTree.open_containing(file)
150
 
            branch = tree.branch
151
 
        except NotBranchError, e:
152
 
            path = e.path
153
 
            #return
154
 
        except NoWorkingTree, e:
155
 
            path = e.base
156
 
            try:
157
 
                (branch, path) = Branch.open_containing(path)
158
 
            except NotBranchError, e:
159
 
                path = e.path
160
 
 
 
105
 
 
106
    def commit_cb(self, menu, tree, path=None):
161
107
        from bzrlib.plugins.gtk.commit import CommitDialog
162
108
        dialog = CommitDialog(tree, path)
163
109
        response = dialog.run()
164
 
        if response != gtk.RESPONSE_NONE:
 
110
        if response != Gtk.ResponseType.NONE:
165
111
            dialog.hide()
166
112
            dialog.destroy()
167
113
 
168
 
    def log_cb(self, menu, vfs_file):
169
 
        # We can only cope with local files
170
 
        if vfs_file.get_uri_scheme() != 'file':
171
 
            return
172
 
 
173
 
        file = vfs_file.get_uri()
174
 
 
175
 
        # We only want to continue here if we get a NotBranchError
176
 
        try:
177
 
            tree, path = WorkingTree.open_containing(file)
178
 
        except NotBranchError:
179
 
            return
180
 
 
181
 
        vis = cmd_visualise()
182
 
        vis.run(file)
183
 
 
184
 
        return
185
 
 
186
 
    def pull_cb(self, menu, vfs_file):
187
 
        # We can only cope with local files
188
 
        if vfs_file.get_uri_scheme() != 'file':
189
 
            return
190
 
 
191
 
        file = vfs_file.get_uri()
192
 
 
193
 
        # We only want to continue here if we get a NotBranchError
194
 
        try:
195
 
            tree, path = WorkingTree.open_containing(file)
196
 
        except NotBranchError:
197
 
            return
198
 
 
 
114
    def log_cb(self, menu, controldir, path=None):
 
115
        from bzrlib.plugins.gtk.viz import BranchWindow
 
116
        branch = controldir.open_branch()
 
117
        pp = BranchWindow(branch, [branch.last_revision()], None)
 
118
        pp.show()
 
119
        Gtk.main()
 
120
 
 
121
    def pull_cb(self, menu, controldir, path=None):
199
122
        from bzrlib.plugins.gtk.pull import PullDialog
200
 
        dialog = PullDialog(tree, path)
 
123
        dialog = PullDialog(controldir.open_workingtree(), path)
201
124
        dialog.display()
202
 
        gtk.main()
203
 
 
204
 
    def merge_cb(self, menu, vfs_file):
205
 
        # We can only cope with local files
206
 
        if vfs_file.get_uri_scheme() != 'file':
207
 
            return
208
 
 
209
 
        file = vfs_file.get_uri()
210
 
 
211
 
        # We only want to continue here if we get a NotBranchError
212
 
        try:
213
 
            tree, path = WorkingTree.open_containing(file)
214
 
        except NotBranchError:
215
 
            return
216
 
 
 
125
        Gtk.main()
 
126
 
 
127
    def merge_cb(self, menu, tree, path=None):
217
128
        from bzrlib.plugins.gtk.merge import MergeDialog
218
129
        dialog = MergeDialog(tree, path)
219
 
        dialog.display()
220
 
        gtk.main()
 
130
        dialog.run()
 
131
        dialog.destroy()
 
132
 
 
133
    def create_tree_cb(self, menu, controldir):
 
134
        controldir.create_workingtree()
221
135
 
222
136
    def get_background_items(self, window, vfs_file):
223
 
        items = []
224
 
        file = vfs_file.get_uri()
225
 
 
226
137
        try:
227
 
            tree, path = WorkingTree.open_containing(file)
228
 
            disabled_flag = self.check_branch_enabled(tree.branch)
229
 
        except UnsupportedProtocol:
 
138
            controldir, path = self._open_bzrdir(vfs_file)
 
139
        except NotBranchError:
230
140
            return
 
141
        try:
 
142
            branch = controldir.open_branch()
231
143
        except NotBranchError:
232
 
            disabled_flag = self.check_branch_enabled()
233
 
            item = nautilus.MenuItem('BzrNautilus::newtree',
234
 
                                 'Make directory versioned',
235
 
                                 'Create new Bazaar tree in this folder')
 
144
            items = []
 
145
            item = Nautilus.MenuItem(name='BzrNautilus::newtree',
 
146
                                 label='Make directory versioned',
 
147
                                 tip='Create new Bazaar tree in this folder',
 
148
                                 icon='')
236
149
            item.connect('activate', self.newtree_cb, vfs_file)
237
150
            items.append(item)
238
151
 
239
 
            item = nautilus.MenuItem('BzrNautilus::clone',
240
 
                                 'Checkout Bazaar branch',
241
 
                                 'Checkout Existing Bazaar Branch')
 
152
            item = Nautilus.MenuItem(name='BzrNautilus::clone',
 
153
                                 label='Checkout Bazaar branch ...',
 
154
                                 tip='Checkout Existing Bazaar Branch',
 
155
                                 icon='')
242
156
            item.connect('activate', self.clone_cb, vfs_file)
243
157
            items.append(item)
244
 
 
245
158
            return items
 
159
 
 
160
        items = []
 
161
 
 
162
        nautilus_integration = self.check_branch_enabled(branch)
 
163
        if not nautilus_integration:
 
164
            item = Nautilus.MenuItem(name='BzrNautilus::enable',
 
165
                                     label='Enable Bazaar Plugin for this Branch',
 
166
                                     tip='Enable Bazaar plugin for nautilus',
 
167
                                     icon='')
 
168
            item.connect('activate', self.toggle_integration, True, branch)
 
169
            return [item]
 
170
        else:
 
171
            item = Nautilus.MenuItem(name='BzrNautilus::disable',
 
172
                                     label='Disable Bazaar Plugin this Branch',
 
173
                                     tip='Disable Bazaar plugin for nautilus',
 
174
                                     icon='')
 
175
            item.connect('activate', self.toggle_integration, False, branch)
 
176
            items.append(item)
 
177
 
 
178
        item = Nautilus.MenuItem(name='BzrNautilus::log',
 
179
                             label='History ...',
 
180
                             tip='Show Bazaar history',
 
181
                             icon='')
 
182
        item.connect('activate', self.log_cb, controldir)
 
183
        items.append(item)
 
184
 
 
185
        item = Nautilus.MenuItem(name='BzrNautilus::pull',
 
186
                             label='Pull ...',
 
187
                             tip='Pull from another branch',
 
188
                             icon='')
 
189
        item.connect('activate', self.pull_cb, controldir)
 
190
        items.append(item)
 
191
 
 
192
        try:
 
193
            tree = controldir.open_workingtree()
246
194
        except NoWorkingTree:
247
 
            return
248
 
        
249
 
        if disabled_flag == 'False':
250
 
            item = nautilus.MenuItem('BzrNautilus::enable',
251
 
                                     'Enable Bazaar Plugin for this Branch',
252
 
                                     'Enable Bazaar plugin for nautilus')
253
 
            item.connect('activate', self.toggle_integration, 'True', vfs_file)
254
 
            return item,
 
195
            item = Nautilus.MenuItem(name='BzrNautilus::create_tree',
 
196
                                 label='Create working tree...',
 
197
                                 tip='Create a working tree for this branch',
 
198
                                 icon='')
 
199
            item.connect('activate', self.create_tree_cb, controldir)
 
200
            items.append(item)
255
201
        else:
256
 
            item = nautilus.MenuItem('BzrNautilus::disable',
257
 
                                      'Disable Bazaar Plugin for the Branch',
258
 
                                      'Disable Bazaar plugin for nautilus')
259
 
            item.connect('activate', self.toggle_integration, 'False', vfs_file)
260
 
            items.append(item)
261
 
 
262
 
        item = nautilus.MenuItem('BzrNautilus::log',
263
 
                             'Log',
264
 
                             'Show Bazaar history')
265
 
        item.connect('activate', self.log_cb, vfs_file)
266
 
        items.append(item)
267
 
 
268
 
        item = nautilus.MenuItem('BzrNautilus::pull',
269
 
                             'Pull',
270
 
                             'Pull from another branch')
271
 
        item.connect('activate', self.pull_cb, vfs_file)
272
 
        items.append(item)
273
 
 
274
 
        item = nautilus.MenuItem('BzrNautilus::merge',
275
 
                             'Merge',
276
 
                             'Merge from another branch')
277
 
        item.connect('activate', self.merge_cb, vfs_file)
278
 
        items.append(item)
279
 
 
280
 
        item = nautilus.MenuItem('BzrNautilus::commit',
281
 
                             'Commit',
282
 
                             'Commit Changes')
283
 
        item.connect('activate', self.commit_cb, vfs_file)
284
 
        items.append(item)
 
202
            item = Nautilus.MenuItem(name='BzrNautilus::merge',
 
203
                                 label='Merge ...',
 
204
                                 tip='Merge from another branch',
 
205
                                 icon='')
 
206
            item.connect('activate', self.merge_cb, tree, path)
 
207
            items.append(item)
 
208
 
 
209
            item = Nautilus.MenuItem(name='BzrNautilus::commit',
 
210
                                 label='Commit ...',
 
211
                                 tip='Commit Changes',
 
212
                                 icon='')
 
213
            item.connect('activate', self.commit_cb, tree, path)
 
214
            items.append(item)
285
215
 
286
216
        return items
287
217
 
 
218
    def _get_file_menuitems(self, tree, intertree, path):
 
219
        file_id = tree.path2id(path)
 
220
        if file_id is None:
 
221
            item = Nautilus.MenuItem(name='BzrNautilus::add',
 
222
                                 label='Add',
 
223
                                 tip='Add as versioned file',
 
224
                                 icon='')
 
225
            item.connect('activate', self.add_cb, tree, path)
 
226
            yield item
 
227
 
 
228
            item = Nautilus.MenuItem(name='BzrNautilus::ignore',
 
229
                                 label='Ignore',
 
230
                                 tip='Ignore file for versioning',
 
231
                                 icon='')
 
232
            item.connect('activate', self.ignore_cb, tree, path)
 
233
            yield item
 
234
        elif tree.is_ignored(path):
 
235
            item = Nautilus.MenuItem(name='BzrNautilus::unignore',
 
236
                                 label='Unignore',
 
237
                                 tip='Unignore file for versioning',
 
238
                                 icon='')
 
239
            item.connect('activate', self.unignore_cb, tree, path)
 
240
            yield item
 
241
        else:
 
242
            item = Nautilus.MenuItem(name='BzrNautilus::log',
 
243
                             label='History ...',
 
244
                             tip='List changes',
 
245
                             icon='')
 
246
            item.connect('activate', self.log_cb, tree.bzrdir, path)
 
247
            yield item
 
248
 
 
249
            if not intertree.file_content_matches(file_id, file_id):
 
250
                item = Nautilus.MenuItem(name='BzrNautilus::diff',
 
251
                                 label='View Changes ...',
 
252
                                 tip='Show differences',
 
253
                                 icon='')
 
254
                item.connect('activate', self.diff_cb, tree, path)
 
255
                yield item
 
256
 
 
257
                item = Nautilus.MenuItem(name='BzrNautilus::commit',
 
258
                             label='Commit ...',
 
259
                             tip='Commit Changes',
 
260
                             icon='')
 
261
                item.connect('activate', self.commit_cb, tree, path)
 
262
                yield item
 
263
 
 
264
            item = Nautilus.MenuItem(name='BzrNautilus::remove',
 
265
                                 label='Remove',
 
266
                                 tip='Remove this file from versioning',
 
267
                                 icon='')
 
268
            item.connect('activate', self.remove_cb, tree, path)
 
269
            yield item
 
270
 
 
271
            item = Nautilus.MenuItem(name='BzrNautilus::annotate',
 
272
                         label='Annotate ...',
 
273
                         tip='Annotate File Data',
 
274
                         icon='')
 
275
            item.connect('activate', self.annotate_cb, tree, path, file_id)
 
276
            yield item
 
277
 
288
278
    def get_file_items(self, window, files):
289
279
        items = []
290
 
        
291
 
        wtfiles = {}
292
 
        for vfs_file in files:
293
 
            # We can only cope with local files
294
 
            if vfs_file.get_uri_scheme() != 'file':
295
 
                continue
296
 
 
297
 
            file = vfs_file.get_uri()
298
 
            try:
299
 
                tree, path = WorkingTree.open_containing(file)
300
 
                disabled_flag = self.check_branch_enabled(tree.branch)
301
 
            except NotBranchError:
302
 
                disabled_flag = self.check_branch_enabled()
303
 
                if not vfs_file.is_directory():
 
280
        trees = {}
 
281
 
 
282
        try:
 
283
            for vfs_file in files:
 
284
                controldir, path = self._open_bzrdir(vfs_file)
 
285
 
 
286
                try:
 
287
                    tree = trees[controldir.user_url]
 
288
                except KeyError:
 
289
                    try:
 
290
                        tree = controldir.open_workingtree()
 
291
                    except NoWorkingTree:
 
292
                        continue
 
293
                    trees[controldir.user_url] = tree
 
294
                    tree.lock_read()
 
295
 
 
296
                nautilus_integration = self.check_branch_enabled(tree.branch)
 
297
                if not nautilus_integration:
304
298
                    continue
305
299
 
306
 
                if disabled_flag == 'False':
307
 
                    return
308
 
 
309
 
                item = nautilus.MenuItem('BzrNautilus::newtree',
310
 
                                     'Make directory versioned',
311
 
                                     'Create new Bazaar tree in %s' % vfs_file.get_name())
312
 
                item.connect('activate', self.newtree_cb, vfs_file)
313
 
                return item,
314
 
            except NoWorkingTree:
315
 
                continue
316
 
            # Refresh the list of filestatuses in the working tree
317
 
            if path not in wtfiles.keys():
318
 
                tree.lock_read()
319
 
                for rpath, file_class, kind, id, entry in tree.list_files():
320
 
                    wtfiles[rpath] = file_class
 
300
                intertree = InterTree.get(tree.basis_tree(), tree)
 
301
                items.extend(list(self._get_file_menuitems(tree, intertree, path)))
 
302
        finally:
 
303
            for tree in trees.itervalues():
321
304
                tree.unlock()
322
 
                wtfiles[u''] = 'V'
323
 
 
324
 
            if wtfiles[path] == '?':
325
 
                item = nautilus.MenuItem('BzrNautilus::add',
326
 
                                     'Add',
327
 
                                     'Add as versioned file')
328
 
                item.connect('activate', self.add_cb, vfs_file)
329
 
                items.append(item)
330
 
 
331
 
                item = nautilus.MenuItem('BzrNautilus::ignore',
332
 
                                     'Ignore',
333
 
                                     'Ignore file for versioning')
334
 
                item.connect('activate', self.ignore_cb, vfs_file)
335
 
                items.append(item)
336
 
            elif wtfiles[path] == 'I':
337
 
                item = nautilus.MenuItem('BzrNautilus::unignore',
338
 
                                     'Unignore',
339
 
                                     'Unignore file for versioning')
340
 
                item.connect('activate', self.unignore_cb, vfs_file)
341
 
                items.append(item)
342
 
            elif wtfiles[path] == 'V':
343
 
                item = nautilus.MenuItem('BzrNautilus::log',
344
 
                                 'Log',
345
 
                                 'List changes')
346
 
                item.connect('activate', self.log_cb, vfs_file)
347
 
                items.append(item)
348
 
 
349
 
                item = nautilus.MenuItem('BzrNautilus::diff',
350
 
                                 'Diff',
351
 
                                 'Show differences')
352
 
                item.connect('activate', self.diff_cb, vfs_file)
353
 
                items.append(item)
354
 
 
355
 
                item = nautilus.MenuItem('BzrNautilus::remove',
356
 
                                     'Remove',
357
 
                                     'Remove this file from versioning')
358
 
                item.connect('activate', self.remove_cb, vfs_file)
359
 
                items.append(item)
360
 
 
361
 
                item = nautilus.MenuItem('BzrNautilus::annotate',
362
 
                             'Annotate',
363
 
                             'Annotate File Data')
364
 
                item.connect('activate', self.annotate_cb, vfs_file)
365
 
                items.append(item)
366
 
 
367
 
                item = nautilus.MenuItem('BzrNautilus::commit',
368
 
                             'Commit',
369
 
                             'Commit Changes')
370
 
                item.connect('activate', self.commit_cb, vfs_file)
371
 
                items.append(item)
372
305
 
373
306
        return items
374
307
 
375
308
    def get_columns(self):
376
 
        return nautilus.Column("BzrNautilus::bzr_status",
377
 
                               "bzr_status",
378
 
                               "Bzr Status",
379
 
                               "Version control status"),
380
 
 
381
 
    def update_file_info(self, file):
382
 
 
383
 
        if file.get_uri_scheme() != 'file':
384
 
            return
385
 
        
386
 
        try:
387
 
            tree, path = WorkingTree.open_containing(file.get_uri())
388
 
        except NotBranchError:
389
 
            return
390
 
        except NoWorkingTree:
391
 
            return   
392
 
 
393
 
        disabled_flag = self.check_branch_enabled(tree.branch)
394
 
        if disabled_flag == 'False':
395
 
            return
396
 
 
 
309
        return [
 
310
            Nautilus.Column(name="BzrNautilus::bzr_status",
 
311
                            attribute="bzr_status",
 
312
                            label="Status",
 
313
                            description="Version control status"),
 
314
            Nautilus.Column(name="BzrNautilus::bzr_revision",
 
315
                            attribute="bzr_revision",
 
316
                            label="Revision",
 
317
                            description="Last change revision"),
 
318
            ]
 
319
 
 
320
    def _file_summary(self, tree, basis_tree, intertree, path):
 
321
        file_revision = ""
397
322
        emblem = None
398
 
        status = None
399
 
 
400
 
        if tree.has_filename(path):
401
 
            emblem = 'bzr-controlled'
402
 
            status = 'unchanged'
403
 
            id = tree.path2id(path)
404
 
 
405
 
            delta = tree.changes_from(tree.branch.basis_tree())
406
 
            if delta.touches_file_id(id):
407
 
                emblem = 'bzr-modified'
408
 
                status = 'modified'
409
 
            for f, _, _ in delta.added:
410
 
                if f == path:
 
323
 
 
324
        file_id = tree.path2id(path)
 
325
        if file_id is None:
 
326
            if tree.is_ignored(path):
 
327
                status = 'ignored'
 
328
                emblem = 'bzr-ignored'
 
329
            else:
 
330
                status = 'unversioned'
 
331
            file_revision = "N/A"
 
332
        elif tree.has_filename(path): # Still present
 
333
            if not intertree.file_content_matches(file_id, file_id):
 
334
                if not basis_tree.has_id(file_id):
411
335
                    emblem = 'bzr-added'
412
336
                    status = 'added'
413
 
 
414
 
            for of, f, _, _, _, _ in delta.renamed:
415
 
                if f == path:
416
 
                    status = 'renamed from %s' % f
417
 
 
418
 
        elif tree.branch.basis_tree().has_filename(path):
 
337
                    file_revision = "new file"
 
338
                elif basis_tree.path2id(file_id) != path:
 
339
                    status = 'bzr-renamed'
 
340
                    status = 'renamed from %s' % basis_tree.path2id(file_id)
 
341
                else:
 
342
                    emblem = 'bzr-modified'
 
343
                    status = 'modified'
 
344
            else:
 
345
                emblem = 'bzr-controlled'
 
346
                status = 'unchanged'
 
347
        elif basis_tree.has_filename(path):
419
348
            emblem = 'bzr-removed'
420
349
            status = 'removed'
421
350
        else:
422
351
            # FIXME: Check for ignored files
423
352
            status = 'unversioned'
424
 
        
425
 
        if emblem is not None:
426
 
            file.add_emblem(emblem)
427
 
        file.add_string_attribute('bzr_status', status)
428
 
 
429
 
    def check_branch_enabled(self, branch=None):
 
353
        return (status, emblem, file_revision)
 
354
 
 
355
    def update_file_info(self, vfs_file):
 
356
        try:
 
357
            controldir, path = self._open_bzrdir(vfs_file)
 
358
        except NotBranchError:
 
359
            return
 
360
 
 
361
        try:
 
362
            tree = controldir.open_workingtree()
 
363
        except NoWorkingTree:
 
364
            return
 
365
 
 
366
        tree.lock_read()
 
367
        try:
 
368
            nautilus_integration = self.check_branch_enabled(tree.branch)
 
369
            if not nautilus_integration:
 
370
                return
 
371
 
 
372
            basis_tree = tree.basis_tree()
 
373
            intertree = InterTree.get(basis_tree, tree)
 
374
 
 
375
            basis_tree.lock_read()
 
376
            try:
 
377
                (status, emblem, file_revision) = self._file_summary(tree, basis_tree, intertree, path)
 
378
            finally:
 
379
                basis_tree.unlock()
 
380
            if emblem is not None:
 
381
                vfs_file.add_emblem(emblem)
 
382
            vfs_file.add_string_attribute('bzr_status', status)
 
383
            vfs_file.add_string_attribute('bzr_revision', file_revision)
 
384
        finally:
 
385
            tree.unlock()
 
386
 
 
387
    def check_branch_enabled(self, branch):
430
388
        # Supports global disable, but there is currently no UI to do this
431
 
        config = GlobalConfig()
432
 
        disabled_flag = config.get_user_option('nautilus_integration')
433
 
        if disabled_flag != 'False':
434
 
            if branch is not None:
435
 
                config = branch.get_config()
436
 
                disabled_flag = config.get_user_option('nautilus_integration')
437
 
        return disabled_flag
438
 
 
439
 
    def toggle_integration(self, menu, action, vfs_file=None):
 
389
        config = branch.get_config_stack()
 
390
        return config.get("nautilus_integration")
 
391
 
 
392
    def toggle_integration(self, menu, action, branch):
 
393
        config = branch.get_config_stack()
 
394
        config.set("nautilus_integration", action)
 
395
 
 
396
    def get_property_pages(self, files):
 
397
        pages = []
 
398
        for vfs_file in files:
 
399
            try:
 
400
                controldir, path = self._open_bzrdir(vfs_file)
 
401
            except NotBranchError:
 
402
                continue
 
403
 
 
404
            try:
 
405
                tree = controldir.open_workingtree()
 
406
            except NoWorkingTree:
 
407
                continue
 
408
 
 
409
            tree.lock_read()
 
410
            try:
 
411
                file_id = tree.path2id(path)
 
412
                pages.append(PropertyPageFile(tree, file_id, path))
 
413
                pages.append(PropertyPageBranch(tree.branch))
 
414
            finally:
 
415
                tree.unlock()
 
416
        return pages
 
417
 
 
418
    def get_widget(self, uri, window):
 
419
        controldir, path = ControlDir.open_containing(uri)
440
420
        try:
441
 
            tree, path = WorkingTree.open_containing(vfs_file.get_uri())
442
 
        except NotBranchError:
443
 
            return
 
421
            tree = controldir.open_workingtree()
444
422
        except NoWorkingTree:
445
423
            return
446
 
        branch = tree.branch
447
 
        if branch is None:
448
 
            config = GlobalConfig()
449
 
        else:
450
 
            config = branch.get_config()
451
 
        config.set_user_option('nautilus_integration', action)
452
 
 
 
424
        ret = Gtk.HBox(False, 4)
 
425
        text = 'This is a Bazaar working tree. '
 
426
        get_shelf_manager = getattr(tree, 'get_shelf_manager', None)
 
427
        if get_shelf_manager is not None:
 
428
            manager = get_shelf_manager()
 
429
            shelves = manager.active_shelves()
 
430
            if len(shelves) == 0:
 
431
                pass
 
432
            elif len(shelves) == 1:
 
433
                text += '1 shelf exists. '
 
434
            else:
 
435
                text += '%d shelf exists. ' % len(shelves)
 
436
        label = Gtk.Label(text)
 
437
        label.show()
 
438
        ret.pack_start(label, True, True, 0)
 
439
        ret.show_all()
 
440
        return ret
 
441
 
 
442
 
 
443
class PropertyPageFile(Nautilus.PropertyPage):
 
444
 
 
445
    def __init__(self, tree, file_id, path):
 
446
        self.tree = tree
 
447
        self.file_id = file_id
 
448
        self.path = path
 
449
        label = Gtk.Label('File Version')
 
450
        label.show()
 
451
 
 
452
        table = self._create_table()
 
453
 
 
454
        super(PropertyPageFile, self).__init__(label=label,
 
455
            name="BzrNautilus::file_page", page=table)
 
456
 
 
457
    def _create_table(self):
 
458
        table = Gtk.Table(homogeneous=False, columns=2, rows=3)
 
459
 
 
460
        table.attach(Gtk.Label(_i18n('File id:')), 0, 1, 0, 1)
 
461
        table.attach(Gtk.Label(self.file_id), 1, 2, 0, 1)
 
462
 
 
463
        table.attach(Gtk.Label(_i18n('SHA1Sum:')), 0, 1, 1, 2)
 
464
        table.attach(Gtk.Label(self.tree.get_file_sha1(self.file_id, self.path)), 1, 1, 1, 2)
 
465
 
 
466
        basis_tree = self.tree.revision_tree(self.tree.last_revision())
 
467
        last_revision = basis_tree.get_file_revision(self.file_id)
 
468
 
 
469
        table.attach(Gtk.Label(_i18n('Last Change Revision:')), 0, 1, 2, 3)
 
470
        revno = ".".join([str(x) for x in
 
471
            self.tree.branch.revision_id_to_dotted_revno(last_revision)])
 
472
        table.attach(Gtk.Label(revno), 1, 1, 2, 3)
 
473
 
 
474
        table.attach(Gtk.Label(_i18n('Last Change Author:')), 0, 1, 3, 4)
 
475
        rev = self.tree.branch.repository.get_revision(last_revision)
 
476
        table.attach(Gtk.Label("\n".join(rev.get_apparent_authors())), 1, 1, 3, 4)
 
477
 
 
478
        table.show_all()
 
479
        return table
 
480
 
 
481
 
 
482
class PropertyPageBranch(Nautilus.PropertyPage):
 
483
 
 
484
    def __init__(self, branch):
 
485
        self.branch = branch
 
486
        label = Gtk.Label('Branch')
 
487
        label.show()
 
488
 
 
489
        table = self._create_table()
 
490
 
 
491
        super(PropertyPageBranch, self).__init__(label=label,
 
492
            name="BzrNautilus::branch_page", page=table)
 
493
 
 
494
    def _create_location_entry(self, get_location, set_location):
 
495
        location = get_location()
 
496
        ret = Gtk.Entry()
 
497
        if location is not None:
 
498
            ret.set_text(location)
 
499
        return ret
 
500
 
 
501
    def _create_table(self):
 
502
        table = Gtk.Table(homogeneous=False, columns=2, rows=6)
 
503
 
 
504
        self._push_location_entry = self._create_location_entry(
 
505
            self.branch.get_push_location, self.branch.set_push_location)
 
506
        self._parent_location_entry = self._create_location_entry(
 
507
            self.branch.get_parent, self.branch.set_parent)
 
508
        self._bound_location_entry = self._create_location_entry(
 
509
            self.branch.get_bound_location, self.branch.set_bound_location)
 
510
        self._public_location_entry = self._create_location_entry(
 
511
            self.branch.get_public_branch, self.branch.set_public_branch)
 
512
        self._submit_location_entry = self._create_location_entry(
 
513
            self.branch.get_submit_branch, self.branch.set_submit_branch)
 
514
 
 
515
        table.attach(Gtk.Label(_i18n('Push location:')), 0, 1, 0, 1)
 
516
        table.attach(self._push_location_entry, 1, 2, 0, 1)
 
517
 
 
518
        table.attach(Gtk.Label(_i18n('Parent location:')), 0, 1, 1, 2)
 
519
        table.attach(self._parent_location_entry, 1, 1, 1, 2)
 
520
 
 
521
        table.attach(Gtk.Label(_i18n('Bound location:')), 0, 1, 2, 3)
 
522
        table.attach(self._bound_location_entry, 1, 1, 2, 3)
 
523
 
 
524
        table.attach(Gtk.Label(_i18n('Public location:')), 0, 1, 3, 4)
 
525
        table.attach(self._public_location_entry, 1, 1, 3, 4)
 
526
 
 
527
        table.attach(Gtk.Label(_i18n('Submit location:')), 0, 1, 4, 5)
 
528
        table.attach(self._submit_location_entry, 1, 1, 4, 5)
 
529
 
 
530
        self._append_revisions_only = Gtk.CheckButton(_i18n('Append revisions only'))
 
531
        value = self.branch.get_append_revisions_only()
 
532
        if value is None:
 
533
            value = False
 
534
        self._append_revisions_only.set_active(value)
 
535
        table.attach(self._append_revisions_only, 0, 2, 5, 6)
 
536
 
 
537
        table.show_all()
 
538
        return table