54
51
controldir, path = ControlDir.open_containing(uri)
55
52
return controldir, path
58
def _open_tree(cls, vfs_file):
59
controldir, path = cls._open_bzrdir(vfs_file)
60
return controldir.open_workingtree(), path
62
def add_cb(self, menu, tree, path):
54
def add_cb(self, menu, vfs_file):
55
controldir, path = self._open_bzrdir(vfs_file)
56
tree = controldir.open_workingtree()
65
def ignore_cb(self, menu, tree, path):
59
def ignore_cb(self, menu, vfs_file):
66
60
# We can only cope with local files
67
tree_ignores_add_patterns(tree, [path])
61
controldir, path = self._open_bzrdir(vfs_file)
62
tree = controldir.open_workingtree()
68
63
#FIXME: Add path to ignore file
70
def unignore_cb(self, menu, tree, path):
66
def unignore_cb(self, menu, vfs_file):
72
67
# We can only cope with local files
68
controldir, path = self._open_bzrdir(vfs_file)
69
tree = controldir.open_workingtree()
75
def diff_cb(self, menu, tree, path=None):
73
def diff_cb(self, menu, vfs_file):
74
controldir, path = self._open_bzrdir(vfs_file)
75
tree = controldir.open_workingtree()
76
76
from bzrlib.plugins.gtk.diff import DiffWindow
77
77
window = DiffWindow()
78
78
window.set_diff(tree.branch._get_nick(local=True), tree,
79
79
tree.branch.basis_tree())
82
84
def newtree_cb(self, menu, vfs_file):
83
85
controldir, path = self._open_bzrdir(vfs_file)
84
86
controldir.create_workingtree()
86
def remove_cb(self, menu, tree, path):
88
def remove_cb(self, menu, vfs_file):
89
controldir, path = self._open_bzrdir(vfs_file)
90
tree = controldir.open_workingtree()
89
def annotate_cb(self, menu, tree, path, file_id):
93
def annotate_cb(self, menu, vfs_file):
90
94
from bzrlib.plugins.gtk.annotate.gannotate import GAnnotateWindow
95
controldir, path = self._open_bzrdir(vfs_file)
91
96
win = GAnnotateWindow()
93
win.annotate(tree, tree.branch, file_id)
97
win.annotate(controldir.open_workingtree(), controldir.open_branch(), path)
96
100
def clone_cb(self, menu, vfs_file=None):
114
def log_cb(self, menu, controldir, path=None):
115
from bzrlib.plugins.gtk.viz import BranchWindow
121
def log_cb(self, menu, vfs_file):
122
controldir, path = self._open_bzrdir(vfs_file)
116
123
branch = controldir.open_branch()
117
pp = BranchWindow(branch, [branch.last_revision()], None)
124
pp = start_viz_window(branch, [branch.last_revision()])
121
def pull_cb(self, menu, controldir, path=None):
128
def pull_cb(self, menu, vfs_file):
129
controldir, path = self._open_bzrdir(vfs_file)
130
tree = controldir.open_workingtree()
122
131
from bzrlib.plugins.gtk.pull import PullDialog
123
dialog = PullDialog(controldir.open_workingtree(), path)
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)
133
def merge_cb(self, menu, tree, path=None):
132
dialog = PullDialog(tree, path)
136
def merge_cb(self, menu, vfs_file):
137
controldir, path = self._open_bzrdir(vfs_file)
138
tree = controldir.open_workingtree()
134
139
from bzrlib.plugins.gtk.merge import MergeDialog
135
140
dialog = MergeDialog(tree, path)
139
def create_tree_cb(self, menu, controldir):
140
controldir.create_workingtree()
142
144
def get_background_items(self, window, vfs_file):
144
146
controldir, path = self._open_bzrdir(vfs_file)
168
168
nautilus_integration = self.check_branch_enabled(branch)
169
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',
174
item.connect('activate', self.toggle_integration, True, branch)
170
item = Nautilus.MenuItem('BzrNautilus::enable',
171
'Enable Bazaar Plugin for this Branch',
172
'Enable Bazaar plugin for nautilus')
173
item.connect('activate', self.toggle_integration, True, vfs_file)
177
item = Nautilus.MenuItem(name='BzrNautilus::disable',
178
label='Disable Bazaar Plugin this Branch',
179
tip='Disable Bazaar plugin for nautilus',
181
item.connect('activate', self.toggle_integration, False, branch)
176
item = Nautilus.MenuItem('BzrNautilus::disable',
177
'Disable Bazaar Plugin this Branch',
178
'Disable Bazaar plugin for nautilus')
179
item.connect('activate', self.toggle_integration, False, vfs_file)
182
180
items.append(item)
184
item = Nautilus.MenuItem(name='BzrNautilus::log',
186
tip='Show Bazaar history',
188
item.connect('activate', self.log_cb, controldir)
182
item = Nautilus.MenuItem('BzrNautilus::log',
184
'Show Bazaar history')
185
item.connect('activate', self.log_cb, vfs_file)
189
186
items.append(item)
191
item = Nautilus.MenuItem(name='BzrNautilus::pull',
193
tip='Pull from another branch',
195
item.connect('activate', self.pull_cb, controldir)
188
item = Nautilus.MenuItem('BzrNautilus::pull',
190
'Pull from another branch')
191
item.connect('activate', self.pull_cb, vfs_file)
196
192
items.append(item)
199
195
tree = controldir.open_workingtree()
200
196
except NoWorkingTree:
201
item = Nautilus.MenuItem(name='BzrNautilus::create_tree',
202
label='Create working tree...',
203
tip='Create a working tree for this branch',
205
item.connect('activate', self.create_tree_cb, controldir)
197
item = Nautilus.MenuItem('BzrNautilus::create_tree',
198
'Create working tree...',
199
'Create a working tree for this branch')
200
item.connect('activate', self.create_tree_cb, vfs_file)
206
201
items.append(item)
208
item = Nautilus.MenuItem(name='BzrNautilus::merge',
210
tip='Merge from another branch',
212
item.connect('activate', self.merge_cb, tree, path)
203
item = Nautilus.MenuItem('BzrNautilus::merge',
205
'Merge from another branch')
206
item.connect('activate', self.merge_cb, vfs_file)
213
207
items.append(item)
215
item = Nautilus.MenuItem(name='BzrNautilus::commit',
217
tip='Commit Changes',
219
item.connect('activate', self.commit_cb, tree, path)
209
item = Nautilus.MenuItem('BzrNautilus::commit',
212
item.connect('activate', self.commit_cb, vfs_file)
220
213
items.append(item)
224
def _get_file_menuitems(self, tree, intertree, path):
225
file_id = tree.path2id(path)
227
item = Nautilus.MenuItem(name='BzrNautilus::add',
229
tip='Add as versioned file',
231
item.connect('activate', self.add_cb, tree, path)
234
item = Nautilus.MenuItem(name='BzrNautilus::ignore',
236
tip='Ignore file for versioning',
238
item.connect('activate', self.ignore_cb, tree, path)
240
elif tree.is_ignored(path):
241
item = Nautilus.MenuItem(name='BzrNautilus::unignore',
243
tip='Unignore file for versioning',
245
item.connect('activate', self.unignore_cb, tree, path)
248
kind = tree.kind(file_id)
249
item = Nautilus.MenuItem(name='BzrNautilus::log',
253
item.connect('activate', self.log_cb, tree.bzrdir, path)
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',
261
item.connect('activate', self.diff_cb, tree, path)
264
item = Nautilus.MenuItem(name='BzrNautilus::commit',
266
tip='Commit Changes',
268
item.connect('activate', self.commit_cb, tree, path)
271
item = Nautilus.MenuItem(name='BzrNautilus::remove',
273
tip='Remove this file from versioning',
275
item.connect('activate', self.remove_cb, tree, path)
279
item = Nautilus.MenuItem(name='BzrNautilus::annotate',
280
label='Annotate ...',
281
tip='Annotate File Data',
283
item.connect('activate', self.annotate_cb, tree, path, file_id)
286
217
def get_file_items(self, window, files):
291
for vfs_file in files:
292
controldir, path = self._open_bzrdir(vfs_file)
295
tree = trees[controldir.user_url]
298
tree = controldir.open_workingtree()
299
except NoWorkingTree:
301
trees[controldir.user_url] = tree
304
nautilus_integration = self.check_branch_enabled(tree.branch)
305
if not nautilus_integration:
220
for vfs_file in files:
221
controldir, path = self._open_bzrdir(vfs_file)
224
tree = controldir.open_workingtree()
225
except NoWorkingTree:
228
nautilus_integration = self.check_branch_enabled(tree.branch)
229
if not nautilus_integration:
232
file_id = tree.path2id(path)
234
item = Nautilus.MenuItem('BzrNautilus::add',
236
'Add as versioned file')
237
item.connect('activate', self.add_cb, vfs_file)
240
item = Nautilus.MenuItem('BzrNautilus::ignore',
242
'Ignore file for versioning')
243
item.connect('activate', self.ignore_cb, vfs_file)
245
elif tree.is_ignored(path):
246
item = Nautilus.MenuItem('BzrNautilus::unignore',
248
'Unignore file for versioning')
249
item.connect('activate', self.unignore_cb, vfs_file)
252
item = Nautilus.MenuItem('BzrNautilus::log',
255
item.connect('activate', self.log_cb, vfs_file)
308
258
intertree = InterTree.get(tree.basis_tree(), tree)
309
items.extend(list(self._get_file_menuitems(tree, intertree, path)))
311
for tree in trees.itervalues():
259
if not intertree.file_content_matches(file_id, file_id):
260
item = Nautilus.MenuItem('BzrNautilus::diff',
263
item.connect('activate', self.diff_cb, vfs_file)
266
item = Nautilus.MenuItem('BzrNautilus::commit',
269
item.connect('activate', self.commit_cb, vfs_file)
272
item = Nautilus.MenuItem('BzrNautilus::remove',
274
'Remove this file from versioning')
275
item.connect('activate', self.remove_cb, vfs_file)
278
item = Nautilus.MenuItem('BzrNautilus::annotate',
280
'Annotate File Data')
281
item.connect('activate', self.annotate_cb, vfs_file)
316
285
def get_columns(self):
325
294
description="Last change revision"),
328
def _file_summary(self, tree, basis_tree, intertree, path):
297
def update_file_info(self, file):
299
if file.get_uri_scheme() != 'file':
303
tree, path = WorkingTree.open_containing(file.get_uri())
304
except NotBranchError:
306
except NoWorkingTree:
309
nautilus_integration = self.check_branch_enabled(tree.branch)
310
if not nautilus_integration:
332
file_id = tree.path2id(path)
316
id = tree.path2id(path)
334
318
if tree.is_ignored(path):
335
319
status = 'ignored'
336
320
emblem = 'bzr-ignored'
338
322
status = 'unversioned'
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):
324
elif tree.has_filename(path):
325
emblem = 'bzr-controlled'
328
delta = tree.changes_from(tree.branch.basis_tree())
329
if delta.touches_file_id(id):
330
emblem = 'bzr-modified'
332
for f, _, _ in delta.added:
343
334
emblem = 'bzr-added'
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)
350
emblem = 'bzr-modified'
353
emblem = 'bzr-controlled'
355
elif basis_tree.has_filename(path):
337
for of, f, _, _, _, _ in delta.renamed:
339
status = 'renamed from %s' % f
341
elif tree.branch.basis_tree().has_filename(path):
356
342
emblem = 'bzr-removed'
357
343
status = 'removed'
359
345
# FIXME: Check for ignored files
360
346
status = 'unversioned'
361
return (status, emblem, file_revision)
363
def update_file_info(self, vfs_file):
365
controldir, path = self._open_bzrdir(vfs_file)
366
except NotBranchError:
370
tree = controldir.open_workingtree()
371
except NoWorkingTree:
376
nautilus_integration = self.check_branch_enabled(tree.branch)
377
if not nautilus_integration:
380
basis_tree = tree.basis_tree()
381
intertree = InterTree.get(basis_tree, tree)
383
basis_tree.lock_read()
385
(status, emblem, file_revision) = self._file_summary(tree, basis_tree, intertree, path)
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)
348
if emblem is not None:
349
file.add_emblem(emblem)
350
file.add_string_attribute('bzr_status', status)
395
352
def check_branch_enabled(self, branch):
396
353
# Supports global disable, but there is currently no UI to do this
397
354
config = branch.get_config_stack()
398
355
return config.get("nautilus_integration")
400
def toggle_integration(self, menu, action, branch):
357
def toggle_integration(self, menu, action, vfs_file):
358
controldir = self._open_bzrdir(vfs_file)
359
branch = controldir.open_branch()
401
360
config = branch.get_config_stack()
402
361
config.set("nautilus_integration", action)
404
def get_property_pages(self, files):
406
for vfs_file in files:
408
controldir, path = self._open_bzrdir(vfs_file)
409
except NotBranchError:
413
tree = controldir.open_workingtree()
414
except NoWorkingTree:
419
file_id = tree.path2id(path)
420
pages.append(PropertyPageFile(tree, file_id, path))
421
pages.append(PropertyPageBranch(tree.branch))
426
def get_widget(self, uri, window):
427
controldir, path = ControlDir.open_containing(uri)
429
tree = controldir.open_workingtree()
430
except NoWorkingTree:
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:
440
elif len(shelves) == 1:
441
text += '1 shelf exists. '
443
text += '%d shelf exists. ' % len(shelves)
444
label = Gtk.Label(text)
446
ret.pack_start(label, True, True, 0)
451
class PropertyPageFile(Nautilus.PropertyPage):
453
def __init__(self, tree, file_id, path):
455
self.file_id = file_id
457
label = Gtk.Label('File Version')
460
table = self._create_table()
462
super(PropertyPageFile, self).__init__(label=label,
463
name="BzrNautilus::file_page", page=table)
465
def _create_table(self):
466
table = Gtk.Table(homogeneous=False, columns=2, rows=3)
468
table.attach(Gtk.Label(_i18n('File id:')), 0, 1, 0, 1)
469
table.attach(Gtk.Label(self.file_id), 1, 2, 0, 1)
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)
474
basis_tree = self.tree.revision_tree(self.tree.last_revision())
475
last_revision = basis_tree.get_file_revision(self.file_id)
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)
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)
490
class PropertyPageBranch(Nautilus.PropertyPage):
492
def __init__(self, branch):
494
label = Gtk.Label('Branch')
497
table = self._create_table()
499
super(PropertyPageBranch, self).__init__(label=label,
500
name="BzrNautilus::branch_page", page=table)
502
def _create_location_entry(self, get_location, set_location):
503
location = get_location()
505
if location is not None:
506
ret.set_text(location)
509
def _create_table(self):
510
table = Gtk.Table(homogeneous=False, columns=2, rows=6)
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)
523
table.attach(Gtk.Label(_i18n('Push location:')), 0, 1, 0, 1)
524
table.attach(self._push_location_entry, 1, 2, 0, 1)
526
table.attach(Gtk.Label(_i18n('Parent location:')), 0, 1, 1, 2)
527
table.attach(self._parent_location_entry, 1, 1, 1, 2)
529
table.attach(Gtk.Label(_i18n('Bound location:')), 0, 1, 2, 3)
530
table.attach(self._bound_location_entry, 1, 1, 2, 3)
532
table.attach(Gtk.Label(_i18n('Public location:')), 0, 1, 3, 4)
533
table.attach(self._public_location_entry, 1, 1, 3, 4)
535
table.attach(Gtk.Label(_i18n('Submit location:')), 0, 1, 4, 5)
536
table.attach(self._submit_location_entry, 1, 1, 4, 5)
538
self._append_revisions_only = Gtk.CheckButton(_i18n('Append revisions only'))
539
value = self.branch.get_append_revisions_only()
542
self._append_revisions_only.set_active(value)
543
table.attach(self._append_revisions_only, 0, 2, 5, 6)