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.32
- compare with another revision
- download diff
- download tarball
- view history from revision 126.1.32
- Committer: Szilveszter Farkas (Phanatic)
- Date: 2007-02-16 17:17:28 UTC
- mto: (157.1.9 trunk) (170.1.3 trunk)
- mto: This revision was merged to the branch mainline in revision 160.
- Revision ID: szilveszter.farkas@gmail.com-20070216171728-i97utnlbukrkvzli
Updated genpot.sh. Regenerated POT file. Old Hungarian translation removed.
We have to encourage people to translate bzr-gtk/Olive through Rosetta. (The Olive product is already translatable, but bzr-gtk is still not.)
We have to encourage people to translate bzr-gtk/Olive through Rosetta. (The Olive product is already translatable, but bzr-gtk is still not.)
- files removed:
- HACKING
- branchview
- preferences
- files renamed:
- icons/bzr-icon-64.png => bzr-icon-64.png
- revisionview.py => logview.py
- icons/oliveicon2.png => oliveicon2.png
- 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
38
from bzrlib.plugins.gtk.dialog import error_dialog, info_dialog, warning_dialog
46
39
from bzrlib.plugins.gtk.errors import show_bzr_error
47
40
from guifiles import GLADEFILENAME
48
41
49
42
from bzrlib.plugins.gtk.diff import DiffWindow
50
lazy_import(globals(), """
51
from bzrlib.plugins.gtk.viz import branchwin
52
""")
43
from bzrlib.plugins.gtk.viz.branchwin import BranchWindow
53
44
from bzrlib.plugins.gtk.annotate.gannotate import GAnnotateWindow
54
45
from bzrlib.plugins.gtk.annotate.config import GAnnotateConfig
55
46
from bzrlib.plugins.gtk.commit import CommitDialog
56
47
from bzrlib.plugins.gtk.conflicts import ConflictsDialog
57
from bzrlib.plugins.gtk.initialize import InitDialog
58
48
from bzrlib.plugins.gtk.push import PushDialog
59
from bzrlib.plugins.gtk.revbrowser import RevisionBrowser
60
61
def about():
62
""" Display the AboutDialog. """
63
from bzrlib.plugins.gtk import __version__
64
from bzrlib.plugins.gtk.olive.guifiles import GLADEFILENAME
65
66
# Load AboutDialog description
67
dglade = gtk.glade.XML(GLADEFILENAME, 'aboutdialog')
68
dialog = dglade.get_widget('aboutdialog')
69
70
# Set version
71
dialog.set_version(__version__)
72
dialog.set_authors([ _i18n("Lead Developer:"),
73
"Szilveszter Farkas <szilveszter.farkas@gmail.com>",
74
_i18n("Contributors:"),
75
"Jelmer Vernooij <jelmer@samba.org>",
76
"Mateusz Korniak <mateusz.korniak@ant.gliwice.pl>",
77
"Gary van der Merwe <garyvdm@gmail.com>" ])
78
dialog.set_artists([ "Simon Pascal Klein <klepas@klepas.org>",
79
"Jakub Steiner <jimmac@novell.com>" ])
80
81
dialog.run()
82
# Destroy the dialog
83
dialog.destroy()
84
49
85
50
class OliveGtk:
86
51
""" The main Olive GTK frontend class. This is called when launching the
106
71
# Get some important menu items
107
72
self.menuitem_add_files = self.toplevel.get_widget('menuitem_add_files')
108
73
self.menuitem_remove_files = self.toplevel.get_widget('menuitem_remove_file')
109
self.menuitem_file_bookmark = self.toplevel.get_widget('menuitem_file_bookmark')
110
74
self.menuitem_file_make_directory = self.toplevel.get_widget('menuitem_file_make_directory')
111
75
self.menuitem_file_rename = self.toplevel.get_widget('menuitem_file_rename')
112
76
self.menuitem_file_move = self.toplevel.get_widget('menuitem_file_move')
113
77
self.menuitem_file_annotate = self.toplevel.get_widget('menuitem_file_annotate')
114
78
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
79
self.menuitem_branch = self.toplevel.get_widget('menuitem_branch')
117
80
self.menuitem_branch_init = self.toplevel.get_widget('menuitem_branch_initialize')
118
81
self.menuitem_branch_get = self.toplevel.get_widget('menuitem_branch_get')
119
82
self.menuitem_branch_checkout = self.toplevel.get_widget('menuitem_branch_checkout')
120
83
self.menuitem_branch_pull = self.toplevel.get_widget('menuitem_branch_pull')
121
84
self.menuitem_branch_push = self.toplevel.get_widget('menuitem_branch_push')
122
self.menuitem_branch_update = self.toplevel.get_widget('menuitem_branch_update')
123
85
self.menuitem_branch_revert = self.toplevel.get_widget('menuitem_branch_revert')
124
86
self.menuitem_branch_merge = self.toplevel.get_widget('menuitem_branch_merge')
125
87
self.menuitem_branch_commit = self.toplevel.get_widget('menuitem_branch_commit')
126
self.menuitem_branch_tags = self.toplevel.get_widget('menuitem_branch_tags')
127
88
self.menuitem_branch_status = self.toplevel.get_widget('menuitem_branch_status')
128
89
self.menuitem_branch_missing = self.toplevel.get_widget('menuitem_branch_missing_revisions')
129
90
self.menuitem_branch_conflicts = self.toplevel.get_widget('menuitem_branch_conflicts')
137
98
self.toolbutton_commit = self.toplevel.get_widget('toolbutton_commit')
138
99
self.toolbutton_pull = self.toplevel.get_widget('toolbutton_pull')
139
100
self.toolbutton_push = self.toplevel.get_widget('toolbutton_push')
140
self.toolbutton_update = self.toplevel.get_widget('toolbutton_update')
141
101
# Get the drive selector
142
102
self.combobox_drive = gtk.combo_box_new_text()
143
103
self.combobox_drive.connect("changed", self._refresh_drives)
144
104
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
105
self.vbox_main_right = self.toplevel.get_widget('vbox_main_right')
106
158
107
159
108
# Dictionary for signal_autoconnect
160
109
dic = { "on_window_main_destroy": gtk.main_quit,
163
112
"on_about_activate": self.on_about_activate,
164
113
"on_menuitem_add_files_activate": self.on_menuitem_add_files_activate,
165
114
"on_menuitem_remove_file_activate": self.on_menuitem_remove_file_activate,
166
"on_menuitem_file_bookmark_activate": self.on_menuitem_file_bookmark_activate,
167
115
"on_menuitem_file_make_directory_activate": self.on_menuitem_file_make_directory_activate,
168
116
"on_menuitem_file_move_activate": self.on_menuitem_file_move_activate,
169
117
"on_menuitem_file_rename_activate": self.on_menuitem_file_rename_activate,
170
118
"on_menuitem_file_annotate_activate": self.on_menuitem_file_annotate_activate,
171
119
"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
120
"on_menuitem_view_refresh_activate": self.on_menuitem_view_refresh_activate,
174
121
"on_menuitem_branch_initialize_activate": self.on_menuitem_branch_initialize_activate,
175
122
"on_menuitem_branch_get_activate": self.on_menuitem_branch_get_activate,
179
126
"on_menuitem_branch_commit_activate": self.on_menuitem_branch_commit_activate,
180
127
"on_menuitem_branch_push_activate": self.on_menuitem_branch_push_activate,
181
128
"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
129
"on_menuitem_branch_status_activate": self.on_menuitem_branch_status_activate,
185
130
"on_menuitem_branch_missing_revisions_activate": self.on_menuitem_branch_missing_revisions_activate,
186
131
"on_menuitem_branch_conflicts_activate": self.on_menuitem_branch_conflicts_activate,
194
139
"on_toolbutton_commit_clicked": self.on_menuitem_branch_commit_activate,
195
140
"on_toolbutton_pull_clicked": self.on_menuitem_branch_pull_activate,
196
141
"on_toolbutton_push_clicked": self.on_menuitem_branch_push_activate,
197
"on_toolbutton_update_clicked": self.on_menuitem_branch_update_activate,
198
142
"on_treeview_right_button_press_event": self.on_treeview_right_button_press_event,
199
143
"on_treeview_right_row_activated": self.on_treeview_right_row_activated,
200
144
"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
}
145
"on_treeview_left_row_activated": self.on_treeview_left_row_activated }
210
146
211
147
# Connect the signals to the handlers
212
148
self.toplevel.signal_autoconnect(dic)
233
169
234
170
# Show drive selector if under Win32
235
171
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)
172
self.vbox_main_right.pack_start(self.combobox_drive, False, True, 0)
173
self.vbox_main_right.reorder_child(self.combobox_drive, 0)
238
174
self.combobox_drive.show()
239
175
self.gen_hard_selector()
240
176
242
178
243
179
# Apply menu state
244
180
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
181
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
182
self.set_path(os.getcwd())
254
183
self._load_right()
255
184
256
185
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 (bzrerrors.NotBranchError, bzrerrors.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 bzrlib.plugins.gtk.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
474
211
def on_menuitem_branch_get_activate(self, widget):
475
212
""" Branch/Get... menu handler. """
476
213
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)
214
branch = BranchDialog(self.get_path(), self.window)
482
215
response = branch.run()
483
216
if response != gtk.RESPONSE_NONE:
484
217
branch.hide()
485
218
486
219
if response == gtk.RESPONSE_OK:
487
220
self.refresh_right()
488
221
491
224
def on_menuitem_branch_checkout_activate(self, widget):
492
225
""" Branch/Checkout... menu handler. """
493
226
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)
227
checkout = CheckoutDialog(self.get_path(), self.window)
499
228
response = checkout.run()
500
229
if response != gtk.RESPONSE_NONE:
501
230
checkout.hide()
508
237
@show_bzr_error
509
238
def on_menuitem_branch_commit_activate(self, widget):
510
239
""" 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
)
240
commit = CommitDialog(self.wt, self.wtpath, self.notbranch, self.get_selected_right(), self.window)
519
241
response = commit.run()
520
242
if response != gtk.RESPONSE_NONE:
521
243
commit.hide()
537
259
from bzrlib.plugins.gtk.merge import MergeDialog
538
260
539
261
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.'))
262
error_dialog(_('There are local changes in the branch'),
263
_('Please commit or revert the changes before merging.'))
542
264
else:
543
parent_branch_path = self.wt.branch.get_parent()
544
merge = MergeDialog(self.wt, self.wtpath,default_branch_path=parent_branch_path )
265
merge = MergeDialog(self.wt, self.wtpath)
545
266
merge.display()
546
267
547
268
@show_bzr_error
548
269
def on_menuitem_branch_missing_revisions_activate(self, widget):
549
270
""" Branch/Missing revisions menu handler. """
550
551
from bzrlib.missing import find_unmerged, iter_log_revisions
552
553
271
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.'))
272
273
other_branch = local_branch.get_parent()
274
if other_branch is None:
275
error_dialog(_('Parent location is unknown'),
276
_('Cannot determine missing revisions if no parent location is known.'))
558
277
return
559
278
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)
279
remote_branch = Branch.open(other_branch)
280
281
if remote_branch.base == local_branch.base:
282
remote_branch = local_branch
283
284
ret = len(local_branch.missing_revisions(remote_branch))
285
286
if ret > 0:
287
info_dialog(_('There are missing revisions'),
288
_('%d revision(s) missing.') % ret)
602
289
else:
603
info_dialog(_i18n('Local branch up to date'),
604
_i18n('There are no missing revisions.'))
290
info_dialog(_('Local branch up to date'),
291
_('There are no missing revisions.'))
605
292
606
293
@show_bzr_error
607
294
def on_menuitem_branch_pull_activate(self, widget):
610
297
611
298
location = branch_to.get_parent()
612
299
if location is None:
613
error_dialog(_i18n('Parent location is unknown'),
614
_i18n('Pulling is not possible until there is a parent location.'))
300
error_dialog(_('Parent location is unknown'),
301
_('Pulling is not possible until there is a parent location.'))
615
302
return
616
303
617
304
branch_from = Branch.open(location)
619
306
if branch_to.get_parent() is None:
620
307
branch_to.set_parent(branch_from.base)
621
308
309
#old_rh = branch_to.revision_history()
310
#if tree_to is not None:
311
# tree_to.pull(branch_from)
312
#else:
313
# branch_to.pull(branch_from)
622
314
ret = branch_to.pull(branch_from)
623
315
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.') )
316
info_dialog(_('Pull successful'), _('%d revision(s) pulled.') % ret)
636
317
637
318
def on_menuitem_branch_push_activate(self, widget):
638
319
""" Branch/Push... menu handler. """
639
push = PushDialog(repository=None,revid=None,branch=self.wt.branch, parent=self.window)
320
push = PushDialog(self.wt.branch, self.window)
640
321
response = push.run()
641
322
if response != gtk.RESPONSE_NONE:
642
323
push.destroy()
646
327
""" Branch/Revert all changes menu handler. """
647
328
ret = self.wt.revert([])
648
329
if ret:
649
warning_dialog(_i18n('Conflicts detected'),
650
_i18n('Please have a look at the working tree before continuing.'))
330
warning_dialog(_('Conflicts detected'),
331
_('Please have a look at the working tree before continuing.'))
651
332
else:
652
info_dialog(_i18n('Revert successful'),
653
_i18n('All files reverted to last revision.'))
333
info_dialog(_('Revert successful'),
334
_('All files reverted to last revision.'))
654
335
self.refresh_right()
655
336
656
337
def on_menuitem_branch_status_activate(self, widget):
657
338
""" Branch/Status... menu handler. """
658
339
from bzrlib.plugins.gtk.status import StatusDialog
659
340
status = StatusDialog(self.wt, self.wtpath)
660
response = status.run()
661
if response != gtk.RESPONSE_NONE:
662
status.destroy()
341
status.display()
663
342
343
@show_bzr_error
664
344
def on_menuitem_branch_initialize_activate(self, widget):
665
345
""" 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)
346
import bzrlib.bzrdir as bzrdir
347
348
if not os.path.exists(self.path):
349
os.mkdir(self.path)
350
351
try:
352
existing_bzrdir = bzrdir.BzrDir.open(self.path)
353
except bzrerrors.NotBranchError:
354
bzrdir.BzrDir.create_branch_convenience(self.path)
681
355
else:
682
window = TagsWindow(self.remote_branch, self.window)
683
window.show()
684
356
if existing_bzrdir.has_branch():
357
if existing_bzrdir.has_workingtree():
358
raise bzrerrors.AlreadyBranchError(self.path)
359
else:
360
raise bzrerrors.BranchExistsWithoutWorkingTree(self.path)
361
else:
362
existing_bzrdir.create_branch()
363
existing_bzrdir.create_workingtree()
364
info_dialog(_('Initialize successful'),
365
_('Directory successfully initialized.'))
366
self.refresh_right()
367
685
368
def on_menuitem_file_annotate_activate(self, widget):
686
369
""" File/Annotate... menu handler. """
687
370
if self.get_selected_right() is None:
688
error_dialog(_i18n('No file was selected'),
689
_i18n('Please select a file from the list.'))
371
error_dialog(_('No file was selected'),
372
_('Please select a file from the list.'))
690
373
return
691
374
692
375
branch = self.wt.branch
693
376
file_id = self.wt.path2id(self.wt.relpath(os.path.join(self.path, self.get_selected_right())))
694
377
695
window = GAnnotateWindow(all=False, plain=False, parent=self.window)
378
window = GAnnotateWindow(all=False, plain=False)
696
379
window.set_title(os.path.join(self.path, self.get_selected_right()) + " - Annotate")
697
380
config = GAnnotateConfig(window)
698
381
window.show()
702
385
finally:
703
386
branch.unlock()
704
387
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
388
def on_menuitem_file_make_directory_activate(self, widget):
718
389
""" File/Make directory... menu handler. """
719
390
from mkdir import OliveMkdir
751
422
752
423
def on_menuitem_stats_diff_activate(self, widget):
753
424
""" Statistics/Differences... menu handler. """
754
window = DiffWindow(parent=self.window)
425
window = DiffWindow()
755
426
parent_tree = self.wt.branch.repository.revision_tree(self.wt.branch.last_revision())
756
427
window.set_diff(self.wt.branch.nick, self.wt, parent_tree)
757
428
window.show()
759
430
def on_menuitem_stats_infos_activate(self, widget):
760
431
""" Statistics/Informations... menu handler. """
761
432
from info import OliveInfo
762
if self.remote:
763
info = OliveInfo(self.remote_branch)
764
else:
765
info = OliveInfo(self.wt.branch)
433
info = OliveInfo(self.wt)
766
434
info.display()
767
435
768
436
def on_menuitem_stats_log_activate(self, widget):
769
437
""" 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)
438
window = BranchWindow()
439
window.set_branch(self.wt.branch, self.wt.branch.last_revision(), None)
777
440
window.show()
778
441
779
442
def on_menuitem_view_refresh_activate(self, widget):
789
452
if self.path is not None:
790
453
self.refresh_right()
791
454
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
455
def on_treeview_left_button_press_event(self, widget, event):
799
456
""" Occurs when somebody right-clicks in the bookmark list. """
800
457
if event.button == 3:
811
468
menu.left_context_menu().popup(None, None, None, 0,
812
469
event.time)
813
470
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
471
def on_treeview_left_row_activated(self, treeview, path, view_column):
829
472
""" Occurs when somebody double-clicks or enters an item in the
830
473
bookmark list. """
833
476
if newdir == None:
834
477
return
835
478
836
if self.set_path(newdir):
837
self.refresh_right()
479
self.set_path(newdir)
480
self.refresh_right()
838
481
839
482
def on_treeview_right_button_press_event(self, widget, event):
840
483
""" Occurs when somebody right-clicks in the file list. """
845
488
selected=self.get_selected_right(),
846
489
app=self)
847
490
# get the menu items
848
m_open = menu.ui.get_widget('/context_right/open')
849
491
m_add = menu.ui.get_widget('/context_right/add')
850
492
m_remove = menu.ui.get_widget('/context_right/remove')
851
493
m_rename = menu.ui.get_widget('/context_right/rename')
852
494
m_revert = menu.ui.get_widget('/context_right/revert')
853
495
m_commit = menu.ui.get_widget('/context_right/commit')
854
m_annotate = menu.ui.get_widget('/context_right/annotate')
855
496
m_diff = menu.ui.get_widget('/context_right/diff')
856
497
# check if we're in a branch
857
498
try:
858
499
from bzrlib.branch import Branch
859
500
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)
501
m_add.set_sensitive(True)
502
m_remove.set_sensitive(True)
503
m_rename.set_sensitive(True)
504
m_revert.set_sensitive(True)
505
m_commit.set_sensitive(True)
506
m_diff.set_sensitive(True)
878
507
except bzrerrors.NotBranchError:
879
m_open.set_sensitive(True)
880
508
m_add.set_sensitive(False)
881
509
m_remove.set_sensitive(False)
882
510
m_rename.set_sensitive(False)
883
511
m_revert.set_sensitive(False)
884
512
m_commit.set_sensitive(False)
885
m_annotate.set_sensitive(False)
886
513
m_diff.set_sensitive(False)
887
514
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)
515
menu.right_context_menu().popup(None, None, None, 0,
516
event.time)
894
517
895
518
def on_treeview_right_row_activated(self, treeview, path, view_column):
896
519
""" Occurs when somebody double-clicks or enters an item in the
899
522
900
523
newdir = self.get_selected_right()
901
524
902
if not self.remote:
903
# We're local
904
if newdir == '..':
905
self.set_path(os.path.split(self.get_path())[0])
525
if newdir == '..':
526
self.set_path(os.path.split(self.get_path())[0])
527
else:
528
fullpath = os.path.join(self.get_path(), newdir)
529
if os.path.isdir(fullpath):
530
# selected item is an existant directory
531
self.set_path(fullpath)
906
532
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)
533
launch(fullpath)
917
534
918
535
self.refresh_right()
919
536
940
557
bookmarks = self.pref.get_bookmarks()
941
558
942
559
# Add them to the TreeStore
943
titer = treestore.append(None, [_i18n('Bookmarks'), None])
560
titer = treestore.append(None, [_('Bookmarks'), None])
944
561
for item in bookmarks:
945
562
title = self.pref.get_bookmark_title(item)
946
563
treestore.append(titer, [title, item])
947
564
948
565
# Create the column and add it to the TreeView
949
566
self.treeview_left.set_model(treestore)
950
tvcolumn_bookmark = gtk.TreeViewColumn(_i18n('Bookmark'))
567
tvcolumn_bookmark = gtk.TreeViewColumn(_('Bookmark'))
951
568
self.treeview_left.append_column(tvcolumn_bookmark)
952
569
953
570
# Set up the cells
958
575
# Expand the tree
959
576
self.treeview_left.expand_all()
960
577
578
def _add_updir_to_dirlist(self, dirlist, curdir):
579
"""Add .. to the top of directories list if we not in root directory
580
581
:param dirlist: list of directories (modified in place)
582
:param curdir: current directory
583
:return: nothing
584
"""
585
if curdir is None:
586
curdir = self.path
587
588
if sys.platform == 'win32':
589
drive, tail = os.path.splitdrive(curdir)
590
if tail in ('', '/', '\\'):
591
return
592
else:
593
if curdir == '/':
594
return
595
596
# insert always as first element
597
dirlist.insert(0, '..')
598
961
599
def _load_right(self):
962
600
""" Load data into the right panel. (Filelist) """
963
601
# 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)
602
liststore = gtk.ListStore(str, str, str)
975
603
976
604
dirs = []
977
605
files = []
985
613
dirs.append(item)
986
614
else:
987
615
files.append(item)
616
617
# Sort'em
618
dirs.sort()
619
files.sort()
620
621
# add updir link to dirs
622
self._add_updir_to_dirlist(dirs, self.path)
988
623
989
624
if not self.notbranch:
990
625
branch = self.wt.branch
993
628
delta = self.wt.changes_from(tree2, want_unchanged=True)
994
629
995
630
# 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
''])
631
for item in dirs:
632
liststore.append([gtk.STOCK_DIRECTORY, item, ''])
1014
633
for item in files:
1015
634
status = 'unknown'
1016
fileid = ''
1017
635
if not self.notbranch:
1018
636
filename = self.wt.relpath(self.path + os.sep + item)
1019
637
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()
638
for rpath, rpathnew, id, kind, text_modified, meta_modified in delta.renamed:
639
if rpathnew == filename:
640
status = 'renamed'
641
for rpath, id, kind in delta.added:
642
if rpath == filename:
643
status = 'added'
644
for rpath, id, kind in delta.removed:
645
if rpath == filename:
646
status = 'removed'
647
for rpath, id, kind, text_modified, meta_modified in delta.modified:
648
if rpath == filename:
649
status = 'modified'
650
for rpath, id, kind in delta.unchanged:
651
if rpath == filename:
652
status = 'unchanged'
653
for rpath, file_class, kind, id, entry in self.wt.list_files():
654
if rpath == filename and file_class == 'I':
655
status = 'ignored'
656
657
#try:
658
# status = fileops.status(path + os.sep + item)
659
#except errors.PermissionDenied:
660
# continue
1048
661
1049
662
if status == 'renamed':
1050
st = _i18n('renamed')
663
st = _('renamed')
1051
664
elif status == 'removed':
1052
st = _i18n('removed')
665
st = _('removed')
1053
666
elif status == 'added':
1054
st = _i18n('added')
667
st = _('added')
1055
668
elif status == 'modified':
1056
st = _i18n('modified')
669
st = _('modified')
1057
670
elif status == 'unchanged':
1058
st = _i18n('unchanged')
671
st = _('unchanged')
1059
672
elif status == 'ignored':
1060
st = _i18n('ignored')
673
st = _('ignored')
1061
674
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])
675
st = _('unknown')
676
liststore.append([gtk.STOCK_FILE, item, st])
1081
677
1082
678
# Create the columns and add them to the TreeView
1083
679
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)
680
tvcolumn_filename = gtk.TreeViewColumn(_('Filename'))
681
tvcolumn_status = gtk.TreeViewColumn(_('Status'))
682
self.treeview_right.append_column(tvcolumn_filename)
683
self.treeview_right.append_column(tvcolumn_status)
1092
684
1093
685
# Set up the cells
1094
686
cellpb = gtk.CellRendererPixbuf()
1095
687
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)
688
tvcolumn_filename.pack_start(cellpb, False)
689
tvcolumn_filename.pack_start(cell, True)
690
tvcolumn_filename.set_attributes(cellpb, stock_id=0)
691
tvcolumn_filename.add_attribute(cell, 'text', 1)
692
tvcolumn_status.pack_start(cell, True)
693
tvcolumn_status.add_attribute(cell, 'text', 2)
1122
694
1123
695
# Set sensitivity
1124
696
self.set_sensitivity()
1125
697
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
698
def get_selected_right(self):
1137
699
""" Get the selected filename. """
1138
700
treeselection = self.treeview_right.get_selection()
1141
703
if iter is None:
1142
704
return None
1143
705
else:
1144
return model.get_value(iter, 2)
706
return model.get_value(iter, 1)
1145
707
1146
708
def get_selected_left(self):
1147
709
""" Get the selected bookmark. """
1163
725
1164
726
def set_sensitivity(self):
1165
727
""" 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)
728
self.menuitem_branch_init.set_sensitive(self.notbranch)
729
self.menuitem_branch_get.set_sensitive(self.notbranch)
730
self.menuitem_branch_checkout.set_sensitive(self.notbranch)
731
self.menuitem_branch_pull.set_sensitive(not self.notbranch)
732
self.menuitem_branch_push.set_sensitive(not self.notbranch)
733
self.menuitem_branch_revert.set_sensitive(not self.notbranch)
734
self.menuitem_branch_merge.set_sensitive(not self.notbranch)
735
self.menuitem_branch_commit.set_sensitive(not self.notbranch)
736
self.menuitem_branch_status.set_sensitive(not self.notbranch)
737
self.menuitem_branch_missing.set_sensitive(not self.notbranch)
738
self.menuitem_branch_conflicts.set_sensitive(not self.notbranch)
739
self.menuitem_stats.set_sensitive(not self.notbranch)
740
self.menuitem_add_files.set_sensitive(not self.notbranch)
741
self.menuitem_remove_files.set_sensitive(not self.notbranch)
742
self.menuitem_file_make_directory.set_sensitive(not self.notbranch)
743
self.menuitem_file_rename.set_sensitive(not self.notbranch)
744
self.menuitem_file_move.set_sensitive(not self.notbranch)
745
self.menuitem_file_annotate.set_sensitive(not self.notbranch)
746
#self.menutoolbutton_diff.set_sensitive(True)
747
self.toolbutton_diff.set_sensitive(not self.notbranch)
748
self.toolbutton_log.set_sensitive(not self.notbranch)
749
self.toolbutton_commit.set_sensitive(not self.notbranch)
750
self.toolbutton_pull.set_sensitive(not self.notbranch)
751
self.toolbutton_push.set_sensitive(not self.notbranch)
1226
752
1227
753
def refresh_left(self):
1228
754
""" Refresh the bookmark list. """
1238
764
bookmarks = self.pref.get_bookmarks()
1239
765
1240
766
# Add them to the TreeStore
1241
titer = treestore.append(None, [_i18n('Bookmarks'), None])
767
titer = treestore.append(None, [_('Bookmarks'), None])
1242
768
for item in bookmarks:
1243
769
title = self.pref.get_bookmark_title(item)
1244
770
treestore.append(titer, [title, item])
1251
777
1252
778
def refresh_right(self, path=None):
1253
779
""" 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
780
from bzrlib.workingtree import WorkingTree
781
782
if path is None:
783
path = self.get_path()
784
785
# A workaround for double-clicking Bookmarks
786
if not os.path.exists(path):
787
return
788
789
# Get ListStore and clear it
790
liststore = self.treeview_right.get_model()
791
liststore.clear()
792
793
dirs = []
794
files = []
795
796
# Fill the appropriate lists
797
dotted_files = self.pref.get_preference('dotted_files', 'bool')
798
for item in os.listdir(path):
799
if not dotted_files and item[0] == '.':
800
continue
801
if os.path.isdir(path + os.sep + item):
802
dirs.append(item)
803
else:
804
files.append(item)
805
806
# Sort'em
807
dirs.sort()
808
files.sort()
809
810
# add updir link to dirs
811
self._add_updir_to_dirlist(dirs, path)
812
813
# Try to open the working tree
814
notbranch = False
815
try:
816
tree1 = WorkingTree.open_containing(path)[0]
817
except (bzrerrors.NotBranchError, bzrerrors.NoWorkingTree):
818
notbranch = True
819
820
if not notbranch:
821
branch = tree1.branch
822
tree2 = tree1.branch.repository.revision_tree(branch.last_revision())
823
824
delta = tree1.changes_from(tree2, want_unchanged=True)
825
826
# Add'em to the ListStore
827
for item in dirs:
828
liststore.append([gtk.STOCK_DIRECTORY, item, ''])
829
for item in files:
830
status = 'unknown'
1294
831
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()
832
filename = tree1.relpath(path + os.sep + item)
833
834
for rpath, rpathnew, id, kind, text_modified, meta_modified in delta.renamed:
835
if rpathnew == filename:
836
status = 'renamed'
837
for rpath, id, kind in delta.added:
838
if rpath == filename:
839
status = 'added'
840
for rpath, id, kind in delta.removed:
841
if rpath == filename:
842
status = 'removed'
843
for rpath, id, kind, text_modified, meta_modified in delta.modified:
844
if rpath == filename:
845
status = 'modified'
846
for rpath, id, kind in delta.unchanged:
847
if rpath == filename:
848
status = 'unchanged'
849
for rpath, file_class, kind, id, entry in self.wt.list_files():
850
if rpath == filename and file_class == 'I':
851
status = 'ignored'
852
853
#try:
854
# status = fileops.status(path + os.sep + item)
855
#except errors.PermissionDenied:
856
# continue
857
858
if status == 'renamed':
859
st = _('renamed')
860
elif status == 'removed':
861
st = _('removed')
862
elif status == 'added':
863
st = _('added')
864
elif status == 'modified':
865
st = _('modified')
866
elif status == 'unchanged':
867
st = _('unchanged')
868
elif status == 'ignored':
869
st = _('ignored')
870
else:
871
st = _('unknown')
872
liststore.append([gtk.STOCK_FILE, item, st])
873
874
# Add the ListStore to the TreeView
875
self.treeview_right.set_model(liststore)
1470
876
1471
877
# Set sensitivity
1472
878
self.set_sensitivity()
1517
923
changes = True
1518
924
1519
925
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
926
1600
927
import ConfigParser
1601
928
1602
929
class Preferences:
1603
930
""" A class which handles Olive's preferences. """
1604
def __init__(self, path=None):
931
def __init__(self):
1605
932
""" Initialize the Preferences class. """
1606
933
# Some default options
1607
934
self.defaults = { 'strict_commit' : False,
1608
935
'dotted_files' : False,
1609
'ignored_files' : True,
1610
936
'window_width' : 700,
1611
937
'window_height' : 400,
1612
938
'window_x' : 40,
1615
941
1616
942
# Create a config parser object
1617
943
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
944
1629
945
# Load the configuration
1630
946
self.read()
1649
965
""" Just read the configuration. """
1650
966
# Re-initialize the config parser object to avoid some bugs
1651
967
self.config = ConfigParser.RawConfigParser()
1652
self.config.read([self._filename])
968
if sys.platform == 'win32':
969
# Windows - no dotted files
970
self.config.read([os.path.expanduser('~/olive.conf')])
971
else:
972
self.config.read([os.path.expanduser('~/.olive.conf')])
1653
973
1654
974
def write(self):
1655
975
""" Write the configuration to the appropriate files. """
1656
fp = open(self._filename, 'w')
1657
self.config.write(fp)
1658
fp.close()
976
if sys.platform == 'win32':
977
# Windows - no dotted files
978
fp = open(os.path.expanduser('~/olive.conf'), 'w')
979
self.config.write(fp)
980
fp.close()
981
else:
982
fp = open(os.path.expanduser('~/.olive.conf'), 'w')
983
self.config.write(fp)
984
fp.close()
1659
985
1660
986
def get_bookmarks(self):
1661
987
""" Return the list of bookmarks. """
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0