/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-11-29 10:06:50 UTC
  • Revision ID: jelmer@samba.org-20111129100650-9oit3f44pxre4uq8
Credit Curtis.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nautilus-bzr.py
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
 
 
41
class BazaarExtension(Nautilus.MenuProvider, Nautilus.ColumnProvider,
 
42
        Nautilus.InfoProvider, Nautilus.PropertyPageProvider, GObject.GObject):
 
43
    """Nautilus extension providing Bazaar integration."""
 
44
 
25
45
    def __init__(self):
26
46
        pass
27
47
 
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
 
 
 
48
    @classmethod
 
49
    def _open_bzrdir(cls, vfs_file):
 
50
        uri = vfs_file.get_uri()
 
51
        controldir, path = ControlDir.open_containing(uri)
 
52
        return controldir, path
 
53
 
 
54
    @classmethod
 
55
    def _open_tree(cls, vfs_file):
 
56
        controldir, path = cls._open_bzrdir(vfs_file)
 
57
        return controldir.open_workingtree(), path
 
58
 
 
59
    def add_cb(self, menu, tree, path):
39
60
        tree.add(path)
40
61
 
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
 
 
 
62
    def ignore_cb(self, menu, tree, path):
 
63
        # We can only cope with local files
 
64
        tree_ignores_add_patterns(tree, [path])
 
65
        #FIXME: Add path to ignore file
 
66
 
 
67
    def unignore_cb(self, menu, tree, path):
 
68
        pass
 
69
        # We can only cope with local files
 
70
        #FIXME
 
71
 
 
72
    def diff_cb(self, menu, tree, path=None):
84
73
        from bzrlib.plugins.gtk.diff import DiffWindow
85
74
        window = DiffWindow()
86
 
        window.set_diff(tree.branch.nick, tree, tree.branch.basis_tree())
 
75
        window.set_diff(tree.branch._get_nick(local=True), tree, 
 
76
                        tree.branch.basis_tree())
87
77
        window.show()
88
78
 
89
 
        return
90
 
 
91
79
    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
 
 
 
80
        controldir, path = self._open_bzrdir(vfs_file)
 
81
        controldir.create_workingtree()
 
82
 
 
83
    def remove_cb(self, menu, tree, path):
115
84
        tree.remove(path)
116
85
 
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)
 
86
    def annotate_cb(self, menu, tree, path, file_id):
 
87
        from bzrlib.plugins.gtk.annotate.gannotate import GAnnotateWindow
 
88
        win = GAnnotateWindow()
 
89
        win.show()
 
90
        win.annotate(tree, tree.branch, file_id)
 
91
        Gtk.main()
126
92
 
127
93
    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
94
        from bzrlib.plugins.gtk.branch import BranchDialog
133
 
        
 
95
        controldir, path = self._open_bzrdir(vfs_file)
 
96
 
134
97
        dialog = BranchDialog(vfs_file.get_name())
135
98
        response = dialog.run()
136
 
        if response != gtk.RESPONSE_NONE:
 
99
        if response != Gtk.ResponseType.NONE:
137
100
            dialog.hide()
138
101
            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
 
 
 
102
 
 
103
    def commit_cb(self, menu, tree, path=None):
161
104
        from bzrlib.plugins.gtk.commit import CommitDialog
162
105
        dialog = CommitDialog(tree, path)
163
106
        response = dialog.run()
164
 
        if response != gtk.RESPONSE_NONE:
 
107
        if response != Gtk.ResponseType.NONE:
165
108
            dialog.hide()
166
109
            dialog.destroy()
167
110
 
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
 
 
 
111
    def log_cb(self, menu, controldir, path=None):
 
112
        from bzrlib.plugins.gtk.viz import BranchWindow
 
113
        branch = controldir.open_branch()
 
114
        pp = BranchWindow(branch, [branch.last_revision()], None)
 
115
        pp.show()
 
116
        Gtk.main()
 
117
 
 
118
    def pull_cb(self, menu, controldir, path=None):
199
119
        from bzrlib.plugins.gtk.pull import PullDialog
