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 126.1.21
- compare with another revision
- download diff
- download tarball
- view history from revision 126.1.21
- Committer: Szilveszter Farkas (Phanatic)
- Date: 2007-02-01 14:52:43 UTC
- mto: (157.1.2 trunk) (170.1.3 trunk)
- mto: This revision was merged to the branch mainline in revision 141.
- Revision ID: szilveszter.farkas@gmail.com-20070201145243-5a1k1yhh0b6gabyj
Remove trash from olive.glade. Some cleanups.
- files added:
- po/hu.po
- files removed:
- HACKING
- branchview
- preferences
- tests
- files renamed:
- revisionview.py => annotate/logview.py
- branch.py => olive/branch.py
- checkout.py => olive/checkout.py
- commit.py => olive/commit.py
- dialog.py => olive/dialog.py
- errors.py => olive/errors.py
- merge.py => olive/merge.py
- push.py => olive/push.py
- revbrowser.py => olive/revbrowser.py
- status.py => olive/status.py
- ui.py => olive/ui.py
- icons/oliveicon2.png => oliveicon2.png
- diff.py => viz/diffwin.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
37
33
38
34
from bzrlib.branch import Branch
39
35
import bzrlib.errors as bzrerrors
40
from bzrlib.lazy_import import lazy_import
41
from bzrlib.ui import ui_factory
42
36
from bzrlib.workingtree import WorkingTree
43
37
44
from bzrlib.plugins.gtk import _i18n
45
from bzrlib.plugins.gtk.dialog import error_dialog, info_dialog, warning_dialog
46
from bzrlib.plugins.gtk.errors import show_bzr_error
38
from dialog import error_dialog, info_dialog, warning_dialog
39
from errors import show_bzr_error
47
40
from guifiles import GLADEFILENAME
48
41
49
from bzrlib.plugins.gtk.diff import DiffWindow
50
lazy_import(globals(), """
51
from bzrlib.plugins.gtk.viz import branchwin
52
""")
53
from bzrlib.plugins.gtk.annotate.gannotate import GAnnotateWindow
54
from bzrlib.plugins.gtk.annotate.config import GAnnotateConfig
55
from bzrlib.plugins.gtk.commit import CommitDialog
56
from bzrlib.plugins.gtk.conflicts import ConflictsDialog
57
from bzrlib.plugins.gtk.initialize import InitDialog
58
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()
42
# import this classes only once
43
try:
44
from bzrlib.plugins.gtk.viz.diffwin import DiffWindow
45
from bzrlib.plugins.gtk.viz.branchwin import BranchWindow
46
from bzrlib.plugins.gtk.annotate.gannotate import GAnnotateWindow
47
from bzrlib.plugins.gtk.annotate.config import GAnnotateConfig
48
except ImportError:
49
# olive+bzr-gtk not installed. try to import from sources
50
path = os.path.dirname(os.path.dirname(__file__))
51
if path not in sys.path:
52
sys.path.append(path)
53
from viz.diffwin import DiffWindow
54
from viz.branchwin import BranchWindow
55
from annotate.gannotate import GAnnotateWindow
56
from annotate.config import GAnnotateConfig
57
58
# History delimiter used in config files
59
delimiter = ' '
84
60
85
61
class OliveGtk:
86
62
""" The main Olive GTK frontend class. This is called when launching the
88
64
89
65
def __init__(self):
90
66
self.toplevel = gtk.glade.XML(GLADEFILENAME, 'window_main', 'olive-gtk')
67
91
68
self.window = self.toplevel.get_widget('window_main')
92
self.pref = Preferences()
69
70
self.pref = OlivePreferences()
71
93
72
self.path = None
94
73
95
74
# Initialize the statusbar
106
85
# Get some important menu items
107
86
self.menuitem_add_files = self.toplevel.get_widget('menuitem_add_files')
108
87
self.menuitem_remove_files = self.toplevel.get_widget('menuitem_remove_file')
109
self.menuitem_file_bookmark = self.toplevel.get_widget('menuitem_file_bookmark')
110
88
self.menuitem_file_make_directory = self.toplevel.get_widget('menuitem_file_make_directory')
111
89
self.menuitem_file_rename = self.toplevel.get_widget('menuitem_file_rename')
112
90
self.menuitem_file_move = self.toplevel.get_widget('menuitem_file_move')
113
91
self.menuitem_file_annotate = self.toplevel.get_widget('menuitem_file_annotate')
114
92
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
93
self.menuitem_branch = self.toplevel.get_widget('menuitem_branch')
117
94
self.menuitem_branch_init = self.toplevel.get_widget('menuitem_branch_initialize')
118
95
self.menuitem_branch_get = self.toplevel.get_widget('menuitem_branch_get')
119
96
self.menuitem_branch_checkout = self.toplevel.get_widget('menuitem_branch_checkout')
120
97
self.menuitem_branch_pull = self.toplevel.get_widget('menuitem_branch_pull')
121
98
self.menuitem_branch_push = self.toplevel.get_widget('menuitem_branch_push')
122
self.menuitem_branch_update = self.toplevel.get_widget('menuitem_branch_update')
123
99
self.menuitem_branch_revert = self.toplevel.get_widget('menuitem_branch_revert')
124
100
self.menuitem_branch_merge = self.toplevel.get_widget('menuitem_branch_merge')
125
101
self.menuitem_branch_commit = self.toplevel.get_widget('menuitem_branch_commit')
126
self.menuitem_branch_tags = self.toplevel.get_widget('menuitem_branch_tags')
127
102
self.menuitem_branch_status = self.toplevel.get_widget('menuitem_branch_status')
128
103
self.menuitem_branch_missing = self.toplevel.get_widget('menuitem_branch_missing_revisions')
129
self.menuitem_branch_conflicts = self.toplevel.get_widget('menuitem_branch_conflicts')
130
104
self.menuitem_stats = self.toplevel.get_widget('menuitem_stats')
131
105
self.menuitem_stats_diff = self.toplevel.get_widget('menuitem_stats_diff')
132
106
self.menuitem_stats_log = self.toplevel.get_widget('menuitem_stats_log')
137
111
self.toolbutton_commit = self.toplevel.get_widget('toolbutton_commit')
138
112
self.toolbutton_pull = self.toplevel.get_widget('toolbutton_pull')
139
113
self.toolbutton_push = self.toplevel.get_widget('toolbutton_push')
140
self.toolbutton_update = self.toplevel.get_widget('toolbutton_update')
141
114
# Get the drive selector
142
115
self.combobox_drive = gtk.combo_box_new_text()
143
116
self.combobox_drive.connect("changed", self._refresh_drives)
144
117
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
118
self.vbox_main_right = self.toplevel.get_widget('vbox_main_right')
119
158
120
159
121
# Dictionary for signal_autoconnect
160
122
dic = { "on_window_main_destroy": gtk.main_quit,
163
125
"on_about_activate": self.on_about_activate,
164
126
"on_menuitem_add_files_activate": self.on_menuitem_add_files_activate,
165
127
"on_menuitem_remove_file_activate": self.on_menuitem_remove_file_activate,
166
"on_menuitem_file_bookmark_activate": self.on_menuitem_file_bookmark_activate,
167
128
"on_menuitem_file_make_directory_activate": self.on_menuitem_file_make_directory_activate,
168
129
"on_menuitem_file_move_activate": self.on_menuitem_file_move_activate,
169
130
"on_menuitem_file_rename_activate": self.on_menuitem_file_rename_activate,
170
131
"on_menuitem_file_annotate_activate": self.on_menuitem_file_annotate_activate,
171
132
"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
133
"on_menuitem_view_refresh_activate": self.on_menuitem_view_refresh_activate,
174
134
"on_menuitem_branch_initialize_activate": self.on_menuitem_branch_initialize_activate,
175
135
"on_menuitem_branch_get_activate": self.on_menuitem_branch_get_activate,
179
139
"on_menuitem_branch_commit_activate": self.on_menuitem_branch_commit_activate,
180
140
"on_menuitem_branch_push_activate": self.on_menuitem_branch_push_activate,
181
141
"on_menuitem_branch_pull_activate": self.on_menuitem_branch_pull_activate,
182
"on_menuitem_branch_update_activate": self.on_menuitem_branch_update_activate,
183
"on_menuitem_branch_tags_activate": self.on_menuitem_branch_tags_activate,
184
142
"on_menuitem_branch_status_activate": self.on_menuitem_branch_status_activate,
185
143
"on_menuitem_branch_missing_revisions_activate": self.on_menuitem_branch_missing_revisions_activate,
186
"on_menuitem_branch_conflicts_activate": self.on_menuitem_branch_conflicts_activate,
187
144
"on_menuitem_stats_diff_activate": self.on_menuitem_stats_diff_activate,
188
145
"on_menuitem_stats_log_activate": self.on_menuitem_stats_log_activate,
189
146
"on_menuitem_stats_infos_activate": self.on_menuitem_stats_infos_activate,
194
151
"on_toolbutton_commit_clicked": self.on_menuitem_branch_commit_activate,
195
152
"on_toolbutton_pull_clicked": self.on_menuitem_branch_pull_activate,
196
153
"on_toolbutton_push_clicked": self.on_menuitem_branch_push_activate,
197
"on_toolbutton_update_clicked": self.on_menuitem_branch_update_activate,
198
154
"on_treeview_right_button_press_event": self.on_treeview_right_button_press_event,
199
155
"on_treeview_right_row_activated": self.on_treeview_right_row_activated,
200
156
"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
}
157
"on_treeview_left_row_activated": self.on_treeview_left_row_activated }
210
158
211
159
# Connect the signals to the handlers
212
160
self.toplevel.signal_autoconnect(dic)
233
181
234
182
# Show drive selector if under Win32
235
183
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)
184
self.vbox_main_right.pack_start(self.combobox_drive, False, True, 0)
185
self.vbox_main_right.reorder_child(self.combobox_drive, 0)
238
186
self.combobox_drive.show()
239
187
self.gen_hard_selector()
240
188
242
190
243
191
# Apply menu state
244
192
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
193
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
194
self.set_path(os.getcwd())
254
195
self._load_right()
255
196
256
197
self._just_started = False
257
198
258
def set_path(self, path, force_remote=False):
199
def set_path(self, path):
200
self.path = path
259
201
self.notbranch = False
260
202
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)
203
try:
204
self.wt, self.wtpath = WorkingTree.open_containing(self.path)
205
except (bzrerrors.NotBranchError, bzrerrors.NoWorkingTree):
206
self.notbranch = True
377
207
378
208
self.statusbar.push(self.context_id, path)
379
self.entry_location.set_text(path)
380
self.path = path
381
return True
382
209
383
210
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
211
return self.path
392
212
393
213
def on_about_activate(self, widget):
214
from dialog import about
394
215
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
216
468
217
def on_menuitem_add_files_activate(self, widget):
469
218
""" Add file(s)... menu handler. """
470
219
from add import OliveAdd
473
222
474
223
def on_menuitem_branch_get_activate(self, widget):
475
224
""" Branch/Get... menu handler. """
476
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)
225
from branch import BranchDialog
226
branch = BranchDialog(self.get_path(), self.window)
482
227
response = branch.run()
483
228
if response != gtk.RESPONSE_NONE:
484
229
branch.hide()
485
230
486
231
if response == gtk.RESPONSE_OK:
487
232
self.refresh_right()
488
233
490
235
491
236
def on_menuitem_branch_checkout_activate(self, widget):
492
237
""" Branch/Checkout... menu handler. """
493
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)
238
from checkout import CheckoutDialog
239
checkout = CheckoutDialog(self.get_path(), self.window)
499
240
response = checkout.run()
500
241
if response != gtk.RESPONSE_NONE:
501
242
checkout.hide()
505
246
506
247
checkout.destroy()
507
248
508
@show_bzr_error
509
249
def on_menuitem_branch_commit_activate(self, widget):
510
250
""" 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
)
251
from commit import CommitDialog
252
commit = CommitDialog(self.wt, self.wtpath, self.notbranch, self.get_selected_right(), self.window)
519
253
response = commit.run()
520
254
if response != gtk.RESPONSE_NONE:
521
255
commit.hide()
525
259
526
260
commit.destroy()
527
261
528
def on_menuitem_branch_conflicts_activate(self, widget):
529
""" Branch/Conflicts... menu handler. """
530
conflicts = ConflictsDialog(self.wt, self.window)
531
response = conflicts.run()
532
if response != gtk.RESPONSE_NONE:
533
conflicts.destroy()
534
535
262
def on_menuitem_branch_merge_activate(self, widget):
536
263
""" Branch/Merge... menu handler. """
537
from bzrlib.plugins.gtk.merge import MergeDialog
264
from merge import MergeDialog
538
265
539
266
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.'))
267
error_dialog(_('There are local changes in the branch'),
268
_('Please commit or revert the changes before merging.'))
542
269
else:
543
parent_branch_path = self.wt.branch.get_parent()
544
merge = MergeDialog(self.wt, self.wtpath,default_branch_path=parent_branch_path )
270
merge = MergeDialog(self.wt, self.wtpath)
545
271
merge.display()
546
272
547
@show_bzr_error
548
273
def on_menuitem_branch_missing_revisions_activate(self, widget):
549
274
""" Branch/Missing revisions menu handler. """
550
551
from bzrlib.missing import find_unmerged, iter_log_revisions
552
553
275
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.'))
276
277
other_branch = local_branch.get_parent()
278
if other_branch is None:
279
error_dialog(_('Parent location is unknown'),
280
_('Cannot determine missing revisions if no parent location is known.'))
558
281
return
559
282
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)
283
remote_branch = Branch.open(other_branch)
284
285
if remote_branch.base == local_branch.base:
286
remote_branch = local_branch
287
288
ret = len(local_branch.missing_revisions(remote_branch))
289
290
if ret > 0:
291
info_dialog(_('There are missing revisions'),
292
_('%d revision(s) missing.') % ret)
602
293
else:
603
info_dialog(_i18n('Local branch up to date'),
604
_i18n('There are no missing revisions.'))
294
info_dialog(_('Local branch up to date'),
295
_('There are no missing revisions.'))
605
296
606
297
@show_bzr_error
607
298
def on_menuitem_branch_pull_activate(self, widget):
610
301
611
302
location = branch_to.get_parent()
612
303
if location is None:
613
error_dialog(_i18n('Parent location is unknown'),
614
_i18n('Pulling is not possible until there is a parent location.'))
304
error_dialog(_('Parent location is unknown'),
305
_('Pulling is not possible until there is a parent location.'))
615
306
return
616
307
617
308
branch_from = Branch.open(location)
619
310
if branch_to.get_parent() is None:
620
311
branch_to.set_parent(branch_from.base)
621
312
313
#old_rh = branch_to.revision_history()
314
#if tree_to is not None:
315
# tree_to.pull(branch_from)
316
#else:
317
# branch_to.pull(branch_from)
622
318
ret = branch_to.pull(branch_from)
623
319
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.') )
320
info_dialog(_('Pull successful'), _('%d revision(s) pulled.') % ret)
636
321
637
322
def on_menuitem_branch_push_activate(self, widget):
638
323
""" Branch/Push... menu handler. """
639
push = PushDialog(repository=None,revid=None,branch=self.wt.branch, parent=self.window)
324
from push import PushDialog
325
push = PushDialog(self.wt.branch, self.window)
640
326
response = push.run()
641
327
if response != gtk.RESPONSE_NONE:
642
328
push.destroy()
646
332
""" Branch/Revert all changes menu handler. """
647
333
ret = self.wt.revert([])
648
334
if ret:
649
warning_dialog(_i18n('Conflicts detected'),
650
_i18n('Please have a look at the working tree before continuing.'))
335
warning_dialog(_('Conflicts detected'),
336
_('Please have a look at the working tree before continuing.'))
651
337
else:
652
info_dialog(_i18n('Revert successful'),
653
_i18n('All files reverted to last revision.'))
338
info_dialog(_('Revert successful'),
339
_('All files reverted to last revision.'))
654
340
self.refresh_right()
655
341
656
342
def on_menuitem_branch_status_activate(self, widget):
657
343
""" Branch/Status... menu handler. """
658
from bzrlib.plugins.gtk.status import StatusDialog
659
status = StatusDialog(self.wt, self.wtpath)
660
response = status.run()
661
if response != gtk.RESPONSE_NONE:
662
status.destroy()
344
from status import OliveStatus
345
status = OliveStatus(self.wt, self.wtpath)
346
status.display()
663
347
348
@show_bzr_error
664
349
def on_menuitem_branch_initialize_activate(self, widget):
665
350
""" Initialize current directory. """
666
init = InitDialog(self.path, self.window)
667
response = init.run()
668
if response != gtk.RESPONSE_NONE:
669
init.hide()
670
671
if response == gtk.RESPONSE_OK:
672
self.refresh_right()
673
674
init.destroy()
675
676
def on_menuitem_branch_tags_activate(self, widget):
677
""" Branch/Tags... menu handler. """
678
from bzrlib.plugins.gtk.tags import TagsWindow
679
if not self.remote:
680
window = TagsWindow(self.wt.branch, self.window)
351
import bzrlib.bzrdir as bzrdir
352
353
if not os.path.exists(self.path):
354
os.mkdir(self.path)
355
356
try:
357
existing_bzrdir = bzrdir.BzrDir.open(self.path)
358
except bzrerrors.NotBranchError:
359
bzrdir.BzrDir.create_branch_convenience(self.path)
681
360
else:
682
window = TagsWindow(self.remote_branch, self.window)
683
window.show()
684
361
if existing_bzrdir.has_branch():
362
if existing_bzrdir.has_workingtree():
363
raise bzrerrors.AlreadyBranchError(self.path)
364
else:
365
raise bzrerrors.BranchExistsWithoutWorkingTree(self.path)
366
else:
367
existing_bzrdir.create_branch()
368
existing_bzrdir.create_workingtree()
369
info_dialog(_('Initialize successful'),
370
_('Directory successfully initialized.'))
371
self.refresh_right()
372
685
373
def on_menuitem_file_annotate_activate(self, widget):
686
374
""" File/Annotate... menu handler. """
687
375
if self.get_selected_right() is None:
688
error_dialog(_i18n('No file was selected'),
689
_i18n('Please select a file from the list.'))
376
error_dialog(_('No file was selected'),
377
_('Please select a file from the list.'))
690
378
return
691
379
692
380
branch = self.wt.branch
693
381
file_id = self.wt.path2id(self.wt.relpath(os.path.join(self.path, self.get_selected_right())))
694
382
695
window = GAnnotateWindow(all=False, plain=False, parent=self.window)
383
window = GAnnotateWindow(all=False, plain=False)
696
384
window.set_title(os.path.join(self.path, self.get_selected_right()) + " - Annotate")
697
385
config = GAnnotateConfig(window)
698
386
window.show()
702
390
finally:
703
391
branch.unlock()
704
392
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
393
def on_menuitem_file_make_directory_activate(self, widget):
718
394
""" File/Make directory... menu handler. """
719
395
from mkdir import OliveMkdir
751
427
752
428
def on_menuitem_stats_diff_activate(self, widget):
753
429
""" Statistics/Differences... menu handler. """
754
window = DiffWindow(parent=self.window)
430
window = DiffWindow()
755
431
parent_tree = self.wt.branch.repository.revision_tree(self.wt.branch.last_revision())
756
432
window.set_diff(self.wt.branch.nick, self.wt, parent_tree)
757
433
window.show()
759
435
def on_menuitem_stats_infos_activate(self, widget):
760
436
""" Statistics/Informations... menu handler. """
761
437
from info import OliveInfo
762
if self.remote:
763
info = OliveInfo(self.remote_branch)
764
else:
765
info = OliveInfo(self.wt.branch)
438
info = OliveInfo(self.wt)
766
439
info.display()
767
440
768
441
def on_menuitem_stats_log_activate(self, widget):
769
442
""" 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)
443
window = BranchWindow()
444
window.set_branch(self.wt.branch, self.wt.branch.last_revision(), None)
777
445
window.show()
778
446
779
447
def on_menuitem_view_refresh_activate(self, widget):
789
457
if self.path is not None:
790
458
self.refresh_right()
791
459
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
460
def on_treeview_left_button_press_event(self, widget, event):
799
461
""" Occurs when somebody right-clicks in the bookmark list. """
800
462
if event.button == 3:
811
473
menu.left_context_menu().popup(None, None, None, 0,
812
474
event.time)
813
475
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
476
def on_treeview_left_row_activated(self, treeview, path, view_column):
829
477
""" Occurs when somebody double-clicks or enters an item in the
830
478
bookmark list. """
833
481
if newdir == None:
834
482
return
835
483
836
if self.set_path(newdir):
837
self.refresh_right()
484
self.set_path(newdir)
485
self.refresh_right()
838
486
839
487
def on_treeview_right_button_press_event(self, widget, event):
840
488
""" Occurs when somebody right-clicks in the file list. """
845
493
selected=self.get_selected_right(),
846
494
app=self)
847
495
# get the menu items
848
m_open = menu.ui.get_widget('/context_right/open')
849
496
m_add = menu.ui.get_widget('/context_right/add')
850
497
m_remove = menu.ui.get_widget('/context_right/remove')
851
498
m_rename = menu.ui.get_widget('/context_right/rename')
852
499
m_revert = menu.ui.get_widget('/context_right/revert')
853
500
m_commit = menu.ui.get_widget('/context_right/commit')
854
m_annotate = menu.ui.get_widget('/context_right/annotate')
855
501
m_diff = menu.ui.get_widget('/context_right/diff')
856
502
# check if we're in a branch
857
503
try:
858
504
from bzrlib.branch import Branch
859
505
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)
506
m_add.set_sensitive(True)
507
m_remove.set_sensitive(True)
508
m_rename.set_sensitive(True)
509
m_revert.set_sensitive(True)
510
m_commit.set_sensitive(True)
511
m_diff.set_sensitive(True)
878
512
except bzrerrors.NotBranchError:
879
m_open.set_sensitive(True)
880
513
m_add.set_sensitive(False)
881
514
m_remove.set_sensitive(False)
882
515
m_rename.set_sensitive(False)
883
516
m_revert.set_sensitive(False)
884
517
m_commit.set_sensitive(False)
885
m_annotate.set_sensitive(False)
886
518
m_diff.set_sensitive(False)
887
519
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)
520
menu.right_context_menu().popup(None, None, None, 0,
521
event.time)
894
522
895
523
def on_treeview_right_row_activated(self, treeview, path, view_column):
896
524
""" Occurs when somebody double-clicks or enters an item in the
899
527
900
528
newdir = self.get_selected_right()
901
529
902
if not self.remote:
903
# We're local
904
if newdir == '..':
905
self.set_path(os.path.split(self.get_path())[0])
530
if newdir == '..':
531
self.set_path(os.path.split(self.get_path())[0])
532
else:
533
fullpath = os.path.join(self.get_path(), newdir)
534
if os.path.isdir(fullpath):
535
# selected item is an existant directory
536
self.set_path(fullpath)
906
537
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)
538
launch(fullpath)
917
539
918
540
self.refresh_right()
919
541
940
562
bookmarks = self.pref.get_bookmarks()
941
563
942
564
# Add them to the TreeStore
943
titer = treestore.append(None, [_i18n('Bookmarks'), None])
565
titer = treestore.append(None, [_('Bookmarks'), None])
944
566
for item in bookmarks:
945
567
title = self.pref.get_bookmark_title(item)
946
568
treestore.append(titer, [title, item])
947
569
948
570
# Create the column and add it to the TreeView
949
571
self.treeview_left.set_model(treestore)
950
tvcolumn_bookmark = gtk.TreeViewColumn(_i18n('Bookmark'))
572
tvcolumn_bookmark = gtk.TreeViewColumn(_('Bookmark'))
951
573
self.treeview_left.append_column(tvcolumn_bookmark)
952
574
953
575
# Set up the cells
958
580
# Expand the tree
959
581
self.treeview_left.expand_all()
960
582
583
def _add_updir_to_dirlist(self, dirlist, curdir):
584
"""Add .. to the top of directories list if we not in root directory
585
586
:param dirlist: list of directories (modified in place)
587
:param curdir: current directory
588
:return: nothing
589
"""
590
if curdir is None:
591
curdir = self.path
592
593
if sys.platform == 'win32':
594
drive, tail = os.path.splitdrive(curdir)
595
if tail in ('', '/', '\\'):
596
return
597
else:
598
if curdir == '/':
599
return
600
601
# insert always as first element
602
dirlist.insert(0, '..')
603
961
604
def _load_right(self):
962
605
""" Load data into the right panel. (Filelist) """
963
606
# 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)
607
liststore = gtk.ListStore(str, str, str)
975
608
976
609
dirs = []
977
610
files = []
985
618
dirs.append(item)
986
619
else:
987
620
files.append(item)
621
622
# Sort'em
623
dirs.sort()
624
files.sort()
625
626
# add updir link to dirs
627
self._add_updir_to_dirlist(dirs, self.path)
988
628
989
629
if not self.notbranch:
990
630
branch = self.wt.branch
993
633
delta = self.wt.changes_from(tree2, want_unchanged=True)
994
634
995
635
# 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
''])
636
for item in dirs:
637
liststore.append([gtk.STOCK_DIRECTORY, item, ''])
1014
638
for item in files:
1015
639
status = 'unknown'
1016
fileid = ''
1017
640
if not self.notbranch:
1018
641
filename = self.wt.relpath(self.path + os.sep + item)
1019
642
1020
try:
1021
self.wt.lock_read()
1022
1023
for rpath, rpathnew, id, kind, text_modified, meta_modified in delta.renamed:
1024
if rpathnew == filename:
1025
status = 'renamed'
1026
fileid = id
1027
for rpath, id, kind in delta.added:
1028
if rpath == filename:
1029
status = 'added'
1030
fileid = id
1031
for rpath, id, kind in delta.removed:
1032
if rpath == filename:
1033
status = 'removed'
1034
fileid = id
1035
for rpath, id, kind, text_modified, meta_modified in delta.modified:
1036
if rpath == filename:
1037
status = 'modified'
1038
fileid = id
1039
for rpath, id, kind in delta.unchanged:
1040
if rpath == filename:
1041
status = 'unchanged'
1042
fileid = id
1043
for rpath, file_class, kind, id, entry in self.wt.list_files():
1044
if rpath == filename and file_class == 'I':
1045
status = 'ignored'
1046
finally:
1047
self.wt.unlock()
643
for rpath, rpathnew, id, kind, text_modified, meta_modified in delta.renamed:
644
if rpathnew == filename:
645
status = 'renamed'
646
for rpath, id, kind in delta.added:
647
if rpath == filename:
648
status = 'added'
649
for rpath, id, kind in delta.removed:
650
if rpath == filename:
651
status = 'removed'
652
for rpath, id, kind, text_modified, meta_modified in delta.modified:
653
if rpath == filename:
654
status = 'modified'
655
for rpath, id, kind in delta.unchanged:
656
if rpath == filename:
657
status = 'unchanged'
658
for rpath, file_class, kind, id, entry in self.wt.list_files():
659
if rpath == filename and file_class == 'I':
660
status = 'ignored'
661
662
#try:
663
# status = fileops.status(path + os.sep + item)
664
#except errors.PermissionDenied:
665
# continue
1048
666
1049
667
if status == 'renamed':
1050
st = _i18n('renamed')
668
st = _('renamed')
1051
669
elif status == 'removed':
1052
st = _i18n('removed')
670
st = _('removed')
1053
671
elif status == 'added':
1054
st = _i18n('added')
672
st = _('added')
1055
673
elif status == 'modified':
1056
st = _i18n('modified')
674
st = _('modified')
1057
675
elif status == 'unchanged':
1058
st = _i18n('unchanged')
676
st = _('unchanged')
1059
677
elif status == 'ignored':
1060
st = _i18n('ignored')
678
st = _('ignored')
1061
679
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])
680
st = _('unknown')
681
liststore.append([gtk.STOCK_FILE, item, st])
1081
682
1082
683
# Create the columns and add them to the TreeView
1083
684
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)
685
tvcolumn_filename = gtk.TreeViewColumn(_('Filename'))
686
tvcolumn_status = gtk.TreeViewColumn(_('Status'))
687
self.treeview_right.append_column(tvcolumn_filename)
688
self.treeview_right.append_column(tvcolumn_status)
1092
689
1093
690
# Set up the cells
1094
691
cellpb = gtk.CellRendererPixbuf()
1095
692
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)
693
tvcolumn_filename.pack_start(cellpb, False)
694
tvcolumn_filename.pack_start(cell, True)
695
tvcolumn_filename.set_attributes(cellpb, stock_id=0)
696
tvcolumn_filename.add_attribute(cell, 'text', 1)
697
tvcolumn_status.pack_start(cell, True)
698
tvcolumn_status.add_attribute(cell, 'text', 2)
1122
699
1123
700
# Set sensitivity
1124
701
self.set_sensitivity()
1125
702
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
703
def get_selected_right(self):
1137
704
""" Get the selected filename. """
1138
705
treeselection = self.treeview_right.get_selection()
1141
708
if iter is None:
1142
709
return None
1143
710
else:
1144
return model.get_value(iter, 2)
711
return model.get_value(iter, 1)
1145
712
1146
713
def get_selected_left(self):
1147
714
""" Get the selected bookmark. """
1163
730
1164
731
def set_sensitivity(self):
1165
732
""" 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)
733
self.menuitem_branch_init.set_sensitive(self.notbranch)
734
self.menuitem_branch_get.set_sensitive(self.notbranch)
735
self.menuitem_branch_checkout.set_sensitive(self.notbranch)
736
self.menuitem_branch_pull.set_sensitive(not self.notbranch)
737
self.menuitem_branch_push.set_sensitive(not self.notbranch)
738
self.menuitem_branch_revert.set_sensitive(not self.notbranch)
739
self.menuitem_branch_merge.set_sensitive(not self.notbranch)
740
self.menuitem_branch_commit.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_stats.set_sensitive(not self.notbranch)
744
self.menuitem_add_files.set_sensitive(not self.notbranch)
745
self.menuitem_remove_files.set_sensitive(not self.notbranch)
746
self.menuitem_file_make_directory.set_sensitive(not self.notbranch)
747
self.menuitem_file_rename.set_sensitive(not self.notbranch)
748
self.menuitem_file_move.set_sensitive(not self.notbranch)
749
self.menuitem_file_annotate.set_sensitive(not self.notbranch)
750
#self.menutoolbutton_diff.set_sensitive(True)
751
self.toolbutton_diff.set_sensitive(not self.notbranch)
752
self.toolbutton_log.set_sensitive(not self.notbranch)
753
self.toolbutton_commit.set_sensitive(not self.notbranch)
754
self.toolbutton_pull.set_sensitive(not self.notbranch)
755
self.toolbutton_push.set_sensitive(not self.notbranch)
1226
756
1227
757
def refresh_left(self):
1228
758
""" Refresh the bookmark list. """
1238
768
bookmarks = self.pref.get_bookmarks()
1239
769
1240
770
# Add them to the TreeStore
1241
titer = treestore.append(None, [_i18n('Bookmarks'), None])
771
titer = treestore.append(None, [_('Bookmarks'), None])
1242
772
for item in bookmarks:
1243
773
title = self.pref.get_bookmark_title(item)
1244
774
treestore.append(titer, [title, item])
1251
781
1252
782
def refresh_right(self, path=None):
1253
783
""" 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
784
from bzrlib.workingtree import WorkingTree
785
786
if path is None:
787
path = self.get_path()
788
789
# A workaround for double-clicking Bookmarks
790
if not os.path.exists(path):
791
return
792
793
# Get ListStore and clear it
794
liststore = self.treeview_right.get_model()
795
liststore.clear()
796
797
dirs = []
798
files = []
799
800
# Fill the appropriate lists
801
dotted_files = self.pref.get_preference('dotted_files', 'bool')
802
for item in os.listdir(path):
803
if not dotted_files and item[0] == '.':
804
continue
805
if os.path.isdir(path + os.sep + item):
806
dirs.append(item)
807
else:
808
files.append(item)
809
810
# Sort'em
811
dirs.sort()
812
files.sort()
813
814
# add updir link to dirs
815
self._add_updir_to_dirlist(dirs, path)
816
817
# Try to open the working tree
818
notbranch = False
819
try:
820
tree1 = WorkingTree.open_containing(path)[0]
821
except (bzrerrors.NotBranchError, bzrerrors.NoWorkingTree):
822
notbranch = True
823
824
if not notbranch:
825
branch = tree1.branch
826
tree2 = tree1.branch.repository.revision_tree(branch.last_revision())
827
828
delta = tree1.changes_from(tree2, want_unchanged=True)
829
830
# Add'em to the ListStore
831
for item in dirs:
832
liststore.append([gtk.STOCK_DIRECTORY, item, ''])
833
for item in files:
834
status = 'unknown'
1294
835
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)
1299
1300
# Add'em to the ListStore
1301
for item in dirs:
1302
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)
1324
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()
836
filename = tree1.relpath(path + os.sep + item)
837
838
for rpath, rpathnew, id, kind, text_modified, meta_modified in delta.renamed:
839
if rpathnew == filename:
840
status = 'renamed'
841
for rpath, id, kind in delta.added:
842
if rpath == filename:
843
status = 'added'
844
for rpath, id, kind in delta.removed:
845
if rpath == filename:
846
status = 'removed'
847
for rpath, id, kind, text_modified, meta_modified in delta.modified:
848
if rpath == filename:
849
status = 'modified'
850
for rpath, id, kind in delta.unchanged:
851
if rpath == filename:
852
status = 'unchanged'
853
for rpath, file_class, kind, id, entry in self.wt.list_files():
854
if rpath == filename and file_class == 'I':
855
status = 'ignored'
856
857
#try:
858
# status = fileops.status(path + os.sep + item)
859
#except errors.PermissionDenied:
860
# continue
861
862
if status == 'renamed':
863
st = _('renamed')
864
elif status == 'removed':
865
st = _('removed')
866
elif status == 'added':
867
st = _('added')
868
elif status == 'modified':
869
st = _('modified')
870
elif status == 'unchanged':
871
st = _('unchanged')
872
elif status == 'ignored':
873
st = _('ignored')
874
else:
875
st = _('unknown')
876
liststore.append([gtk.STOCK_FILE, item, st])
877
878
# Add the ListStore to the TreeView
879
self.treeview_right.set_model(liststore)
1470
880
1471
881
# Set sensitivity
1472
882
self.set_sensitivity()
1517
927
changes = True
1518
928
1519
929
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
930
1600
931
import ConfigParser
1601
932
1602
class Preferences:
933
class OlivePreferences:
1603
934
""" A class which handles Olive's preferences. """
1604
def __init__(self, path=None):
935
def __init__(self):
1605
936
""" Initialize the Preferences class. """
1606
937
# Some default options
1607
938
self.defaults = { 'strict_commit' : False,
1608
939
'dotted_files' : False,
1609
'ignored_files' : True,
1610
940
'window_width' : 700,
1611
941
'window_height' : 400,
1612
942
'window_x' : 40,
1615
945
1616
946
# Create a config parser object
1617
947
self.config = ConfigParser.RawConfigParser()
1618
1619
# Set filename
1620
if path is None:
1621
if sys.platform == 'win32':
1622
# Windows - no dotted files
1623
self._filename = os.path.expanduser('~/olive.conf')
1624
else:
1625
self._filename = os.path.expanduser('~/.olive.conf')
1626
else:
1627
self._filename = path
1628
948
1629
949
# Load the configuration
1630
950
self.read()
1649
969
""" Just read the configuration. """
1650
970
# Re-initialize the config parser object to avoid some bugs
1651
971
self.config = ConfigParser.RawConfigParser()
1652
self.config.read([self._filename])
972
if sys.platform == 'win32':
973
# Windows - no dotted files
974
self.config.read([os.path.expanduser('~/olive.conf')])
975
else:
976
self.config.read([os.path.expanduser('~/.olive.conf')])
1653
977
1654
978
def write(self):
1655
979
""" Write the configuration to the appropriate files. """
1656
fp = open(self._filename, 'w')
1657
self.config.write(fp)
1658
fp.close()
980
if sys.platform == 'win32':
981
# Windows - no dotted files
982
fp = open(os.path.expanduser('~/olive.conf'), 'w')
983
self.config.write(fp)
984
fp.close()
985
else:
986
fp = open(os.path.expanduser('~/.olive.conf'), 'w')
987
self.config.write(fp)
988
fp.close()
1659
989
1660
990
def get_bookmarks(self):
1661
991
""" Return the list of bookmarks. """
1684
1014
1685
1015
def set_bookmark_title(self, path, title):
1686
1016
""" Set bookmark title. """
1687
# FIXME: What if path isn't listed yet?
1688
# FIXME: Canonicalize paths first?
1689
1017
self.config.set(path, 'title', title)
1690
1018
1691
1019
def remove_bookmark(self, path):
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0