/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: Gustav Hartvigsson
  • Date: 2014-11-25 15:34:07 UTC
  • Revision ID: gustav.hartvigsson@gmail.com-20141125153407-827k8g7qy9u5byd5
* Fixed bzr-gtk's viz util, using the new Gtk Inspector.

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