200
 
        dialog = PullDialog(tree, path)
 
120
        dialog = PullDialog(controldir.open_workingtree(), path)
201
121
        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
 
 
 
122
        Gtk.main()
 
123
 
 
124
    def merge_cb(self, menu, tree, path=None):
217
125
        from bzrlib.plugins.gtk.merge import MergeDialog
218
126
        dialog = MergeDialog(tree, path)
219
 
        dialog.display()
220
 
        gtk.main()
 
127
        dialog.run()
 
128
        dialog.destroy()
 
129
 
 
130
    def create_tree_cb(self, menu, controldir):
 
131
        controldir.create_workingtree()
221
132
 
222
133
    def get_background_items(self, window, vfs_file):
223
 
        items = []
224
 
        file = vfs_file.get_uri()
225
 
 
226
134
        try:
227
 
            tree, path = WorkingTree.open_containing(file)
228
 
            disabled_flag = self.check_branch_enabled(tree.branch)
229
 
        except UnsupportedProtocol:
 
135
            controldir, path = self._open_bzrdir(vfs_file)
 
136
        except NotBranchError:
230
137
            return
 
138
        try:
 
139
            branch = controldir.open_branch()
231
140
        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')
 
141
            items = []
 
142
            item = Nautilus.MenuItem(name='BzrNautilus::newtree',
 
143
                                 label='Make directory versioned',
 
144
                                 tip='Create new Bazaar tree in this folder',
 
145
                                 icon='')
236
146
            item.connect('activate', self.newtree_cb, vfs_file)
237
147
            items.append(item)
238
148
 
239
 
            item = nautilus.MenuItem('BzrNautilus::clone',
240
 
                                 'Checkout Bazaar branch',
241
 
                                 'Checkout Existing Bazaar Branch')
 
149
            item = Nautilus.MenuItem(name='BzrNautilus::clone',
 
150
                                 label='Checkout Bazaar branch ...',
 
151
                                 tip='Checkout Existing Bazaar Branch',
 
152
                                 icon='')
242
153
            item.connect('activate', self.clone_cb, vfs_file)
243
154
            items.append(item)
244
 
 
245
155
            return items
 
156
 
 
157
        items = []
 
158
 
 
159
        nautilus_integration = self.check_branch_enabled(branch)
 
160
        if not nautilus_integration:
 
161
            item = Nautilus.MenuItem(name='BzrNautilus::enable',
 
162
                                     label='Enable Bazaar Plugin for this Branch',
 
163
                                     tip='Enable Bazaar plugin for nautilus',
 
164
                                     icon='')
 
165
            item.connect('activate', self.toggle_integration, True, branch)
 
166
            return [item]
 
167
        else:
 
168
            item = Nautilus.MenuItem(name='BzrNautilus::disable',
 
169
                                     label='Disable Bazaar Plugin this Branch',
 
170
                                     tip='Disable Bazaar plugin for nautilus',
 
171
                                     icon='')
 
172
            item.connect('activate', self.toggle_integration, False, branch)
 
173
            items.append(item)
 
174
 
 
175
        item = Nautilus.MenuItem(name='BzrNautilus::log',
 
176
                             label='History ...',
 
177
                             tip='Show Bazaar history',
 
178
                             icon='')
 
179
        item.connect('activate', self.log_cb, controldir)
 
180
        items.append(item)
 
181
 
 
182
        item = Nautilus.MenuItem(name='BzrNautilus::pull',
 
183
                             label='Pull ...',
 
184
                             tip='Pull from another branch',
 
185
                             icon='')
 
186
        item.connect('activate', self.pull_cb, controldir)
 
187
        items.append(item)
 
188
 
 
189
        try:
 
190
            tree = controldir.open_workingtree()
246
191
        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,
 
192
            item = Nautilus.MenuItem(name='BzrNautilus::create_tree',
 
193
                                 label='Create working tree...',
 
194
                                 tip='Create a working tree for this branch',
 
195
                                 icon='')
 
196
            item.connect('activate', self.create_tree_cb, controldir)
 
