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 olive/__init__.py
- browse files at revision 198
- compare with another revision
- download diff
- download tarball
- view history from revision 198
- Committer: Jelmer Vernooij
- Date: 2007-05-19 16:15:11 UTC
- Revision ID: jelmer@samba.org-20070519161511-49bky3avi2uh9uvq
Add tests for DummyRevision.
- files added:
- tests/test_viz.py
- files removed:
- about.py
- branchview
- preferences
- files renamed:
- icons/bzr-icon-64.png => bzr-icon-64.png
- revisionview.py => logview.py
- icons/oliveicon2.png => oliveicon2.png
- preferences/__init__.py => preferences.py
- branchview/linegraph.py => viz/graph.py
- branchview/graphcell.py => viz/graphcell.py
- files modified:
- .bzrignore
added
removed
olive/__init__.py
1
#!/usr/bin/python
2
3
1
# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <szilveszter.farkas@gmail.com>
4
2
#
5
3
# This program is free software; you can redistribute it and/or modify
18
16
19
17
import os
20
18
import sys
21
import time
22
19
23
20
# gettext support
24
21
import gettext
30
27
except:
31
28
pass
32
29
33
import gobject
34
30
import gtk
35
31
import gtk.gdk
36
32
import gtk.glade
38
34
from bzrlib.branch import Branch
39
35
import bzrlib.errors as bzrerrors
40
36
from bzrlib.lazy_import import lazy_import
41
from bzrlib.ui import ui_factory
42
37
from bzrlib.workingtree import WorkingTree
43
38
44
from bzrlib.plugins.gtk import _i18n
45
39
from bzrlib.plugins.gtk.dialog import error_dialog, info_dialog, warning_dialog
46
40
from bzrlib.plugins.gtk.errors import show_bzr_error
47
41
from guifiles import GLADEFILENAME
56
50
from bzrlib.plugins.gtk.conflicts import ConflictsDialog
57
51
from bzrlib.plugins.gtk.initialize import InitDialog
58
52
from bzrlib.plugins.gtk.push import PushDialog
59
from bzrlib.plugins.gtk.revbrowser import RevisionBrowser
60
61
def about():
62
""" Display the AboutDialog. """
63
from bzrlib.plugins.gtk import __version__
64
from bzrlib.plugins.gtk.olive.guifiles import GLADEFILENAME
65
66
# Load AboutDialog description
67
dglade = gtk.glade.XML(GLADEFILENAME, 'aboutdialog')
68
dialog = dglade.get_widget('aboutdialog')
69
70
# Set version
71
dialog.set_version(__version__)
72
dialog.set_authors([ _i18n("Lead Developer:"),
73
"Szilveszter Farkas <szilveszter.farkas@gmail.com>",
74
_i18n("Contributors:"),
75
"Jelmer Vernooij <jelmer@samba.org>",
76
"Mateusz Korniak <mateusz.korniak@ant.gliwice.pl>",
77
"Gary van der Merwe <garyvdm@gmail.com>" ])
78
dialog.set_artists([ "Simon Pascal Klein <klepas@klepas.org>",
79
"Jakub Steiner <jimmac@novell.com>" ])
80
81
dialog.run()
82
# Destroy the dialog
83
dialog.destroy()
84
53
85
54
class OliveGtk:
86
55
""" The main Olive GTK frontend class. This is called when launching the
106
75
# Get some important menu items
107
76
self.menuitem_add_files = self.toplevel.get_widget('menuitem_add_files')
108
77
self.menuitem_remove_files = self.toplevel.get_widget('menuitem_remove_file')
109
self.menuitem_file_bookmark = self.toplevel.get_widget('menuitem_file_bookmark')
110
78
self.menuitem_file_make_directory = self.toplevel.get_widget('menuitem_file_make_directory')
111
79
self.menuitem_file_rename = self.toplevel.get_widget('menuitem_file_rename')
112
80
self.menuitem_file_move = self.toplevel.get_widget('menuitem_file_move')
113
81
self.menuitem_file_annotate = self.toplevel.get_widget('menuitem_file_annotate')
114
82
self.menuitem_view_show_hidden_files = self.toplevel.get_widget('menuitem_view_show_hidden_files')
115
self.menuitem_view_show_ignored_files = self.toplevel.get_widget('menuitem_view_show_ignored_files')
116
83
self.menuitem_branch = self.toplevel.get_widget('menuitem_branch')
117
84
self.menuitem_branch_init = self.toplevel.get_widget('menuitem_branch_initialize')
118
85
self.menuitem_branch_get = self.toplevel.get_widget('menuitem_branch_get')
119
86
self.menuitem_branch_checkout = self.toplevel.get_widget('menuitem_branch_checkout')
120
87
self.menuitem_branch_pull = self.toplevel.get_widget('menuitem_branch_pull')
121
88
self.menuitem_branch_push = self.toplevel.get_widget('menuitem_branch_push')
122
self.menuitem_branch_update = self.toplevel.get_widget('menuitem_branch_update')
123
89
self.menuitem_branch_revert = self.toplevel.get_widget('menuitem_branch_revert')
124
90
self.menuitem_branch_merge = self.toplevel.get_widget('menuitem_branch_merge')
125
91
self.menuitem_branch_commit = self.toplevel.get_widget('menuitem_branch_commit')
137
103
self.toolbutton_commit = self.toplevel.get_widget('toolbutton_commit')
138
104
self.toolbutton_pull = self.toplevel.get_widget('toolbutton_pull')
139
105
self.toolbutton_push = self.toplevel.get_widget('toolbutton_push')
140
self.toolbutton_update = self.toplevel.get_widget('toolbutton_update')
141
106
# Get the drive selector
142
107
self.combobox_drive = gtk.combo_box_new_text()
143
108
self.combobox_drive.connect("changed", self._refresh_drives)
144
109
145
# Get the navigation widgets
146
self.hbox_location = self.toplevel.get_widget('hbox_location')
147
self.button_location_up = self.toplevel.get_widget('button_location_up')
148
self.button_location_jump = self.toplevel.get_widget('button_location_jump')
149
self.entry_location = self.toplevel.get_widget('entry_location')
150
self.image_location_error = self.toplevel.get_widget('image_location_error')
151
152
# Get the History widgets
153
self.check_history = self.toplevel.get_widget('checkbutton_history')
154
self.entry_history = self.toplevel.get_widget('entry_history_revno')
155
self.button_history = self.toplevel.get_widget('button_history_browse')
156
157
110
self.vbox_main_right = self.toplevel.get_widget('vbox_main_right')
111
158
112
159
113
# Dictionary for signal_autoconnect
160
114
dic = { "on_window_main_destroy": gtk.main_quit,
163
117
"on_about_activate": self.on_about_activate,
164
118
"on_menuitem_add_files_activate": self.on_menuitem_add_files_activate,
165
119
"on_menuitem_remove_file_activate": self.on_menuitem_remove_file_activate,
166
"on_menuitem_file_bookmark_activate": self.on_menuitem_file_bookmark_activate,
167
120
"on_menuitem_file_make_directory_activate": self.on_menuitem_file_make_directory_activate,
168
121
"on_menuitem_file_move_activate": self.on_menuitem_file_move_activate,
169
122
"on_menuitem_file_rename_activate": self.on_menuitem_file_rename_activate,
170
123
"on_menuitem_file_annotate_activate": self.on_menuitem_file_annotate_activate,
171
124
"on_menuitem_view_show_hidden_files_activate": self.on_menuitem_view_show_hidden_files_activate,
172
"on_menuitem_view_show_ignored_files_activate": self.on_menuitem_view_show_ignored_files_activate,
173
125
"on_menuitem_view_refresh_activate": self.on_menuitem_view_refresh_activate,
174
126
"on_menuitem_branch_initialize_activate": self.on_menuitem_branch_initialize_activate,
175
127
"on_menuitem_branch_get_activate": self.on_menuitem_branch_get_activate,
179
131
"on_menuitem_branch_commit_activate": self.on_menuitem_branch_commit_activate,
180
132
"on_menuitem_branch_push_activate": self.on_menuitem_branch_push_activate,
181
133
"on_menuitem_branch_pull_activate": self.on_menuitem_branch_pull_activate,
182
"on_menuitem_branch_update_activate": self.on_menuitem_branch_update_activate,
183
134
"on_menuitem_branch_tags_activate": self.on_menuitem_branch_tags_activate,
184
135
"on_menuitem_branch_status_activate": self.on_menuitem_branch_status_activate,
185
136
"on_menuitem_branch_missing_revisions_activate": self.on_menuitem_branch_missing_revisions_activate,
194
145
"on_toolbutton_commit_clicked": self.on_menuitem_branch_commit_activate,
195
146
"on_toolbutton_pull_clicked": self.on_menuitem_branch_pull_activate,
196
147
"on_toolbutton_push_clicked": self.on_menuitem_branch_push_activate,
197
"on_toolbutton_update_clicked": self.on_menuitem_branch_update_activate,
198
148
"on_treeview_right_button_press_event": self.on_treeview_right_button_press_event,
199
149
"on_treeview_right_row_activated": self.on_treeview_right_row_activated,
200
150
"on_treeview_left_button_press_event": self.on_treeview_left_button_press_event,
201
"on_treeview_left_button_release_event": self.on_treeview_left_button_release_event,
202
"on_treeview_left_row_activated": self.on_treeview_left_row_activated,
203
"on_button_location_up_clicked": self.on_button_location_up_clicked,
204
"on_button_location_jump_clicked": self.on_button_location_jump_clicked,
205
"on_entry_location_key_press_event": self.on_entry_location_key_press_event,
206
"on_checkbutton_history_toggled": self.on_checkbutton_history_toggled,
207
"on_entry_history_revno_key_press_event": self.on_entry_history_revno_key_press_event,
208
"on_button_history_browse_clicked": self.on_button_history_browse_clicked
209
}
151
"on_treeview_left_row_activated": self.on_treeview_left_row_activated }
210
152
211
153
# Connect the signals to the handlers
212
154
self.toplevel.signal_autoconnect(dic)
233
175
234
176
# Show drive selector if under Win32
235
177
if sys.platform == 'win32':
236
self.hbox_location.pack_start(self.combobox_drive, False, False, 0)
237
self.hbox_location.reorder_child(self.combobox_drive, 1)
178
self.vbox_main_right.pack_start(self.combobox_drive, False, True, 0)
179
self.vbox_main_right.reorder_child(self.combobox_drive, 0)
238
180
self.combobox_drive.show()
239
181
self.gen_hard_selector()
240
182
242
184
243
185
# Apply menu state
244
186
self.menuitem_view_show_hidden_files.set_active(self.pref.get_preference('dotted_files', 'bool'))
245
self.menuitem_view_show_ignored_files.set_active(self.pref.get_preference('ignored_files', 'bool'))
246
187
247
# We're starting local
248
self.remote = False
249
self.remote_branch = None
250
self.remote_path = None
251
self.remote_revision = None
252
253
188
self.set_path(os.getcwd())
254
189
self._load_right()
255
190
256
191
self._just_started = False
257
192
258
def set_path(self, path, force_remote=False):
193
def set_path(self, path):
194
self.path = path
259
195
self.notbranch = False
260
196
261
if force_remote:
262
# Forcing remote mode (reading data from inventory)
263
self._show_stock_image(gtk.STOCK_DISCONNECT)
264
try:
265
br = Branch.open_containing(path)[0]
266
except bzrerrors.NotBranchError:
267
self._show_stock_image(gtk.STOCK_DIALOG_ERROR)
268
self.check_history.set_active(False)
269
self.check_history.set_sensitive(False)
270
return False
271
except bzrerrors.UnsupportedProtocol:
272
self._show_stock_image(gtk.STOCK_DIALOG_ERROR)
273
self.check_history.set_active(False)
274
self.check_history.set_sensitive(False)
275
return False
276
277
self._show_stock_image(gtk.STOCK_CONNECT)
278
279
self.remote = True
280
281
# We're remote
282
self.remote_branch, self.remote_path = Branch.open_containing(path)
283
284
if self.remote_revision is None:
285
self.remote_revision = self.remote_branch.last_revision()
286
287
self.remote_entries = self.remote_branch.repository.get_inventory(self.remote_revision).entries()
288
289
if len(self.remote_path) == 0:
290
self.remote_parent = self.remote_branch.repository.get_inventory(self.remote_branch.last_revision()).iter_entries_by_dir().next()[1].file_id
291
else:
292
for (name, type) in self.remote_entries:
293
if name == self.remote_path:
294
self.remote_parent = type.file_id
295
break
296
297
if not path.endswith('/'):
298
path += '/'
299
300
if self.remote_branch.base == path:
301
self.button_location_up.set_sensitive(False)
302
else:
303
self.button_location_up.set_sensitive(True)
304
else:
305
if os.path.isdir(path):
306
self.image_location_error.destroy()
307
self.remote = False
308
309
# We're local
310
try:
311
self.wt, self.wtpath = WorkingTree.open_containing(path)
312
except (bzrerrors.NotBranchError, bzrerrors.NoWorkingTree):
313
self.notbranch = True
314
315
# If we're in the root, we cannot go up anymore
316
if sys.platform == 'win32':
317
drive, tail = os.path.splitdrive(path)
318
if tail in ('', '/', '\\'):
319
self.button_location_up.set_sensitive(False)
320
else:
321
self.button_location_up.set_sensitive(True)
322
else:
323
if self.path == '/':
324
self.button_location_up.set_sensitive(False)
325
else:
326
self.button_location_up.set_sensitive(True)
327
elif not os.path.isfile(path):
328
# Doesn't seem to be a file nor a directory, trying to open a
329
# remote location
330
self._show_stock_image(gtk.STOCK_DISCONNECT)
331
try:
332
br = Branch.open_containing(path)[0]
333
except bzrerrors.NotBranchError:
334
self._show_stock_image(gtk.STOCK_DIALOG_ERROR)
335
self.check_history.set_active(False)
336
self.check_history.set_sensitive(False)
337
return False
338
except bzrerrors.UnsupportedProtocol:
339
self._show_stock_image(gtk.STOCK_DIALOG_ERROR)
340
self.check_history.set_active(False)
341
self.check_history.set_sensitive(False)
342
return False
343
344
self._show_stock_image(gtk.STOCK_CONNECT)
345
346
self.remote = True
347
348
# We're remote
349
self.remote_branch, self.remote_path = Branch.open_containing(path)
350
351
if self.remote_revision is None:
352
self.remote_revision = self.remote_branch.last_revision()
353
354
self.remote_entries = self.remote_branch.repository.get_inventory(self.remote_revision).entries()
355
356
if len(self.remote_path) == 0:
357
self.remote_parent = self.remote_branch.repository.get_inventory(self.remote_branch.last_revision()).iter_entries_by_dir().next()[1].file_id
358
else:
359
for (name, type) in self.remote_entries:
360
if name == self.remote_path:
361
self.remote_parent = type.file_id
362
break
363
364
if not path.endswith('/'):
365
path += '/'
366
367
if self.remote_branch.base == path:
368
self.button_location_up.set_sensitive(False)
369
else:
370
self.button_location_up.set_sensitive(True)
371
372
if self.notbranch:
373
self.check_history.set_active(False)
374
self.check_history.set_sensitive(False)
375
else:
376
self.check_history.set_sensitive(True)
197
try:
198
self.wt, self.wtpath = WorkingTree.open_containing(self.path)
199
except (bzrerrors.NotBranchError, bzrerrors.NoWorkingTree):
200
self.notbranch = True
377
201
378
202
self.statusbar.push(self.context_id, path)
379
self.entry_location.set_text(path)
380
self.path = path
381
return True
382
203
383
204
def get_path(self):
384
if not self.remote:
385
return self.path
386
else:
387
# Remote mode
388
if len(self.remote_path) > 0:
389
return self.remote_branch.base + self.remote_path + '/'
390
else:
391
return self.remote_branch.base
205
return self.path
392
206
393
207
def on_about_activate(self, widget):
208
from bzrlib.plugins.gtk.dialog import about
394
209
about()
395
396
def on_button_history_browse_clicked(self, widget):
397
""" Browse for revision button handler. """
398
if self.remote:
399
br = self.remote_branch
400
else:
401
br = self.wt.branch
402
403
revb = RevisionBrowser(br, self.window)
404
response = revb.run()
405
if response != gtk.RESPONSE_NONE:
406
revb.hide()
407
408
if response == gtk.RESPONSE_OK:
409
if revb.selected_revno is not None:
410
self.entry_history.set_text(revb.selected_revno)
411
412
revb.destroy()
413
414
def on_button_location_jump_clicked(self, widget):
415
""" Location Jump button handler. """
416
location = self.entry_location.get_text()
417
418
if self.set_path(location):
419
self.refresh_right()
420
421
def on_button_location_up_clicked(self, widget):
422
""" Location Up button handler. """
423
if not self.remote:
424
# Local mode
425
self.set_path(os.path.split(self.get_path())[0])
426
else:
427
# Remote mode
428
delim = '/'
429
newpath = delim.join(self.get_path().split(delim)[:-2])
430
newpath += '/'
431
self.set_path(newpath)
432
433
self.refresh_right()
434
435
def on_checkbutton_history_toggled(self, widget):
436
""" History Mode toggle handler. """
437
if self.check_history.get_active():
438
# History Mode activated
439
self.entry_history.set_sensitive(True)
440
self.button_history.set_sensitive(True)
441
else:
442
# History Mode deactivated
443
self.entry_history.set_sensitive(False)
444
self.button_history.set_sensitive(False)
445
446
@show_bzr_error
447
def on_entry_history_revno_key_press_event(self, widget, event):
448
""" Key pressed handler for the history entry. """
449
if event.keyval == gtk.gdk.keyval_from_name('Return') or event.keyval == gtk.gdk.keyval_from_name('KP_Enter'):
450
# Return was hit, so we have to load that specific revision
451
# Emulate being remote, so inventory should be used
452
path = self.get_path()
453
if not self.remote:
454
self.remote = True
455
self.remote_branch = self.wt.branch
456
457
revno = int(self.entry_history.get_text())
458
self.remote_revision = self.remote_branch.get_rev_id(revno)
459
if self.set_path(path, True):
460
self.refresh_right()
461
462
def on_entry_location_key_press_event(self, widget, event):
463
""" Key pressed handler for the location entry. """
464
if event.keyval == gtk.gdk.keyval_from_name('Return') or event.keyval == gtk.gdk.keyval_from_name('KP_Enter'):
465
# Return was hit, so we have to jump
466
self.on_button_location_jump_clicked(widget)
467
210
468
211
def on_menuitem_add_files_activate(self, widget):
469
212
""" Add file(s)... menu handler. """
470
213
from add import OliveAdd
474
217
def on_menuitem_branch_get_activate(self, widget):
475
218
""" Branch/Get... menu handler. """
476
219
from bzrlib.plugins.gtk.branch import BranchDialog
477
478
if self.remote:
479
branch = BranchDialog(os.getcwd(), self.window, self.remote_branch.base)
480
else:
481
branch = BranchDialog(self.get_path(), self.window)
220
branch = BranchDialog(self.get_path(), self.window)
482
221
response = branch.run()
483
222
if response != gtk.RESPONSE_NONE:
484
223
branch.hide()
485
224
486
225
if response == gtk.RESPONSE_OK:
487
226
self.refresh_right()
488
227
491
230
def on_menuitem_branch_checkout_activate(self, widget):
492
231
""" Branch/Checkout... menu handler. """
493
232
from bzrlib.plugins.gtk.checkout import CheckoutDialog
494
495
if self.remote:
496
checkout = CheckoutDialog(os.getcwd(), self.window, self.remote_branch.base)
497
else:
498
checkout = CheckoutDialog(self.get_path(), self.window)
233
checkout = CheckoutDialog(self.get_path(), self.window)
499
234
response = checkout.run()
500
235
if response != gtk.RESPONSE_NONE:
501
236
checkout.hide()
508
243
@show_bzr_error
509
244
def on_menuitem_branch_commit_activate(self, widget):
510
245
""" Branch/Commit... menu handler. """
511
# def __init__(self, wt, wtpath, notbranch, selected=None, parent=None):
512
selected = self.get_selected_right()
513
if selected:
514
selected = os.path.join(self.wtpath, selected)
515
commit = CommitDialog(wt=self.wt,
516
parent=self.window,
517
selected=selected,
518
)
246
commit = CommitDialog(self.wt, self.wtpath, self.notbranch, self.get_selected_right(), self.window)
519
247
response = commit.run()
520
248
if response != gtk.RESPONSE_NONE:
521
249
commit.hide()
537
265
from bzrlib.plugins.gtk.merge import MergeDialog
538
266
539
267
if self.check_for_changes():
540
error_dialog(_i18n('There are local changes in the branch'),
541
_i18n('Please commit or revert the changes before merging.'))
268
error_dialog(_('There are local changes in the branch'),
269
_('Please commit or revert the changes before merging.'))
542
270
else:
543
parent_branch_path = self.wt.branch.get_parent()
544
merge = MergeDialog(self.wt, self.wtpath,default_branch_path=parent_branch_path )
271
merge = MergeDialog(self.wt, self.wtpath)
545
272
merge.display()
546
273
547
274
@show_bzr_error
548
275
def on_menuitem_branch_missing_revisions_activate(self, widget):
549
276
""" Branch/Missing revisions menu handler. """
550
551
from bzrlib.missing import find_unmerged, iter_log_revisions
552
553
277
local_branch = self.wt.branch
554
parent_branch_path = local_branch.get_parent()
555
if parent_branch_path is None:
556
error_dialog(_i18n('Parent location is unknown'),
557
_i18n('Cannot determine missing revisions if no parent location is known.'))
278
279
other_branch = local_branch.get_parent()
280
if other_branch is None:
281
error_dialog(_('Parent location is unknown'),
282
_('Cannot determine missing revisions if no parent location is known.'))
558
283
return
559
284
560
parent_branch = Branch.open(parent_branch_path)
561
562
if parent_branch.base == local_branch.base:
563
parent_branch = local_branch
564
565
local_extra, remote_extra = find_unmerged(local_branch,parent_branch)
566
567
if local_extra or remote_extra:
568
569
## def log_revision_one_line_text(log_revision):
570
## """ Generates one line description of log_revison ended with end of line."""
571
## revision = log_revision.rev
572
## txt = "- %s (%s)\n" % (revision.get_summary(), revision.committer, )
573
## txt = txt.replace("<"," ") # Seems < > chars are expected to be xml tags ...
574
## txt = txt.replace(">"," ")
575
## return txt
576
577
dlg_txt = ""
578
if local_extra:
579
dlg_txt += _i18n('%d local extra revision(s). \n') % (len(local_extra),)
580
## NOTE: We do not want such ugly info about missing revisions
581
## Revision Browser should be used there
582
## max_revisions = 10
583
## for log_revision in iter_log_revisions(local_extra, local_branch.repository, verbose=1):
584
## dlg_txt += log_revision_one_line_text(log_revision)
585
## if max_revisions <= 0:
586
## dlg_txt += _i18n("more ... \n")
587
## break
588
## max_revisions -= 1
589
## dlg_txt += "\n"
590
if remote_extra:
591
dlg_txt += _i18n('%d local missing revision(s).\n') % (len(remote_extra),)
592
## max_revisions = 10
593
## for log_revision in iter_log_revisions(remote_extra, parent_branch.repository, verbose=1):
594
## dlg_txt += log_revision_one_line_text(log_revision)
595
## if max_revisions <= 0:
596
## dlg_txt += _i18n("more ... \n")
597
## break
598
## max_revisions -= 1
599
600
info_dialog(_i18n('There are missing revisions'),
601
dlg_txt)
285
remote_branch = Branch.open(other_branch)
286
287
if remote_branch.base == local_branch.base:
288
remote_branch = local_branch
289
290
ret = len(local_branch.missing_revisions(remote_branch))
291
292
if ret > 0:
293
info_dialog(_('There are missing revisions'),
294
_('%d revision(s) missing.') % ret)
602
295
else:
603
info_dialog(_i18n('Local branch up to date'),
604
_i18n('There are no missing revisions.'))
296
info_dialog(_('Local branch up to date'),
297
_('There are no missing revisions.'))
605
298
606
299
@show_bzr_error
607
300
def on_menuitem_branch_pull_activate(self, widget):
610
303
611
304
location = branch_to.get_parent()
612
305
if location is None:
613
error_dialog(_i18n('Parent location is unknown'),
614
_i18n('Pulling is not possible until there is a parent location.'))
306
error_dialog(_('Parent location is unknown'),
307
_('Pulling is not possible until there is a parent location.'))
615
308
return
616
309
617
310
branch_from = Branch.open(location)
619
312
if branch_to.get_parent() is None:
620
313
branch_to.set_parent(branch_from.base)
621
314
315
#old_rh = branch_to.revision_history()
316
#if tree_to is not None:
317
# tree_to.pull(branch_from)
318
#else:
319
# branch_to.pull(branch_from)
622
320
ret = branch_to.pull(branch_from)
623
321
624
info_dialog(_i18n('Pull successful'), _i18n('%d revision(s) pulled.') % ret)
625
626
@show_bzr_error
627
def on_menuitem_branch_update_activate(self, widget):
628
""" Brranch/checkout update menu handler. """
629
630
ret = self.wt.update()
631
conflicts = self.wt.conflicts()
632
if conflicts:
633
info_dialog(_i18n('Update successful but conflicts generated'), _i18n('Number of conflicts generated: %d.') % (len(conflicts),) )
634
else:
635
info_dialog(_i18n('Update successful'), _i18n('No conflicts generated.') )
322
info_dialog(_('Pull successful'), _('%d revision(s) pulled.') % ret)
636
323
637
324
def on_menuitem_branch_push_activate(self, widget):
638
325
""" Branch/Push... menu handler. """
639
push = PushDialog(repository=None,revid=None,branch=self.wt.branch, parent=self.window)
326
push = PushDialog(self.wt.branch, self.window)
640
327
response = push.run()
641
328
if response != gtk.RESPONSE_NONE:
642
329
push.destroy()
646
333
""" Branch/Revert all changes menu handler. """
647
334
ret = self.wt.revert([])
648
335
if ret:
649
warning_dialog(_i18n('Conflicts detected'),
650
_i18n('Please have a look at the working tree before continuing.'))
336
warning_dialog(_('Conflicts detected'),
337
_('Please have a look at the working tree before continuing.'))
651
338
else:
652
info_dialog(_i18n('Revert successful'),
653
_i18n('All files reverted to last revision.'))
339
info_dialog(_('Revert successful'),
340
_('All files reverted to last revision.'))
654
341
self.refresh_right()
655
342
656
343
def on_menuitem_branch_status_activate(self, widget):
657
344
""" Branch/Status... menu handler. """
658
345
from bzrlib.plugins.gtk.status import StatusDialog
659
346
status = StatusDialog(self.wt, self.wtpath)
660
response = status.run()
661
if response != gtk.RESPONSE_NONE:
662
status.destroy()
347
status.display()
663
348
664
349
def on_menuitem_branch_initialize_activate(self, widget):
665
350
""" Initialize current directory. """
676
361
def on_menuitem_branch_tags_activate(self, widget):
677
362
""" Branch/Tags... menu handler. """
678
363
from bzrlib.plugins.gtk.tags import TagsWindow
679
if not self.remote:
680
window = TagsWindow(self.wt.branch, self.window)
681
else:
682
window = TagsWindow(self.remote_branch, self.window)
364
window = TagsWindow(self.wt.branch, self.window)
683
365
window.show()
684
366
685
367
def on_menuitem_file_annotate_activate(self, widget):
686
368
""" File/Annotate... menu handler. """
687
369
if self.get_selected_right() is None:
688
error_dialog(_i18n('No file was selected'),
689
_i18n('Please select a file from the list.'))
370
error_dialog(_('No file was selected'),
371
_('Please select a file from the list.'))
690
372
return
691
373
692
374
branch = self.wt.branch
693
375
file_id = self.wt.path2id(self.wt.relpath(os.path.join(self.path, self.get_selected_right())))
694
376
695
window = GAnnotateWindow(all=False, plain=False, parent=self.window)
377
window = GAnnotateWindow(all=False, plain=False)
696
378
window.set_title(os.path.join(self.path, self.get_selected_right()) + " - Annotate")
697
379
config = GAnnotateConfig(window)
698
380
window.show()
702
384
finally:
703
385
branch.unlock()
704
386
705
def on_menuitem_file_bookmark_activate(self, widget):
706
""" File/Bookmark current directory menu handler. """
707
if self.pref.add_bookmark(self.path):
708
info_dialog(_i18n('Bookmark successfully added'),
709
_i18n('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
710
self.pref.write()
711
else:
712
warning_dialog(_i18n('Location already bookmarked'),
713
_i18n('The current directory is already bookmarked.\nSee the left panel for reference.'))
714
715
self.refresh_left()
716
717
387
def on_menuitem_file_make_directory_activate(self, widget):
718
388
""" File/Make directory... menu handler. """
719
389
from mkdir import OliveMkdir
751
421
752
422
def on_menuitem_stats_diff_activate(self, widget):
753
423
""" Statistics/Differences... menu handler. """
754
window = DiffWindow(parent=self.window)
424
window = DiffWindow()
755
425
parent_tree = self.wt.branch.repository.revision_tree(self.wt.branch.last_revision())
756
426
window.set_diff(self.wt.branch.nick, self.wt, parent_tree)
757
427
window.show()
759
429
def on_menuitem_stats_infos_activate(self, widget):
760
430
""" Statistics/Informations... menu handler. """
761
431
from info import OliveInfo
762
if self.remote:
763
info = OliveInfo(self.remote_branch)
764
else:
765
info = OliveInfo(self.wt.branch)
432
info = OliveInfo(self.wt)
766
433
info.display()
767
434
768
435
def on_menuitem_stats_log_activate(self, widget):
769
436
""" Statistics/Log... menu handler. """
770
771
if not self.remote:
772
branch = self.wt.branch
773
else:
774
branch = self.remote_branch
775
776
window = branchwin.BranchWindow(branch, branch.last_revision(), None, parent=self.window)
437
window = branchwin.BranchWindow()
438
window.set_branch(self.wt.branch, self.wt.branch.last_revision(), None)
777
439
window.show()
778
440
779
441
def on_menuitem_view_refresh_activate(self, widget):
789
451
if self.path is not None:
790
452
self.refresh_right()
791
453
792
def on_menuitem_view_show_ignored_files_activate(self, widget):
793
""" Hide/Show ignored files menu handler. """
794
self.pref.set_preference('ignored_files', widget.get_active())
795
if self.path is not None:
796
self.refresh_right()
797
798
454
def on_treeview_left_button_press_event(self, widget, event):
799
455
""" Occurs when somebody right-clicks in the bookmark list. """
800
456
if event.button == 3:
811
467
menu.left_context_menu().popup(None, None, None, 0,
812
468
event.time)
813
469
814
def on_treeview_left_button_release_event(self, widget, event):
815
""" Occurs when somebody just clicks a bookmark. """
816
if event.button != 3:
817
# Allow one-click bookmark opening
818
if self.get_selected_left() == None:
819
return
820
821
newdir = self.get_selected_left()
822
if newdir == None:
823
return
824
825
if self.set_path(newdir):
826
self.refresh_right()
827
828
470
def on_treeview_left_row_activated(self, treeview, path, view_column):
829
471
""" Occurs when somebody double-clicks or enters an item in the
830
472
bookmark list. """
833
475
if newdir == None:
834
476
return
835
477
836
if self.set_path(newdir):
837
self.refresh_right()
478
self.set_path(newdir)
479
self.refresh_right()
838
480
839
481
def on_treeview_right_button_press_event(self, widget, event):
840
482
""" Occurs when somebody right-clicks in the file list. """
845
487
selected=self.get_selected_right(),
846
488
app=self)
847
489
# get the menu items
848
m_open = menu.ui.get_widget('/context_right/open')
849
490
m_add = menu.ui.get_widget('/context_right/add')
850
491
m_remove = menu.ui.get_widget('/context_right/remove')
851
492
m_rename = menu.ui.get_widget('/context_right/rename')
852
493
m_revert = menu.ui.get_widget('/context_right/revert')
853
494
m_commit = menu.ui.get_widget('/context_right/commit')
854
m_annotate = menu.ui.get_widget('/context_right/annotate')
855
495
m_diff = menu.ui.get_widget('/context_right/diff')
856
496
# check if we're in a branch
857
497
try:
858
498
from bzrlib.branch import Branch
859
499
Branch.open_containing(self.get_path())
860
if self.remote:
861
m_open.set_sensitive(False)
862
m_add.set_sensitive(False)
863
m_remove.set_sensitive(False)
864
m_rename.set_sensitive(False)
865
m_revert.set_sensitive(False)
866
m_commit.set_sensitive(False)
867
m_annotate.set_sensitive(False)
868
m_diff.set_sensitive(False)
869
else:
870
m_open.set_sensitive(True)
871
m_add.set_sensitive(True)
872
m_remove.set_sensitive(True)
873
m_rename.set_sensitive(True)
874
m_revert.set_sensitive(True)
875
m_commit.set_sensitive(True)
876
m_annotate.set_sensitive(True)
877
m_diff.set_sensitive(True)
500
m_add.set_sensitive(True)
501
m_remove.set_sensitive(True)
502
m_rename.set_sensitive(True)
503
m_revert.set_sensitive(True)
504
m_commit.set_sensitive(True)
505
m_diff.set_sensitive(True)
878
506
except bzrerrors.NotBranchError:
879
m_open.set_sensitive(True)
880
507
m_add.set_sensitive(False)
881
508
m_remove.set_sensitive(False)
882
509
m_rename.set_sensitive(False)
883
510
m_revert.set_sensitive(False)
884
511
m_commit.set_sensitive(False)
885
m_annotate.set_sensitive(False)
886
512
m_diff.set_sensitive(False)
887
513
888
if not self.remote:
889
menu.right_context_menu().popup(None, None, None, 0,
890
event.time)
891
else:
892
menu.remote_context_menu().popup(None, None, None, 0,
893
event.time)
514
menu.right_context_menu().popup(None, None, None, 0,
515
event.time)
894
516
895
517
def on_treeview_right_row_activated(self, treeview, path, view_column):
896
518
""" Occurs when somebody double-clicks or enters an item in the
899
521
900
522
newdir = self.get_selected_right()
901
523
902
if not self.remote:
903
# We're local
904
if newdir == '..':
905
self.set_path(os.path.split(self.get_path())[0])
524
if newdir == '..':
525
self.set_path(os.path.split(self.get_path())[0])
526
else:
527
fullpath = os.path.join(self.get_path(), newdir)
528
if os.path.isdir(fullpath):
529
# selected item is an existant directory
530
self.set_path(fullpath)
906
531
else:
907
fullpath = os.path.join(self.get_path(), newdir)
908
if os.path.isdir(fullpath):
909
# selected item is an existant directory
910
self.set_path(fullpath)
911
else:
912
launch(fullpath)
913
else:
914
# We're remote
915
if self._is_remote_dir(self.get_path() + newdir):
916
self.set_path(self.get_path() + newdir)
532
launch(fullpath)
917
533
918
534
self.refresh_right()
919
535
940
556
bookmarks = self.pref.get_bookmarks()
941
557
942
558
# Add them to the TreeStore
943
titer = treestore.append(None, [_i18n('Bookmarks'), None])
559
titer = treestore.append(None, [_('Bookmarks'), None])
944
560
for item in bookmarks:
945
561
title = self.pref.get_bookmark_title(item)
946
562
treestore.append(titer, [title, item])
947
563
948
564
# Create the column and add it to the TreeView
949
565
self.treeview_left.set_model(treestore)
950
tvcolumn_bookmark = gtk.TreeViewColumn(_i18n('Bookmark'))
566
tvcolumn_bookmark = gtk.TreeViewColumn(_('Bookmark'))
951
567
self.treeview_left.append_column(tvcolumn_bookmark)
952
568
953
569
# Set up the cells
958
574
# Expand the tree
959
575
self.treeview_left.expand_all()
960
576
577
def _add_updir_to_dirlist(self, dirlist, curdir):
578
"""Add .. to the top of directories list if we not in root directory
579
580
:param dirlist: list of directories (modified in place)
581
:param curdir: current directory
582
:return: nothing
583
"""
584
if curdir is None:
585
curdir = self.path
586
587
if sys.platform == 'win32':
588
drive, tail = os.path.splitdrive(curdir)
589
if tail in ('', '/', '\\'):
590
return
591
else:
592
if curdir == '/':
593
return
594
595
# insert always as first element
596
dirlist.insert(0, '..')
597
961
598
def _load_right(self):
962
599
""" Load data into the right panel. (Filelist) """
963
600
# Create ListStore
964
# Model: [ icon, dir, name, status text, status, size (int), size (human), mtime (int), mtime (local), fileid ]
965
liststore = gtk.ListStore(gobject.TYPE_STRING,
966
gobject.TYPE_BOOLEAN,
967
gobject.TYPE_STRING,
968
gobject.TYPE_STRING,
969
gobject.TYPE_STRING,
970
gobject.TYPE_STRING,
971
gobject.TYPE_STRING,
972
gobject.TYPE_INT,
973
gobject.TYPE_STRING,
974
gobject.TYPE_STRING)
601
liststore = gtk.ListStore(str, str, str)
975
602
976
603
dirs = []
977
604
files = []
985
612
dirs.append(item)
986
613
else:
987
614
files.append(item)
615
616
# Sort'em
617
dirs.sort()
618
files.sort()
619
620
# add updir link to dirs
621
self._add_updir_to_dirlist(dirs, self.path)
988
622
989
623
if not self.notbranch:
990
624
branch = self.wt.branch
993
627
delta = self.wt.changes_from(tree2, want_unchanged=True)
994
628
995
629
# Add'em to the ListStore
996
for item in dirs:
997
try:
998
statinfo = os.stat(self.path + os.sep + item)
999
except OSError, e:
1000
if e.errno == 40:
1001
continue
1002
else:
1003
raise
1004
liststore.append([ gtk.STOCK_DIRECTORY,
1005
True,
1006
item,
1007
'',
1008
'',
1009
"<DIR>",
1010
"<DIR>",
1011
statinfo.st_mtime,
1012
self._format_date(statinfo.st_mtime),
1013
''])
630
for item in dirs:
631
liststore.append([gtk.STOCK_DIRECTORY, item, ''])
1014
632
for item in files:
1015
633
status = 'unknown'
1016
fileid = ''
1017
634
if not self.notbranch:
1018
635
filename = self.wt.relpath(self.path + os.sep + item)
1019
636
1023
640
for rpath, rpathnew, id, kind, text_modified, meta_modified in delta.renamed:
1024
641
if rpathnew == filename:
1025
642
status = 'renamed'
1026
fileid = id
1027
643
for rpath, id, kind in delta.added:
1028
644
if rpath == filename:
1029
645
status = 'added'
1030
fileid = id
1031
646
for rpath, id, kind in delta.removed:
1032
647
if rpath == filename:
1033
648
status = 'removed'
1034
fileid = id
1035
649
for rpath, id, kind, text_modified, meta_modified in delta.modified:
1036
650
if rpath == filename:
1037
651
status = 'modified'
1038
fileid = id
1039
652
for rpath, id, kind in delta.unchanged:
1040
653
if rpath == filename:
1041
654
status = 'unchanged'
1042
fileid = id
1043
655
for rpath, file_class, kind, id, entry in self.wt.list_files():
1044
656
if rpath == filename and file_class == 'I':
1045
657
status = 'ignored'
1046
658
finally:
1047
659
self.wt.unlock()
1048
660
661
#try:
662
# status = fileops.status(path + os.sep + item)
663
#except errors.PermissionDenied:
664
# continue
665
1049
666
if status == 'renamed':
1050
st = _i18n('renamed')
667
st = _('renamed')
1051
668
elif status == 'removed':
1052
st = _i18n('removed')
669
st = _('removed')
1053
670
elif status == 'added':
1054
st = _i18n('added')
671
st = _('added')
1055
672
elif status == 'modified':
1056
st = _i18n('modified')
673
st = _('modified')
1057
674
elif status == 'unchanged':
1058
st = _i18n('unchanged')
675
st = _('unchanged')
1059
676
elif status == 'ignored':
1060
st = _i18n('ignored')
677
st = _('ignored')
1061
678
else:
1062
st = _i18n('unknown')
1063
1064
try:
1065
statinfo = os.stat(self.path + os.sep + item)
1066
except OSError, e:
1067
if e.errno == 40:
1068
continue
1069
else:
1070
raise
1071
liststore.append([gtk.STOCK_FILE,
1072
False,
1073
item,
1074
st,
1075
status,
1076
str(statinfo.st_size), # NOTE: if int used there it will fail for large files (size expressed as long int)
1077
self._format_size(statinfo.st_size),
1078
statinfo.st_mtime,
1079
self._format_date(statinfo.st_mtime),
1080
fileid])
679
st = _('unknown')
680
liststore.append([gtk.STOCK_FILE, item, st])
1081
681
1082
682
# Create the columns and add them to the TreeView
1083
683
self.treeview_right.set_model(liststore)
1084
self._tvcolumn_filename = gtk.TreeViewColumn(_i18n('Filename'))
1085
self._tvcolumn_status = gtk.TreeViewColumn(_i18n('Status'))
1086
self._tvcolumn_size = gtk.TreeViewColumn(_i18n('Size'))
1087
self._tvcolumn_mtime = gtk.TreeViewColumn(_i18n('Last modified'))
1088
self.treeview_right.append_column(self._tvcolumn_filename)
1089
self.treeview_right.append_column(self._tvcolumn_status)
1090
self.treeview_right.append_column(self._tvcolumn_size)
1091
self.treeview_right.append_column(self._tvcolumn_mtime)
684
tvcolumn_filename = gtk.TreeViewColumn(_('Filename'))
685
tvcolumn_status = gtk.TreeViewColumn(_('Status'))
686
self.treeview_right.append_column(tvcolumn_filename)
687
self.treeview_right.append_column(tvcolumn_status)
1092
688
1093
689
# Set up the cells
1094
690
cellpb = gtk.CellRendererPixbuf()
1095
691
cell = gtk.CellRendererText()
1096
self._tvcolumn_filename.pack_start(cellpb, False)
1097
self._tvcolumn_filename.pack_start(cell, True)
1098
self._tvcolumn_filename.set_attributes(cellpb, stock_id=0)
1099
self._tvcolumn_filename.add_attribute(cell, 'text', 2)
1100
self._tvcolumn_status.pack_start(cell, True)
1101
self._tvcolumn_status.add_attribute(cell, 'text', 3)
1102
self._tvcolumn_size.pack_start(cell, True)
1103
self._tvcolumn_size.add_attribute(cell, 'text', 6)
1104
self._tvcolumn_mtime.pack_start(cell, True)
1105
self._tvcolumn_mtime.add_attribute(cell, 'text', 8)
1106
1107
# Set up the properties of the TreeView
1108
self.treeview_right.set_headers_visible(True)
1109
self.treeview_right.set_headers_clickable(True)
1110
self.treeview_right.set_search_column(1)
1111
self._tvcolumn_filename.set_resizable(True)
1112
self._tvcolumn_status.set_resizable(True)
1113
self._tvcolumn_size.set_resizable(True)
1114
self._tvcolumn_mtime.set_resizable(True)
1115
# Set up sorting
1116
liststore.set_sort_func(13, self._sort_filelist_callback, None)
1117
liststore.set_sort_column_id(13, gtk.SORT_ASCENDING)
1118
self._tvcolumn_filename.set_sort_column_id(13)
1119
self._tvcolumn_status.set_sort_column_id(3)
1120
self._tvcolumn_size.set_sort_column_id(5)
1121
self._tvcolumn_mtime.set_sort_column_id(7)
692
tvcolumn_filename.pack_start(cellpb, False)
693
tvcolumn_filename.pack_start(cell, True)
694
tvcolumn_filename.set_attributes(cellpb, stock_id=0)
695
tvcolumn_filename.add_attribute(cell, 'text', 1)
696
tvcolumn_status.pack_start(cell, True)
697
tvcolumn_status.add_attribute(cell, 'text', 2)
1122
698
1123
699
# Set sensitivity
1124
700
self.set_sensitivity()
1125
701
1126
def get_selected_fileid(self):
1127
""" Get the file_id of the selected file. """
1128
treeselection = self.treeview_right.get_selection()
1129
(model, iter) = treeselection.get_selected()
1130
1131
if iter is None:
1132
return None
1133
else:
1134
return model.get_value(iter, 9)
1135
1136
702
def get_selected_right(self):
1137
703
""" Get the selected filename. """
1138
704
treeselection = self.treeview_right.get_selection()
1141
707
if iter is None:
1142
708
return None
1143
709
else:
1144
return model.get_value(iter, 2)
710
return model.get_value(iter, 1)
1145
711
1146
712
def get_selected_left(self):
1147
713
""" Get the selected bookmark. """
1163
729
1164
730
def set_sensitivity(self):
1165
731
""" Set menu and toolbar sensitivity. """
1166
if not self.remote:
1167
# We're local
1168
self.menuitem_branch_init.set_sensitive(self.notbranch)
1169
self.menuitem_branch_get.set_sensitive(self.notbranch)
1170
self.menuitem_branch_checkout.set_sensitive(self.notbranch)
1171
self.menuitem_branch_pull.set_sensitive(not self.notbranch)
1172
self.menuitem_branch_push.set_sensitive(not self.notbranch)
1173
self.menuitem_branch_update.set_sensitive(not self.notbranch)
1174
self.menuitem_branch_revert.set_sensitive(not self.notbranch)
1175
self.menuitem_branch_merge.set_sensitive(not self.notbranch)
1176
self.menuitem_branch_commit.set_sensitive(not self.notbranch)
1177
self.menuitem_branch_tags.set_sensitive(not self.notbranch)
1178
self.menuitem_branch_status.set_sensitive(not self.notbranch)
1179
self.menuitem_branch_missing.set_sensitive(not self.notbranch)
1180
self.menuitem_branch_conflicts.set_sensitive(not self.notbranch)
1181
self.menuitem_stats.set_sensitive(not self.notbranch)
1182
self.menuitem_stats_diff.set_sensitive(not self.notbranch)
1183
self.menuitem_add_files.set_sensitive(not self.notbranch)
1184
self.menuitem_remove_files.set_sensitive(not self.notbranch)
1185
self.menuitem_file_make_directory.set_sensitive(not self.notbranch)
1186
self.menuitem_file_rename.set_sensitive(not self.notbranch)
1187
self.menuitem_file_move.set_sensitive(not self.notbranch)
1188
self.menuitem_file_annotate.set_sensitive(not self.notbranch)
1189
#self.menutoolbutton_diff.set_sensitive(True)
1190
self.toolbutton_diff.set_sensitive(not self.notbranch)
1191
self.toolbutton_log.set_sensitive(not self.notbranch)
1192
self.toolbutton_commit.set_sensitive(not self.notbranch)
1193
self.toolbutton_pull.set_sensitive(not self.notbranch)
1194
self.toolbutton_push.set_sensitive(not self.notbranch)
1195
self.toolbutton_update.set_sensitive(not self.notbranch)
1196
else:
1197
# We're remote
1198
self.menuitem_branch_init.set_sensitive(False)
1199
self.menuitem_branch_get.set_sensitive(True)
1200
self.menuitem_branch_checkout.set_sensitive(True)
1201
self.menuitem_branch_pull.set_sensitive(False)
1202
self.menuitem_branch_push.set_sensitive(False)
1203
self.menuitem_branch_update.set_sensitive(False)
1204
self.menuitem_branch_revert.set_sensitive(False)
1205
self.menuitem_branch_merge.set_sensitive(False)
1206
self.menuitem_branch_commit.set_sensitive(False)
1207
self.menuitem_branch_tags.set_sensitive(True)
1208
self.menuitem_branch_status.set_sensitive(False)
1209
self.menuitem_branch_missing.set_sensitive(False)
1210
self.menuitem_branch_conflicts.set_sensitive(False)
1211
self.menuitem_stats.set_sensitive(True)
1212
self.menuitem_stats_diff.set_sensitive(False)
1213
self.menuitem_add_files.set_sensitive(False)
1214
self.menuitem_remove_files.set_sensitive(False)
1215
self.menuitem_file_make_directory.set_sensitive(False)
1216
self.menuitem_file_rename.set_sensitive(False)
1217
self.menuitem_file_move.set_sensitive(False)
1218
self.menuitem_file_annotate.set_sensitive(False)
1219
#self.menutoolbutton_diff.set_sensitive(True)
1220
self.toolbutton_diff.set_sensitive(False)
1221
self.toolbutton_log.set_sensitive(True)
1222
self.toolbutton_commit.set_sensitive(False)
1223
self.toolbutton_pull.set_sensitive(False)
1224
self.toolbutton_push.set_sensitive(False)
1225
self.toolbutton_update.set_sensitive(False)
732
self.menuitem_branch_init.set_sensitive(self.notbranch)
733
self.menuitem_branch_get.set_sensitive(self.notbranch)
734
self.menuitem_branch_checkout.set_sensitive(self.notbranch)
735
self.menuitem_branch_pull.set_sensitive(not self.notbranch)
736
self.menuitem_branch_push.set_sensitive(not self.notbranch)
737
self.menuitem_branch_revert.set_sensitive(not self.notbranch)
738
self.menuitem_branch_merge.set_sensitive(not self.notbranch)
739
self.menuitem_branch_commit.set_sensitive(not self.notbranch)
740
self.menuitem_branch_tags.set_sensitive(not self.notbranch)
741
self.menuitem_branch_status.set_sensitive(not self.notbranch)
742
self.menuitem_branch_missing.set_sensitive(not self.notbranch)
743
self.menuitem_branch_conflicts.set_sensitive(not self.notbranch)
744
self.menuitem_stats.set_sensitive(not self.notbranch)
745
self.menuitem_add_files.set_sensitive(not self.notbranch)
746
self.menuitem_remove_files.set_sensitive(not self.notbranch)
747
self.menuitem_file_make_directory.set_sensitive(not self.notbranch)
748
self.menuitem_file_rename.set_sensitive(not self.notbranch)
749
self.menuitem_file_move.set_sensitive(not self.notbranch)
750
self.menuitem_file_annotate.set_sensitive(not self.notbranch)
751
#self.menutoolbutton_diff.set_sensitive(True)
752
self.toolbutton_diff.set_sensitive(not self.notbranch)
753
self.toolbutton_log.set_sensitive(not self.notbranch)
754
self.toolbutton_commit.set_sensitive(not self.notbranch)
755
self.toolbutton_pull.set_sensitive(not self.notbranch)
756
self.toolbutton_push.set_sensitive(not self.notbranch)
1226
757
1227
758
def refresh_left(self):
1228
759
""" Refresh the bookmark list. """
1238
769
bookmarks = self.pref.get_bookmarks()
1239
770
1240
771
# Add them to the TreeStore
1241
titer = treestore.append(None, [_i18n('Bookmarks'), None])
772
titer = treestore.append(None, [_('Bookmarks'), None])
1242
773
for item in bookmarks:
1243
774
title = self.pref.get_bookmark_title(item)
1244
775
treestore.append(titer, [title, item])
1251
782
1252
783
def refresh_right(self, path=None):
1253
784
""" Refresh the file list. """
1254
if not self.remote:
1255
# We're local
1256
from bzrlib.workingtree import WorkingTree
1257
1258
if path is None:
1259
path = self.get_path()
1260
1261
# A workaround for double-clicking Bookmarks
1262
if not os.path.exists(path):
1263
return
1264
1265
# Get ListStore and clear it
1266
liststore = self.treeview_right.get_model()
1267
liststore.clear()
1268
1269
# Show Status column
1270
self._tvcolumn_status.set_visible(True)
1271
1272
dirs = []
1273
files = []
1274
1275
# Fill the appropriate lists
1276
dotted_files = self.pref.get_preference('dotted_files', 'bool')
1277
ignored_files = self.pref.get_preference('ignored_files', 'bool')
1278
1279
for item in os.listdir(path):
1280
if not dotted_files and item[0] == '.':
1281
continue
1282
if os.path.isdir(path + os.sep + item):
1283
dirs.append(item)
1284
else:
1285
files.append(item)
1286
1287
# Try to open the working tree
1288
notbranch = False
1289
try:
1290
tree1 = WorkingTree.open_containing(path)[0]
1291
except (bzrerrors.NotBranchError, bzrerrors.NoWorkingTree):
1292
notbranch = True
1293
785
from bzrlib.workingtree import WorkingTree
786
787
if path is None:
788
path = self.get_path()
789
790
# A workaround for double-clicking Bookmarks
791
if not os.path.exists(path):
792
return
793
794
# Get ListStore and clear it
795
liststore = self.treeview_right.get_model()
796
liststore.clear()
797
798
dirs = []
799
files = []
800
801
# Fill the appropriate lists
802
dotted_files = self.pref.get_preference('dotted_files', 'bool')
803
for item in os.listdir(path):
804
if not dotted_files and item[0] == '.':
805
continue
806
if os.path.isdir(path + os.sep + item):
807
dirs.append(item)
808
else:
809
files.append(item)
810
811
# Sort'em
812
dirs.sort()
813
files.sort()
814
815
# add updir link to dirs
816
self._add_updir_to_dirlist(dirs, path)
817
818
# Try to open the working tree
819
notbranch = False
820
try:
821
tree1 = WorkingTree.open_containing(path)[0]
822
except (bzrerrors.NotBranchError, bzrerrors.NoWorkingTree):
823
notbranch = True
824
825
if not notbranch:
826
branch = tree1.branch
827
tree2 = tree1.branch.repository.revision_tree(branch.last_revision())
828
829
delta = tree1.changes_from(tree2, want_unchanged=True)
830
831
# Add'em to the ListStore
832
for item in dirs:
833
liststore.append([gtk.STOCK_DIRECTORY, item, ''])
834
for item in files:
835
status = 'unknown'
1294
836
if not notbranch:
1295
branch = tree1.branch
1296
tree2 = tree1.branch.repository.revision_tree(branch.last_revision())
1297
1298
delta = tree1.changes_from(tree2, want_unchanged=True)
837
filename = tree1.relpath(path + os.sep + item)
1299
838
1300
# Add'em to the ListStore
1301
for item in dirs:
1302
839
try:
1303
statinfo = os.stat(self.path + os.sep + item)
1304
except OSError, e:
1305
if e.errno == 40:
1306
continue
1307
else:
1308
raise
1309
liststore.append([gtk.STOCK_DIRECTORY,
1310
True,
1311
item,
1312
'',
1313
'',
1314
"<DIR>",
1315
"<DIR>",
1316
statinfo.st_mtime,
1317
self._format_date(statinfo.st_mtime),
1318
''])
1319
for item in files:
1320
status = 'unknown'
1321
fileid = ''
1322
if not notbranch:
1323
filename = tree1.relpath(path + os.sep + item)
840
self.wt.lock_read()
1324
841
1325
try:
1326
self.wt.lock_read()
1327
1328
for rpath, rpathnew, id, kind, text_modified, meta_modified in delta.renamed:
1329
if rpathnew == filename:
1330
status = 'renamed'
1331
fileid = id
1332
for rpath, id, kind in delta.added:
1333
if rpath == filename:
1334
status = 'added'
1335
fileid = id
1336
for rpath, id, kind in delta.removed:
1337
if rpath == filename:
1338
status = 'removed'
1339
fileid = id
1340
for rpath, id, kind, text_modified, meta_modified in delta.modified:
1341
if rpath == filename:
1342
status = 'modified'
1343
fileid = id
1344
for rpath, id, kind in delta.unchanged:
1345
if rpath == filename:
1346
status = 'unchanged'
1347
fileid = id
1348
for rpath, file_class, kind, id, entry in self.wt.list_files():
1349
if rpath == filename and file_class == 'I':
1350
status = 'ignored'
1351
finally:
1352
self.wt.unlock()
1353
1354
if status == 'renamed':
1355
st = _i18n('renamed')
1356
elif status == 'removed':
1357
st = _i18n('removed')
1358
elif status == 'added':
1359
st = _i18n('added')
1360
elif status == 'modified':
1361
st = _i18n('modified')
1362
elif status == 'unchanged':
1363
st = _i18n('unchanged')
1364
elif status == 'ignored':
1365
st = _i18n('ignored')
1366
if not ignored_files:
1367
continue
1368
else:
1369
st = _i18n('unknown')
1370
1371
try:
1372
statinfo = os.stat(self.path + os.sep + item)
1373
except OSError, e:
1374
if e.errno == 40:
1375
continue
1376
else:
1377
raise
1378
liststore.append([gtk.STOCK_FILE,
1379
False,
1380
item,
1381
st,
1382
status,
1383
str(statinfo.st_size),
1384
self._format_size(statinfo.st_size),
1385
statinfo.st_mtime,
1386
self._format_date(statinfo.st_mtime),
1387
fileid])
1388
else:
1389
# We're remote
1390
1391
# Get ListStore and clear it
1392
liststore = self.treeview_right.get_model()
1393
liststore.clear()
1394
1395
# Hide Status column
1396
self._tvcolumn_status.set_visible(False)
1397
1398
dirs = []
1399
files = []
1400
1401
self._show_stock_image(gtk.STOCK_REFRESH)
1402
1403
for (name, type) in self.remote_entries:
1404
if type.kind == 'directory':
1405
dirs.append(type)
1406
elif type.kind == 'file':
1407
files.append(type)
1408
1409
class HistoryCache:
1410
""" Cache based on revision history. """
1411
def __init__(self, history):
1412
self._history = history
1413
1414
def _lookup_revision(self, revid):
1415
for r in self._history:
1416
if r.revision_id == revid:
1417
return r
1418
rev = repo.get_revision(revid)
1419
self._history.append(rev)
1420
return rev
1421
1422
repo = self.remote_branch.repository
1423
1424
revhistory = self.remote_branch.revision_history()
1425
try:
1426
revs = repo.get_revisions(revhistory)
1427
cache = HistoryCache(revs)
1428
except bzrerrors.InvalidHttpResponse:
1429
# Fallback to dummy algorithm, because of LP: #115209
1430
cache = HistoryCache([])
1431
1432
for item in dirs:
1433
if item.parent_id == self.remote_parent:
1434
rev = cache._lookup_revision(item.revision)
1435
liststore.append([ gtk.STOCK_DIRECTORY,
1436
True,
1437
item.name,
1438
'',
1439
'',
1440
"<DIR>",
1441
"<DIR>",
1442
rev.timestamp,
1443
self._format_date(rev.timestamp),
1444
''
1445
])
1446
while gtk.events_pending():
1447
gtk.main_iteration()
1448
1449
for item in files:
1450
if item.parent_id == self.remote_parent:
1451
rev = cache._lookup_revision(item.revision)
1452
liststore.append([ gtk.STOCK_FILE,
1453
False,
1454
item.name,
1455
'',
1456
'',
1457
str(item.text_size),
1458
self._format_size(item.text_size),
1459
rev.timestamp,
1460
self._format_date(rev.timestamp),
1461
item.file_id
1462
])
1463
while gtk.events_pending():
1464
gtk.main_iteration()
1465
1466
self.image_location_error.destroy()
1467
1468
# Columns should auto-size
1469
self.treeview_right.columns_autosize()
842
for rpath, rpathnew, id, kind, text_modified, meta_modified in delta.renamed:
843
if rpathnew == filename:
844
status = 'renamed'
845
for rpath, id, kind in delta.added:
846
if rpath == filename:
847
status = 'added'
848
for rpath, id, kind in delta.removed:
849
if rpath == filename:
850
status = 'removed'
851
for rpath, id, kind, text_modified, meta_modified in delta.modified:
852
if rpath == filename:
853
status = 'modified'
854
for rpath, id, kind in delta.unchanged:
855
if rpath == filename:
856
status = 'unchanged'
857
for rpath, file_class, kind, id, entry in self.wt.list_files():
858
if rpath == filename and file_class == 'I':
859
status = 'ignored'
860
finally:
861
self.wt.unlock()
862
863
#try:
864
# status = fileops.status(path + os.sep + item)
865
#except errors.PermissionDenied:
866
# continue
867
868
if status == 'renamed':
869
st = _('renamed')
870
elif status == 'removed':
871
st = _('removed')
872
elif status == 'added':
873
st = _('added')
874
elif status == 'modified':
875
st = _('modified')
876
elif status == 'unchanged':
877
st = _('unchanged')
878
elif status == 'ignored':
879
st = _('ignored')
880
else:
881
st = _('unknown')
882
liststore.append([gtk.STOCK_FILE, item, st])
883
884
# Add the ListStore to the TreeView
885
self.treeview_right.set_model(liststore)
1470
886
1471
887
# Set sensitivity
1472
888
self.set_sensitivity()
1517
933
changes = True
1518
934
1519
935
return changes
1520
1521
def _sort_filelist_callback(self, model, iter1, iter2, data):
1522
""" The sort callback for the file list, return values:
1523
-1: iter1 < iter2
1524
0: iter1 = iter2
1525
1: iter1 > iter2
1526
"""
1527
name1 = model.get_value(iter1, 2)
1528
name2 = model.get_value(iter2, 2)
1529
1530
if model.get_value(iter1, 1):
1531
# item1 is a directory
1532
if not model.get_value(iter2, 1):
1533
# item2 isn't
1534
return -1
1535
else:
1536
# both of them are directories, we compare their names
1537
if name1 < name2:
1538
return -1
1539
elif name1 == name2:
1540
return 0
1541
else:
1542
return 1
1543
else:
1544
# item1 is not a directory
1545
if model.get_value(iter2, 1):
1546
# item2 is
1547
return 1
1548
else:
1549
# both of them are files, compare them
1550
if name1 < name2:
1551
return -1
1552
elif name1 == name2:
1553
return 0
1554
else:
1555
return 1
1556
1557
def _format_size(self, size):
1558
""" Format size to a human readable format. """
1559
if size < 1000:
1560
return "%d[B]" % (size,)
1561
size = size / 1000.0
1562
1563
for metric in ["kB","MB","GB","TB"]:
1564
if size < 1000:
1565
break
1566
size = size / 1000.0
1567
return "%.1f[%s]" % (size,metric)
1568
1569
def _format_date(self, timestamp):
1570
""" Format the time (given in secs) to a human readable format. """
1571
return time.ctime(timestamp)
1572
1573
def _is_remote_dir(self, location):
1574
""" Determine whether the given location is a directory or not. """
1575
if not self.remote:
1576
# We're in local mode
1577
return False
1578
else:
1579
branch, path = Branch.open_containing(location)
1580
for (name, type) in self.remote_entries:
1581
if name == path and type.kind == 'directory':
1582
# We got it
1583
return True
1584
# Either it's not a directory or not in the inventory
1585
return False
1586
1587
def _show_stock_image(self, stock_id):
1588
""" Show a stock image next to the location entry. """
1589
self.image_location_error.destroy()
1590
self.image_location_error = gtk.image_new_from_stock(stock_id, gtk.ICON_SIZE_BUTTON)
1591
self.hbox_location.pack_start(self.image_location_error, False, False, 0)
1592
if sys.platform == 'win32':
1593
self.hbox_location.reorder_child(self.image_location_error, 2)
1594
else:
1595
self.hbox_location.reorder_child(self.image_location_error, 1)
1596
self.image_location_error.show()
1597
while gtk.events_pending():
1598
gtk.main_iteration()
1599
936
1600
937
import ConfigParser
1601
938
1606
943
# Some default options
1607
944
self.defaults = { 'strict_commit' : False,
1608
945
'dotted_files' : False,
1609
'ignored_files' : True,
1610
946
'window_width' : 700,
1611
947
'window_height' : 400,
1612
948
'window_x' : 40,
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0