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 93.1.14
- compare with another revision
- download diff
- download tarball
- view history from revision 93.1.14
- Committer: Alexander Belchenko
- Date: 2006-10-26 13:16:07 UTC
- mto: (91.1.8 trunk) (66.2.10 trunk)
- mto: This revision was merged to the branch mainline in revision 107.
- Revision ID: bialix@ukr.net-20061026131607-fa48887c5a4869a5
olive-gtk: use olive ui factory
- files added:
- Makefile
- 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
- merge.py => olive/merge.py
- push.py => olive/push.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
import bzrlib.errors as bzrerrors
40
from bzrlib.lazy_import import lazy_import
41
from bzrlib.ui import ui_factory
35
import bzrlib.errors as errors
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
# Olive GTK UI version
39
__version__ = '0.11.0'
40
41
from dialog import error_dialog, info_dialog
47
42
from guifiles import GLADEFILENAME
48
43
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()
44
# import this classes only once
45
try:
46
from bzrlib.plugins.gtk.viz.diffwin import DiffWindow
47
from bzrlib.plugins.gtk.viz.branchwin import BranchWindow
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
84
56
85
57
class OliveGtk:
86
58
""" The main Olive GTK frontend class. This is called when launching the
88
60
89
61
def __init__(self):
90
62
self.toplevel = gtk.glade.XML(GLADEFILENAME, 'window_main', 'olive-gtk')
63
91
64
self.window = self.toplevel.get_widget('window_main')
92
self.pref = Preferences()
65
66
self.pref = OlivePreferences()
67
93
68
self.path = None
94
69
95
70
# Initialize the statusbar
106
81
# Get some important menu items
107
82
self.menuitem_add_files = self.toplevel.get_widget('menuitem_add_files')
108
83
self.menuitem_remove_files = self.toplevel.get_widget('menuitem_remove_file')
109
self.menuitem_file_bookmark = self.toplevel.get_widget('menuitem_file_bookmark')
110
84
self.menuitem_file_make_directory = self.toplevel.get_widget('menuitem_file_make_directory')
111
85
self.menuitem_file_rename = self.toplevel.get_widget('menuitem_file_rename')
112
86
self.menuitem_file_move = self.toplevel.get_widget('menuitem_file_move')
113
self.menuitem_file_annotate = self.toplevel.get_widget('menuitem_file_annotate')
114
87
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
88
self.menuitem_branch = self.toplevel.get_widget('menuitem_branch')
117
89
self.menuitem_branch_init = self.toplevel.get_widget('menuitem_branch_initialize')
118
90
self.menuitem_branch_get = self.toplevel.get_widget('menuitem_branch_get')
119
91
self.menuitem_branch_checkout = self.toplevel.get_widget('menuitem_branch_checkout')
120
92
self.menuitem_branch_pull = self.toplevel.get_widget('menuitem_branch_pull')
121
93
self.menuitem_branch_push = self.toplevel.get_widget('menuitem_branch_push')
122
self.menuitem_branch_update = self.toplevel.get_widget('menuitem_branch_update')
123
self.menuitem_branch_revert = self.toplevel.get_widget('menuitem_branch_revert')
124
94
self.menuitem_branch_merge = self.toplevel.get_widget('menuitem_branch_merge')
125
95
self.menuitem_branch_commit = self.toplevel.get_widget('menuitem_branch_commit')
126
self.menuitem_branch_tags = self.toplevel.get_widget('menuitem_branch_tags')
127
96
self.menuitem_branch_status = self.toplevel.get_widget('menuitem_branch_status')
128
97
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
98
self.menuitem_stats = self.toplevel.get_widget('menuitem_stats')
131
99
self.menuitem_stats_diff = self.toplevel.get_widget('menuitem_stats_diff')
132
100
self.menuitem_stats_log = self.toplevel.get_widget('menuitem_stats_log')
137
105
self.toolbutton_commit = self.toplevel.get_widget('toolbutton_commit')
138
106
self.toolbutton_pull = self.toplevel.get_widget('toolbutton_pull')
139
107
self.toolbutton_push = self.toplevel.get_widget('toolbutton_push')
140
self.toolbutton_update = self.toplevel.get_widget('toolbutton_update')
141
108
# Get the drive selector
142
109
self.combobox_drive = gtk.combo_box_new_text()
143
110
self.combobox_drive.connect("changed", self._refresh_drives)
144
111
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
112
self.vbox_main_right = self.toplevel.get_widget('vbox_main_right')
113
158
114
159
115
# Dictionary for signal_autoconnect
160
116
dic = { "on_window_main_destroy": gtk.main_quit,
163
119
"on_about_activate": self.on_about_activate,
164
120
"on_menuitem_add_files_activate": self.on_menuitem_add_files_activate,
165
121
"on_menuitem_remove_file_activate": self.on_menuitem_remove_file_activate,
166
"on_menuitem_file_bookmark_activate": self.on_menuitem_file_bookmark_activate,
167
122
"on_menuitem_file_make_directory_activate": self.on_menuitem_file_make_directory_activate,
168
123
"on_menuitem_file_move_activate": self.on_menuitem_file_move_activate,
169
124
"on_menuitem_file_rename_activate": self.on_menuitem_file_rename_activate,
170
"on_menuitem_file_annotate_activate": self.on_menuitem_file_annotate_activate,
171
125
"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
126
"on_menuitem_view_refresh_activate": self.on_menuitem_view_refresh_activate,
174
127
"on_menuitem_branch_initialize_activate": self.on_menuitem_branch_initialize_activate,
175
128
"on_menuitem_branch_get_activate": self.on_menuitem_branch_get_activate,
176
129
"on_menuitem_branch_checkout_activate": self.on_menuitem_branch_checkout_activate,
177
"on_menuitem_branch_revert_activate": self.on_menuitem_branch_revert_activate,
178
130
"on_menuitem_branch_merge_activate": self.on_menuitem_branch_merge_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
"on_menuitem_branch_tags_activate": self.on_menuitem_branch_tags_activate,
184
134
"on_menuitem_branch_status_activate": self.on_menuitem_branch_status_activate,
185
135
"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
136
"on_menuitem_stats_diff_activate": self.on_menuitem_stats_diff_activate,
188
137
"on_menuitem_stats_log_activate": self.on_menuitem_stats_log_activate,
189
138
"on_menuitem_stats_infos_activate": self.on_menuitem_stats_infos_activate,
194
143
"on_toolbutton_commit_clicked": self.on_menuitem_branch_commit_activate,
195
144
"on_toolbutton_pull_clicked": self.on_menuitem_branch_pull_activate,
196
145
"on_toolbutton_push_clicked": self.on_menuitem_branch_push_activate,
197
"on_toolbutton_update_clicked": self.on_menuitem_branch_update_activate,
198
146
"on_treeview_right_button_press_event": self.on_treeview_right_button_press_event,
199
147
"on_treeview_right_row_activated": self.on_treeview_right_row_activated,
200
148
"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
}
149
"on_treeview_left_row_activated": self.on_treeview_left_row_activated }
210
150
211
151
# Connect the signals to the handlers
212
152
self.toplevel.signal_autoconnect(dic)
213
153
214
self._just_started = True
215
216
154
# Apply window size and position
217
155
width = self.pref.get_preference('window_width', 'int')
218
156
height = self.pref.get_preference('window_height', 'int')
233
171
234
172
# Show drive selector if under Win32
235
173
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)
174
self.vbox_main_right.pack_start(self.combobox_drive, False, True, 0)
175
self.vbox_main_right.reorder_child(self.combobox_drive, 0)
238
176
self.combobox_drive.show()
239
177
self.gen_hard_selector()
240
178
242
180
243
181
# Apply menu state
244
182
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
183
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
184
self.set_path(os.getcwd())
254
185
self._load_right()
255
256
self._just_started = False
257
186
258
def set_path(self, path, force_remote=False):
187
def set_path(self, path):
188
self.path = path
259
189
self.notbranch = False
260
190
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)
191
try:
192
self.wt, self.wtpath = WorkingTree.open_containing(self.path)
193
except (errors.NotBranchError, errors.NoWorkingTree):
194
self.notbranch = True
377
195
378
196
self.statusbar.push(self.context_id, path)
379
self.entry_location.set_text(path)
380
self.path = path
381
return True
382
197
383
198
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
199
return self.path
392
200
393
201
def on_about_activate(self, widget):
202
from dialog import about
394
203
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
204
468
205
def on_menuitem_add_files_activate(self, widget):
469
206
""" Add file(s)... menu handler. """
470
207
from add import OliveAdd
473
210
474
211
def on_menuitem_branch_get_activate(self, widget):
475
212
""" 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)
482
response = branch.run()
483
if response != gtk.RESPONSE_NONE:
484
branch.hide()
485
486
if response == gtk.RESPONSE_OK:
487
self.refresh_right()
488
489
branch.destroy()
213
from branch import BranchDialog
214
branch = BranchDialog(self.get_path())
215
branch.display()
490
216
491
217
def on_menuitem_branch_checkout_activate(self, widget):
492
218
""" 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)
499
response = checkout.run()
500
if response != gtk.RESPONSE_NONE:
501
checkout.hide()
502
503
if response == gtk.RESPONSE_OK:
504
self.refresh_right()
505
506
checkout.destroy()
219
from checkout import OliveCheckout
220
checkout = OliveCheckout(self.get_path())
221
checkout.display()
507
222
508
@show_bzr_error
509
223
def on_menuitem_branch_commit_activate(self, widget):
510
224
""" 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
)
519
response = commit.run()
520
if response != gtk.RESPONSE_NONE:
521
commit.hide()
522
523
if response == gtk.RESPONSE_OK:
524
self.refresh_right()
525
526
commit.destroy()
527
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()
225
from commit import CommitDialog
226
commit = CommitDialog(self.wt, self.wtpath)
227
commit.display()
534
228
535
229
def on_menuitem_branch_merge_activate(self, widget):
536
230
""" Branch/Merge... menu handler. """
537
from bzrlib.plugins.gtk.merge import MergeDialog
538
539
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.'))
542
else:
543
parent_branch_path = self.wt.branch.get_parent()
544
merge = MergeDialog(self.wt, self.wtpath,default_branch_path=parent_branch_path )
545
merge.display()
231
from merge import MergeDialog
232
merge = MergeDialog(self.wt, self.wtpath)
233
merge.display()
546
234
547
@show_bzr_error
548
235
def on_menuitem_branch_missing_revisions_activate(self, widget):
549
236
""" Branch/Missing revisions menu handler. """
550
551
from bzrlib.missing import find_unmerged, iter_log_revisions
552
553
237
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.'))
238
239
other_branch = local_branch.get_parent()
240
if other_branch is None:
241
error_dialog(_('Parent location is unknown'),
242
_('Cannot determine missing revisions if no parent location is known.'))
558
243
return
559
244
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)
245
remote_branch = Branch.open(other_branch)
246
247
if remote_branch.base == local_branch.base:
248
remote_branch = local_branch
249
250
ret = len(local_branch.missing_revisions(remote_branch))
251
252
if ret > 0:
253
info_dialog(_('There are missing revisions'),
254
_('%d revision(s) missing.') % ret)
602
255
else:
603
info_dialog(_i18n('Local branch up to date'),
604
_i18n('There are no missing revisions.'))
256
info_dialog(_('Local branch up to date'),
257
_('There are no missing revisions.'))
605
258
606
@show_bzr_error
607
259
def on_menuitem_branch_pull_activate(self, widget):
608
260
""" Branch/Pull menu handler. """
609
261
branch_to = self.wt.branch
610
262
611
263
location = branch_to.get_parent()
612
264
if location is None:
613
error_dialog(_i18n('Parent location is unknown'),
614
_i18n('Pulling is not possible until there is a parent location.'))
265
error_dialog(_('Parent location is unknown'),
266
_('Pulling is not possible until there is a parent location.'))
615
267
return
616
268
617
branch_from = Branch.open(location)
269
try:
270
branch_from = Branch.open(location)
271
except errors.NotBranchError:
272
error_dialog(_('Directory is not a branch'),
273
_('You can perform this action only in a branch.'))
618
274
619
275
if branch_to.get_parent() is None:
620
276
branch_to.set_parent(branch_from.base)
621
277
278
#old_rh = branch_to.revision_history()
279
#if tree_to is not None:
280
# tree_to.pull(branch_from)
281
#else:
282
# branch_to.pull(branch_from)
622
283
ret = branch_to.pull(branch_from)
623
284
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.') )
285
info_dialog(_('Pull successful'), _('%d revision(s) pulled.') % ret)
636
286
637
287
def on_menuitem_branch_push_activate(self, widget):
638
288
""" Branch/Push... menu handler. """
639
push = PushDialog(repository=None,revid=None,branch=self.wt.branch, parent=self.window)
640
response = push.run()
641
if response != gtk.RESPONSE_NONE:
642
push.destroy()
643
644
@show_bzr_error
645
def on_menuitem_branch_revert_activate(self, widget):
646
""" Branch/Revert all changes menu handler. """
647
ret = self.wt.revert([])
648
if ret:
649
warning_dialog(_i18n('Conflicts detected'),
650
_i18n('Please have a look at the working tree before continuing.'))
651
else:
652
info_dialog(_i18n('Revert successful'),
653
_i18n('All files reverted to last revision.'))
654
self.refresh_right()
289
from push import OlivePush
290
push = OlivePush(self.wt.branch)
291
push.display()
655
292
656
293
def on_menuitem_branch_status_activate(self, widget):
657
294
""" 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()
295
from status import OliveStatus
296
status = OliveStatus(self.wt, self.wtpath)
297
status.display()
663
298
664
299
def on_menuitem_branch_initialize_activate(self, widget):
665
300
""" 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)
681
else:
682
window = TagsWindow(self.remote_branch, self.window)
683
window.show()
684
685
def on_menuitem_file_annotate_activate(self, widget):
686
""" File/Annotate... menu handler. """
687
if self.get_selected_right() is None:
688
error_dialog(_i18n('No file was selected'),
689
_i18n('Please select a file from the list.'))
690
return
691
692
branch = self.wt.branch
693
file_id = self.wt.path2id(self.wt.relpath(os.path.join(self.path, self.get_selected_right())))
694
695
window = GAnnotateWindow(all=False, plain=False, parent=self.window)
696
window.set_title(os.path.join(self.path, self.get_selected_right()) + " - Annotate")
697
config = GAnnotateConfig(window)
698
window.show()
699
branch.lock_read()
301
import bzrlib.bzrdir as bzrdir
302
700
303
try:
701
window.annotate(self.wt, branch, file_id)
702
finally:
703
branch.unlock()
704
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()
304
if not os.path.exists(self.path):
305
os.mkdir(self.path)
306
307
try:
308
existing_bzrdir = bzrdir.BzrDir.open(self.path)
309
except errors.NotBranchError:
310
bzrdir.BzrDir.create_branch_convenience(self.path)
311
else:
312
if existing_bzrdir.has_branch():
313
if existing_bzrdir.has_workingtree():
314
raise errors.AlreadyBranchError(self.path)
315
else:
316
raise errors.BranchExistsWithoutWorkingTree(self.path)
317
else:
318
existing_bzrdir.create_branch()
319
existing_bzrdir.create_workingtree()
320
except errors.AlreadyBranchError, errmsg:
321
error_dialog(_('Directory is already a branch'),
322
_('The current directory (%s) is already a branch.\nYou can start using it, or initialize another directory.') % errmsg)
323
except errors.BranchExistsWithoutWorkingTree, errmsg:
324
error_dialog(_('Branch without a working tree'),
325
_('The current directory (%s)\nis a branch without a working tree.') % errmsg)
711
326
else:
712
warning_dialog(_i18n('Location already bookmarked'),
713
_i18n('The current directory is already bookmarked.\nSee the left panel for reference.'))
327
info_dialog(_('Initialize successful'),
328
_('Directory successfully initialized.'))
329
self.refresh_right()
714
330
715
self.refresh_left()
716
717
331
def on_menuitem_file_make_directory_activate(self, widget):
718
332
""" File/Make directory... menu handler. """
719
333
from mkdir import OliveMkdir
734
348
735
349
def on_menuitem_remove_file_activate(self, widget):
736
350
""" Remove (unversion) selected file. """
737
from remove import OliveRemoveDialog
738
remove = OliveRemoveDialog(self.wt, self.wtpath,
739
selected=self.get_selected_right(),
740
parent=self.window)
741
response = remove.run()
742
743
if response != gtk.RESPONSE_NONE:
744
remove.hide()
745
746
if response == gtk.RESPONSE_OK:
747
self.set_path(self.path)
748
self.refresh_right()
749
750
remove.destroy()
351
from remove import OliveRemove
352
remove = OliveRemove(self.wt, self.wtpath, self.get_selected_right())
353
remove.display()
751
354
752
355
def on_menuitem_stats_diff_activate(self, widget):
753
356
""" Statistics/Differences... menu handler. """
754
window = DiffWindow(parent=self.window)
357
window = DiffWindow()
755
358
parent_tree = self.wt.branch.repository.revision_tree(self.wt.branch.last_revision())
756
359
window.set_diff(self.wt.branch.nick, self.wt, parent_tree)
757
360
window.show()
759
362
def on_menuitem_stats_infos_activate(self, widget):
760
363
""" Statistics/Informations... menu handler. """
761
364
from info import OliveInfo
762
if self.remote:
763
info = OliveInfo(self.remote_branch)
764
else:
765
info = OliveInfo(self.wt.branch)
365
info = OliveInfo(self.wt)
766
366
info.display()
767
367
768
368
def on_menuitem_stats_log_activate(self, widget):
769
369
""" 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)
370
window = BranchWindow()
371
window.set_branch(self.wt.branch, self.wt.branch.last_revision(), None)
777
372
window.show()
778
373
779
374
def on_menuitem_view_refresh_activate(self, widget):
789
384
if self.path is not None:
790
385
self.refresh_right()
791
386
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
387
def on_treeview_left_button_press_event(self, widget, event):
799
388
""" Occurs when somebody right-clicks in the bookmark list. """
800
389
if event.button == 3:
804
393
805
394
# Create a menu
806
395
from menu import OliveMenu
807
menu = OliveMenu(path=self.get_path(),
808
selected=self.get_selected_left(),
809
app=self)
396
menu = OliveMenu(self.get_path(), self.get_selected_left())
810
397
811
398
menu.left_context_menu().popup(None, None, None, 0,
812
399
event.time)
813
400
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
401
def on_treeview_left_row_activated(self, treeview, path, view_column):
829
402
""" Occurs when somebody double-clicks or enters an item in the
830
403
bookmark list. """
833
406
if newdir == None:
834
407
return
835
408
836
if self.set_path(newdir):
837
self.refresh_right()
409
self.set_path(newdir)
410
self.refresh_right()
838
411
839
412
def on_treeview_right_button_press_event(self, widget, event):
840
413
""" Occurs when somebody right-clicks in the file list. """
841
414
if event.button == 3:
842
415
# Create a menu
843
416
from menu import OliveMenu
844
menu = OliveMenu(path=self.get_path(),
845
selected=self.get_selected_right(),
846
app=self)
417
menu = OliveMenu(self.get_path(), self.get_selected_right())
847
418
# get the menu items
848
m_open = menu.ui.get_widget('/context_right/open')
849
419
m_add = menu.ui.get_widget('/context_right/add')
850
420
m_remove = menu.ui.get_widget('/context_right/remove')
851
m_rename = menu.ui.get_widget('/context_right/rename')
852
m_revert = menu.ui.get_widget('/context_right/revert')
853
421
m_commit = menu.ui.get_widget('/context_right/commit')
854
m_annotate = menu.ui.get_widget('/context_right/annotate')
855
422
m_diff = menu.ui.get_widget('/context_right/diff')
856
423
# check if we're in a branch
857
424
try:
858
425
from bzrlib.branch import Branch
859
426
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)
878
except bzrerrors.NotBranchError:
879
m_open.set_sensitive(True)
427
m_add.set_sensitive(True)
428
m_remove.set_sensitive(True)
429
m_commit.set_sensitive(True)
430
m_diff.set_sensitive(True)
431
except errors.NotBranchError:
880
432
m_add.set_sensitive(False)
881
433
m_remove.set_sensitive(False)
882
m_rename.set_sensitive(False)
883
m_revert.set_sensitive(False)
884
434
m_commit.set_sensitive(False)
885
m_annotate.set_sensitive(False)
886
435
m_diff.set_sensitive(False)
887
436
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)
437
menu.right_context_menu().popup(None, None, None, 0,
438
event.time)
894
439
895
440
def on_treeview_right_row_activated(self, treeview, path, view_column):
896
441
""" Occurs when somebody double-clicks or enters an item in the
899
444
900
445
newdir = self.get_selected_right()
901
446
902
if not self.remote:
903
# We're local
904
if newdir == '..':
905
self.set_path(os.path.split(self.get_path())[0])
447
if newdir == '..':
448
self.set_path(os.path.split(self.get_path())[0])
449
else:
450
fullpath = os.path.join(self.get_path(), newdir)
451
if os.path.isdir(fullpath):
452
# selected item is an existant directory
453
self.set_path(fullpath)
906
454
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)
455
launch(fullpath)
917
456
918
457
self.refresh_right()
919
458
940
479
bookmarks = self.pref.get_bookmarks()
941
480
942
481
# Add them to the TreeStore
943
titer = treestore.append(None, [_i18n('Bookmarks'), None])
482
titer = treestore.append(None, [_('Bookmarks'), None])
944
483
for item in bookmarks:
945
484
title = self.pref.get_bookmark_title(item)
946
485
treestore.append(titer, [title, item])
947
486
948
487
# Create the column and add it to the TreeView
949
488
self.treeview_left.set_model(treestore)
950
tvcolumn_bookmark = gtk.TreeViewColumn(_i18n('Bookmark'))
489
tvcolumn_bookmark = gtk.TreeViewColumn(_('Bookmark'))
951
490
self.treeview_left.append_column(tvcolumn_bookmark)
952
491
953
492
# Set up the cells
958
497
# Expand the tree
959
498
self.treeview_left.expand_all()
960
499
500
def _add_updir_to_dirlist(self, dirlist, curdir):
501
"""Add .. to the top of directories list if we not in root directory
502
503
@param dirlist: list of directories (modified in place)
504
@param curdir: current directory
505
@return: nothing
506
"""
507
if curdir is None:
508
curdir = self.path
509
510
if sys.platform == 'win32':
511
drive, tail = os.path.splitdrive(curdir)
512
if tail in ('', '/', '\\'):
513
return
514
else:
515
if curdir == '/':
516
return
517
518
# insert always as first element
519
dirlist.insert(0, '..')
520
961
521
def _load_right(self):
962
522
""" Load data into the right panel. (Filelist) """
963
523
# 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)
524
liststore = gtk.ListStore(str, str, str)
975
525
976
526
dirs = []
977
527
files = []
985
535
dirs.append(item)
986
536
else:
987
537
files.append(item)
538
539
# Sort'em
540
dirs.sort()
541
files.sort()
542
543
# add updir link to dirs
544
self._add_updir_to_dirlist(dirs, self.path)
988
545
989
546
if not self.notbranch:
990
547
branch = self.wt.branch
993
550
delta = self.wt.changes_from(tree2, want_unchanged=True)
994
551
995
552
# 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
''])
553
for item in dirs:
554
liststore.append([gtk.STOCK_DIRECTORY, item, ''])
1014
555
for item in files:
1015
556
status = 'unknown'
1016
fileid = ''
1017
557
if not self.notbranch:
1018
558
filename = self.wt.relpath(self.path + os.sep + item)
1019
559
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()
560
for rpath, rpathnew, id, kind, text_modified, meta_modified in delta.renamed:
561
if rpathnew == filename:
562
status = 'renamed'
563
for rpath, id, kind in delta.added:
564
if rpath == filename:
565
status = 'added'
566
for rpath, id, kind in delta.removed:
567
if rpath == filename:
568
status = 'removed'
569
for rpath, id, kind, text_modified, meta_modified in delta.modified:
570
if rpath == filename:
571
status = 'modified'
572
for rpath, id, kind in delta.unchanged:
573
if rpath == filename:
574
status = 'unchanged'
575
576
#try:
577
# status = fileops.status(path + os.sep + item)
578
#except errors.PermissionDenied:
579
# continue
1048
580
1049
581
if status == 'renamed':
1050
st = _i18n('renamed')
582
st = _('renamed')
1051
583
elif status == 'removed':
1052
st = _i18n('removed')
584
st = _('removed')
1053
585
elif status == 'added':
1054
st = _i18n('added')
586
st = _('added')
1055
587
elif status == 'modified':
1056
st = _i18n('modified')
588
st = _('modified')
1057
589
elif status == 'unchanged':
1058
st = _i18n('unchanged')
1059
elif status == 'ignored':
1060
st = _i18n('ignored')
590
st = _('unchanged')
1061
591
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])
592
st = _('unknown')
593
liststore.append([gtk.STOCK_FILE, item, st])
1081
594
1082
595
# Create the columns and add them to the TreeView
1083
596
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)
597
tvcolumn_filename = gtk.TreeViewColumn(_('Filename'))
598
tvcolumn_status = gtk.TreeViewColumn(_('Status'))
599
self.treeview_right.append_column(tvcolumn_filename)
600
self.treeview_right.append_column(tvcolumn_status)
1092
601
1093
602
# Set up the cells
1094
603
cellpb = gtk.CellRendererPixbuf()
1095
604
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)
605
tvcolumn_filename.pack_start(cellpb, False)
606
tvcolumn_filename.pack_start(cell, True)
607
tvcolumn_filename.set_attributes(cellpb, stock_id=0)
608
tvcolumn_filename.add_attribute(cell, 'text', 1)
609
tvcolumn_status.pack_start(cell, True)
610
tvcolumn_status.add_attribute(cell, 'text', 2)
1122
611
1123
612
# Set sensitivity
1124
613
self.set_sensitivity()
1125
614
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
615
def get_selected_right(self):
1137
616
""" Get the selected filename. """
1138
617
treeselection = self.treeview_right.get_selection()
1141
620
if iter is None:
1142
621
return None
1143
622
else:
1144
return model.get_value(iter, 2)
623
return model.get_value(iter, 1)
1145
624
1146
625
def get_selected_left(self):
1147
626
""" Get the selected bookmark. """
1163
642
1164
643
def set_sensitivity(self):
1165
644
""" 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)
645
self.menuitem_branch_init.set_sensitive(self.notbranch)
646
self.menuitem_branch_get.set_sensitive(self.notbranch)
647
self.menuitem_branch_checkout.set_sensitive(self.notbranch)
648
self.menuitem_branch_pull.set_sensitive(not self.notbranch)
649
self.menuitem_branch_push.set_sensitive(not self.notbranch)
650
self.menuitem_branch_merge.set_sensitive(not self.notbranch)
651
self.menuitem_branch_commit.set_sensitive(not self.notbranch)
652
self.menuitem_branch_status.set_sensitive(not self.notbranch)
653
self.menuitem_branch_missing.set_sensitive(not self.notbranch)
654
self.menuitem_stats.set_sensitive(not self.notbranch)
655
self.menuitem_add_files.set_sensitive(not self.notbranch)
656
self.menuitem_remove_files.set_sensitive(not self.notbranch)
657
self.menuitem_file_make_directory.set_sensitive(not self.notbranch)
658
self.menuitem_file_rename.set_sensitive(not self.notbranch)
659
self.menuitem_file_move.set_sensitive(not self.notbranch)
660
#self.menutoolbutton_diff.set_sensitive(True)
661
self.toolbutton_diff.set_sensitive(not self.notbranch)
662
self.toolbutton_log.set_sensitive(not self.notbranch)
663
self.toolbutton_commit.set_sensitive(not self.notbranch)
664
self.toolbutton_pull.set_sensitive(not self.notbranch)
665
self.toolbutton_push.set_sensitive(not self.notbranch)
1226
666
1227
667
def refresh_left(self):
1228
668
""" Refresh the bookmark list. """
1233
673
1234
674
# Re-read preferences
1235
675
self.pref.read()
1236
676
1237
677
# Get bookmarks
1238
678
bookmarks = self.pref.get_bookmarks()
1239
679
1240
680
# Add them to the TreeStore
1241
titer = treestore.append(None, [_i18n('Bookmarks'), None])
681
titer = treestore.append(None, [_('Bookmarks'), None])
1242
682
for item in bookmarks:
1243
683
title = self.pref.get_bookmark_title(item)
1244
684
treestore.append(titer, [title, item])
1251
691
1252
692
def refresh_right(self, path=None):
1253
693
""" 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
694
from bzrlib.workingtree import WorkingTree
695
696
if path is None:
697
path = self.get_path()
698
699
# A workaround for double-clicking Bookmarks
700
if not os.path.exists(path):
701
return
702
703
# Get ListStore and clear it
704
liststore = self.treeview_right.get_model()
705
liststore.clear()
706
707
dirs = []
708
files = []
709
710
# Fill the appropriate lists
711
dotted_files = self.pref.get_preference('dotted_files', 'bool')
712
for item in os.listdir(path):
713
if not dotted_files and item[0] == '.':
714
continue
715
if os.path.isdir(path + os.sep + item):
716
dirs.append(item)
717
else:
718
files.append(item)
719
720
# Sort'em
721
dirs.sort()
722
files.sort()
723
724
# add updir link to dirs
725
self._add_updir_to_dirlist(dirs, path)
726
727
# Try to open the working tree
728
notbranch = False
729
try:
730
tree1 = WorkingTree.open_containing(path)[0]
731
except (errors.NotBranchError, errors.NoWorkingTree):
732
notbranch = True
733
except errors.PermissionDenied:
734
print "DEBUG: permission denied."
735
736
if not notbranch:
737
branch = tree1.branch
738
tree2 = tree1.branch.repository.revision_tree(branch.last_revision())
739
740
delta = tree1.changes_from(tree2, want_unchanged=True)
741
742
# Add'em to the ListStore
743
for item in dirs:
744
liststore.append([gtk.STOCK_DIRECTORY, item, ''])
745
for item in files:
746
status = 'unknown'
1294
747
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()
748
filename = tree1.relpath(path + os.sep + item)
749
750
for rpath, rpathnew, id, kind, text_modified, meta_modified in delta.renamed:
751
if rpathnew == filename:
752
status = 'renamed'
753
for rpath, id, kind in delta.added:
754
if rpath == filename:
755
status = 'added'
756
for rpath, id, kind in delta.removed:
757
if rpath == filename:
758
status = 'removed'
759
for rpath, id, kind, text_modified, meta_modified in delta.modified:
760
if rpath == filename:
761
status = 'modified'
762
for rpath, id, kind in delta.unchanged:
763
if rpath == filename:
764
status = 'unchanged'
765
766
#try:
767
# status = fileops.status(path + os.sep + item)
768
#except errors.PermissionDenied:
769
# continue
770
771
if status == 'renamed':
772
st = _('renamed')
773
elif status == 'removed':
774
st = _('removed')
775
elif status == 'added':
776
st = _('added')
777
elif status == 'modified':
778
st = _('modified')
779
elif status == 'unchanged':
780
st = _('unchanged')
781
else:
782
st = _('unknown')
783
liststore.append([gtk.STOCK_FILE, item, st])
784
785
# Add the ListStore to the TreeView
786
self.treeview_right.set_model(liststore)
1470
787
1471
788
# Set sensitivity
1472
789
self.set_sensitivity()
1494
811
drives = self._harddisks()
1495
812
for drive in drives:
1496
813
self.combobox_drive.append_text(drive)
1497
self.combobox_drive.set_active(drives.index(os.getcwd()[0:2]))
1498
814
1499
815
def _refresh_drives(self, combobox):
1500
if self._just_started:
1501
return
1502
816
model = combobox.get_model()
1503
817
active = combobox.get_active()
1504
818
if active >= 0:
1505
819
drive = model[active][0]
1506
820
self.set_path(drive + '\\')
1507
821
self.refresh_right(drive + '\\')
1508
1509
def check_for_changes(self):
1510
""" Check whether there were changes in the current working tree. """
1511
old_tree = self.wt.branch.repository.revision_tree(self.wt.branch.last_revision())
1512
delta = self.wt.changes_from(old_tree)
1513
1514
changes = False
1515
1516
if len(delta.added) or len(delta.removed) or len(delta.renamed) or len(delta.modified):
1517
changes = True
1518
1519
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
822
1600
823
import ConfigParser
1601
824
1602
class Preferences:
825
class OlivePreferences:
1603
826
""" A class which handles Olive's preferences. """
1604
def __init__(self, path=None):
827
def __init__(self):
1605
828
""" Initialize the Preferences class. """
1606
829
# Some default options
1607
830
self.defaults = { 'strict_commit' : False,
1608
831
'dotted_files' : False,
1609
'ignored_files' : True,
1610
832
'window_width' : 700,
1611
833
'window_height' : 400,
1612
834
'window_x' : 40,
1615
837
1616
838
# Create a config parser object
1617
839
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
840
1629
841
# Load the configuration
1630
842
self.read()
1647
859
1648
860
def read(self):
1649
861
""" Just read the configuration. """
1650
# Re-initialize the config parser object to avoid some bugs
1651
self.config = ConfigParser.RawConfigParser()
1652
self.config.read([self._filename])
862
if sys.platform == 'win32':
863
# Windows - no dotted files
864
self.config.read([os.path.expanduser('~/olive.conf')])
865
else:
866
self.config.read([os.path.expanduser('~/.olive.conf')])
1653
867
1654
868
def write(self):
1655
869
""" Write the configuration to the appropriate files. """
1656
fp = open(self._filename, 'w')
1657
self.config.write(fp)
1658
fp.close()
870
if sys.platform == 'win32':
871
# Windows - no dotted files
872
fp = open(os.path.expanduser('~/olive.conf'), 'w')
873
self.config.write(fp)
874
fp.close()
875
else:
876
fp = open(os.path.expanduser('~/.olive.conf'), 'w')
877
self.config.write(fp)
878
fp.close()
1659
879
1660
880
def get_bookmarks(self):
1661
881
""" Return the list of bookmarks. """
1684
904
1685
905
def set_bookmark_title(self, path, title):
1686
906
""" Set bookmark title. """
1687
# FIXME: What if path isn't listed yet?
1688
# FIXME: Canonicalize paths first?
1689
907
self.config.set(path, 'title', title)
1690
908
1691
909
def remove_bookmark(self, path):
1694
912
1695
913
def set_preference(self, option, value):
1696
914
""" Set the value of the given option. """
1697
if value is True:
915
if value == True:
1698
916
value = 'yes'
1699
elif value is False:
917
elif value == False:
1700
918
value = 'no'
1701
919
1702
920
if self.config.has_section('preferences'):
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0