197
            items.append(item)
255
198
        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)
 
199
            item = Nautilus.MenuItem(name='BzrNautilus::merge',
 
200
                                 label='Merge ...',
 
201
                                 tip='Merge from another branch',
 
202
                                 icon='')
 
203
            item.connect('activate', self.merge_cb, tree, path)
 
204
            items.append(item)
 
205
 
 
206
            item = Nautilus.MenuItem(name='BzrNautilus::commit',
 
207
                                 label='Commit ...',
 
208
                                 tip='Commit Changes',
 
209
                                 icon='')
 
210
            item.connect('activate', self.commit_cb, tree, path)
 
211
            items.append(item)
285
212
 
286
213
        return items
287
214
 
 
215
    def _get_file_menuitems(self, tree, intertree, path):
 
216
        file_id = tree.path2id(path)
 
217
        if file_id is None:
 
218
            item = Nautilus.MenuItem(name='BzrNautilus::add',
 
219
                                 label='Add',
 
220
                                 tip='Add as versioned file',
 
221
                                 icon='')
 
222
            item.connect('activate', self.add_cb, tree, path)
 
223
            yield item
 
224
 
 
225
            item = Nautilus.MenuItem(name='BzrNautilus::ignore',
 
226
                                 label='Ignore',
 
227
                                 tip='Ignore file for versioning',
 
228
                                 icon='')
 
229
            item.connect('activate', self.ignore_cb, tree, path)
 
230
            yield item
 
231
        elif tree.is_ignored(path):
 
232
            item = Nautilus.MenuItem(name='BzrNautilus::unignore',
 
233
                                 label='Unignore',
 
234
                                 tip='Unignore file for versioning',
 
235
                                 icon='')
 
236
            item.connect('activate', self.unignore_cb, tree, path)
 
237
            yield item
 
238
        else:
 
239
            item = Nautilus.MenuItem(name='BzrNautilus::log',
 
240
                             label='History ...',
 
241
                             tip='List changes',
 
242
                             icon='')
 
243
            item.connect('activate', self.log_cb, tree.bzrdir, path)
 
244
            yield item
 
245
 
 
246
            if not intertree.file_content_matches(file_id, file_id):
 
247
                item = Nautilus.MenuItem(name='BzrNautilus::diff',
 
248
                                 label='View Changes ...',
 
249
                                 tip='Show differences',
 
250
                                 icon='')
 
251
                item.connect('activate', self.diff_cb, tree, path)
 
252
                yield item
 
253
 
 
254
                item = Nautilus.MenuItem(name='BzrNautilus::commit',
 
255
                             label='Commit ...',
 
256
                             tip='Commit Changes',
 
257
                             icon='')
 
258
                item.connect('activate', self.commit_cb, tree, path)
 
259
                yield item
 
260
 
 
261
            item = Nautilus.MenuItem(name='BzrNautilus::remove',
 
262
                                 label='Remove',
 
263
                                 tip='Remove this file from versioning',
 
264
                                 icon='')
 
265
            item.connect('activate', self.remove_cb, tree, path)
 
266
            yield item
 
267
 
 
268
            item = Nautilus.MenuItem(name='BzrNautilus::annotate',
 
269
                         label='Annotate ...',
 
270
                         tip='Annotate File Data',
 
271
                         icon='')
 
272
            item.connect('activate', self.annotate_cb, tree, path, file_id)
 
273
            yield item
 
274
 
288
275
    def get_file_items(self, window, files):
289
276
        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():
 
277
        trees = {}
 
278
 
 
279
        try:
 
280
            for vfs_file in files:
 
281
                controldir, path = self._open_bzrdir(vfs_file)
 
282
 
 
283
                try:
 
284
                    tree = trees[controldir.user_url]
 
285
                except KeyError:
 
286
                    try:
 
287
                        tree = controldir.open_workingtree()
 
288
                    except NoWorkingTree:
 
289
                        continue
 
290
                    trees[controldir.user_url] = tree
 
291
                    tree.lock_read()
 
292
 
 
293
                nautilus_integration = self.check_branch_enabled(tree.branch)
 
294
                if not nautilus_integration:
304
295
                    continue
305
296
 
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
 
297
                intertree = InterTree.get(tree.basis_tree(), tree)
 
298
                items.extend(list(self._get_file_menuitems(tree, intertree, path)))
 
299
        finally:
 
300
            for tree in trees.itervalues():
321
301
                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
302
 
373
303
        return items
374
304
 
375
305
    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
 
 
 
306
        return [
 
307
            Nautilus.Column(name="BzrNautilus::bzr_status",
 
308
                            attribute="bzr_status",
 
309
                            label="Status",
 
310
                            description="Version control status"),
 
311
            Nautilus.Column(name="BzrNautilus::bzr_revision",
 
312
                            attribute="bzr_revision",
 
313
                            label="Revision",
 
314
                            description="Last change revision"),
 
315
            ]
 
316
 
 
317
    def _file_summary(self, tree, basis_tree, intertree, path):
 
318
        file_revision = ""
397
319
        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:
 
320
 
 
321
        file_id = tree.path2id(path)
 
322
        if file_id is None:
 
323
            if tree.is_ignored(path):
 
324
                status = 'ignored'
 
325
                emblem = 'bzr-ignored'
 
326
            else:
 
327
                status = 'unversioned'
 
328
            file_revision = "N/A"
 
329
        elif tree.has_filename(path): # Still present
 
330
            if not intertree.file_content_matches(file_id, file_id):
 
331
                if not basis_tree.has_id(file_id):
411
332
                    emblem = 'bzr-added'
412
333
                    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):
 
334
                    file_revision = "new file"
 
335
                elif basis_tree.path2id(file_id) != path:
 
336
                    status = 'bzr-renamed'
 
337
                    status = 'renamed from %s' % basis_tree.path2id(file_id)
 
338
                else:
 
339
                    emblem = 'bzr-modified'
 
340
                    status = 'modified'
 
341
            else:
 
342
                emblem = 'bzr-controlled'
 
343
                status = 'unchanged'
 
344
        elif basis_tree.has_filename(path):
419
345
            emblem = 'bzr-removed'
420
346
            status = 'removed'
421
347
        else:
422
348
            # FIXME: Check for ignored files
423
349
            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):
 
350
        return (status, emblem, file_revision)
 
351
 
 
352
    def update_file_info(self, vfs_file):
 
353
        try:
 
354
            controldir, path = self._open_bzrdir(vfs_file)
 
355
        except NotBranchError:
 
356
            return
 
357
 
 
358
        try:
 
359
            tree = controldir.open_workingtree()
 
360
        except NoWorkingTree:
 
361
            return
 
362
 
 
363
        tree.lock_read()
 
364
        try:
 
365
            nautilus_integration = self.check_branch_enabled(tree.branch)
 
366
            if not nautilus_integration:
 
367
                return
 
368
 
 
369
            basis_tree = tree.basis_tree()
 
370
            intertree = InterTree.get(basis_tree, tree)
 
371
 
 
372
            basis_tree.lock_read()
 
373
            try:
 
374
                (status, emblem, file_revision) = self._file_summary(tree, basis_tree, intertree, path)
 
375
            finally:
 
376
                basis_tree.unlock()
 
377
            if emblem is not None:
 
378
                vfs_file.add_emblem(emblem)
 
379
            vfs_file.add_string_attribute('bzr_status', status)
 
380
            vfs_file.add_string_attribute('bzr_revision', file_revision)
 
381
        finally:
 
382
            tree.unlock()
 
383
 
 
384
    def check_branch_enabled(self, branch):
430
385
        # 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):
440
 
        try:
441
 
            tree, path = WorkingTree.open_containing(vfs_file.get_uri())
442
 
        except NotBranchError:
443
 
            return
444
 
        except NoWorkingTree:
445
 
            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
 
 
 
386
        config = branch.get_config_stack()
 
387
        return config.get("nautilus_integration")
 
388
 
 
389
    def toggle_integration(self, menu, action, branch):
 
390
        config = branch.get_config_stack()
 
391
        config.set("nautilus_integration", action)
 
392
 
 
393
    def get_property_pages(self, files):
 
394
        pages = []
 
395
        for vfs_file in files:
 
396
            try:
 
397
                controldir, path = self._open_bzrdir(vfs_file)
 
398
            except NotBranchError:
 
399
                continue
 
400
 
 
401
            try:
 
402
                tree = controldir.open_workingtree()
 
403
            except NoWorkingTree:
 
404
                continue
 
405
 
 
406
            tree.lock_read()
 
407
            try:
 
408
                file_id = tree.path2id(path)
 
409
                pages.append(PropertyPageFile(tree, file_id, path))
 
410
                pages.append(PropertyPageBranch(tree.branch))
 
411
            finally:
 
412
                tree.unlock()
 
413
        return pages
 
414
 
 
415
 
 
416
class PropertyPageFile(Nautilus.PropertyPage):
 
417
 
 
418
    def __init__(self, tree, file_id, path):
 
419
        self.tree = tree
 
420
        self.file_id = file_id
 
421
        self.path = path
 
422
        label = Gtk.Label('File Version')
 
423
        label.show()
 
424
 
 
425
        table = self._create_table()
 
426
 
 
427
        super(PropertyPageFile, self).__init__(label=label,
 
428
            name="BzrNautilus::file_page", page=table)
 
429
 
 
430
    def _create_table(self):
 
431
        table = Gtk.Table(homogeneous=False, columns=2, rows=3)
 
432
 
 
433
        table.attach(Gtk.Label('File id:'), 0, 1, 0, 1)
 
434
        table.attach(Gtk.Label(self.file_id), 1, 2, 0, 1)
 
435
 
 
436
        table.attach(Gtk.Label('SHA1Sum:'), 0, 1, 1, 2)
 
437
        table.attach(Gtk.Label(self.tree.get_file_sha1(self.file_id, self.path)), 1, 1, 1, 2)
 
438
 
 
439
        basis_tree = self.tree.revision_tree(self.tree.last_revision())
 
440
        last_revision = basis_tree.get_file_revision(self.file_id)
 
441
 
 
442
        table.attach(Gtk.Label('Last Change Revision:'), 0, 1, 2, 3)
 
443
        revno = ".".join([str(x) for x in
 
444
            self.tree.branch.revision_id_to_dotted_revno(last_revision)])
 
445
        table.attach(Gtk.Label(revno), 1, 1, 2, 3)
 
446
 
 
447
        table.attach(Gtk.Label('Last Change Author:'), 0, 1, 3, 4)
 
448
        rev = self.tree.branch.repository.get_revision(last_revision)
 
449
        table.attach(Gtk.Label("\n".join(rev.get_apparent_authors())), 1, 1, 3, 4)
 
450
 
 
451
        table.show_all()
 
452
        return table
 
453
 
 
454
 
 
455
class PropertyPageBranch(Nautilus.PropertyPage):
 
456
 
 
457
    def __init__(self, branch):
 
458
        self.branch = branch
 
459
        label = Gtk.Label('Branch')
 
460
        label.show()
 
461
 
 
462
        table = self._create_table()
 
463
 
 
464
        super(PropertyPageBranch, self).__init__(label=label,
 
465
            name="BzrNautilus::branch_page", page=table)
 
466
 
 
467
    def _create_table(self):
 
468
        table = Gtk.Table(homogeneous=False, columns=2, rows=3)
 
469
 
 
470
        table.attach(Gtk.Label('Push location:'), 0, 1, 0, 1)
 
471
        table.attach(Gtk.Label(self.branch.get_push_location()), 1, 2, 0, 1)
 
472
 
 
473
        table.attach(Gtk.Label('Parent location:'), 0, 1, 1, 2)
 
474
        table.attach(Gtk.Label(self.branch.get_parent()), 1, 1, 1, 2)
 
475
 
 
476
        table.show_all()
 
477
        return table