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/commit.py
- browse files at revision 0.8.10
- compare with another revision
- download diff
- download tarball
- view history from revision 0.8.10
- Committer: Szilveszter Farkas (Phanatic)
- Date: 2006-07-16 16:27:59 UTC
- mto: (0.14.1 main) (93.1.1 win32.bialix)
- mto: This revision was merged to the branch mainline in revision 83.
- Revision ID: Szilveszter.Farkas@gmail.com-20060716162759-f3e8596921edc374
2006-07-16 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
* Done some directory reorganization.
* setup.py: added some basic install script
* Began to implement the GTK UI.
* Done some directory reorganization.
* setup.py: added some basic install script
* Began to implement the GTK UI.
- files added:
- ChangeLog
- olive/backend
- olive/frontend
- olive/frontend/gtk
- files removed:
- .bzrignore
- annotate
- icons
- po
- viz
- files modified:
- setup.py *
added
removed
olive/commit.py
1
# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <szilveszter.farkas@gmail.com>
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16
17
try:
18
import pygtk
19
pygtk.require("2.0")
20
except:
21
pass
22
23
import gtk
24
import gtk.glade
25
import gobject
26
import pango
27
28
import bzrlib.errors as errors
29
from bzrlib import osutils
30
31
from dialog import error_dialog, question_dialog
32
from errors import show_bzr_error
33
from guifiles import GLADEFILENAME
34
35
36
class CommitDialog:
37
""" Display Commit dialog and perform the needed actions. """
38
def __init__(self, wt, wtpath, notbranch):
39
""" Initialize the Commit dialog.
40
:param wt: bzr working tree object
41
:param wtpath: path to working tree root
42
:param notbranch: flag that path is not a brach
43
:type notbranch: bool
44
"""
45
self.glade = gtk.glade.XML(GLADEFILENAME, 'window_commit', 'olive-gtk')
46
47
self.wt = wt
48
self.wtpath = wtpath
49
self.notbranch = notbranch
50
51
# Get some important widgets
52
self.window = self.glade.get_widget('window_commit')
53
self.checkbutton_local = self.glade.get_widget('checkbutton_commit_local')
54
self.textview = self.glade.get_widget('textview_commit')
55
self.file_expander = self.glade.get_widget('expander_commit_select')
56
self.file_view = self.glade.get_widget('treeview_commit_select')
57
self.pending_expander = self.glade.get_widget('expander_commit_pending')
58
self.pending_label = self.glade.get_widget('label_commit_pending')
59
self.pending_view = self.glade.get_widget('treeview_commit_pending')
60
61
if wt is None or notbranch:
62
return
63
64
# Set the delta
65
self.old_tree = self.wt.branch.repository.revision_tree(self.wt.branch.last_revision())
66
self.delta = self.wt.changes_from(self.old_tree)
67
68
# Get pending merges
69
self.pending = self._pending_merges(self.wt)
70
71
# Dictionary for signal_autoconnect
72
dic = { "on_button_commit_commit_clicked": self.commit,
73
"on_button_commit_cancel_clicked": self.close }
74
75
# Connect the signals to the handlers
76
self.glade.signal_autoconnect(dic)
77
78
# Create the file list
79
self._create_file_view()
80
# Create the pending merges
81
self._create_pending_merges()
82
83
def display(self):
84
""" Display the Push dialog.
85
@return: True if dialog is shown.
86
"""
87
if self.wt is None and not self.notbranch:
88
error_dialog(_('Directory does not have a working tree'),
89
_('Operation aborted.'))
90
self.close()
91
return False
92
if self.notbranch:
93
error_dialog(_('Directory is not a branch'),
94
_('You can perform this action only in a branch.'))
95
self.close()
96
return False
97
else:
98
if self.wt.branch.get_bound_location() is not None:
99
# we have a checkout, so the local commit checkbox must appear
100
self.checkbutton_local.show()
101
102
if self.pending:
103
# There are pending merges, file selection not supported
104
self.file_expander.set_expanded(False)
105
self.file_view.set_sensitive(False)
106
else:
107
# No pending merges
108
self.pending_expander.hide()
109
110
self.textview.modify_font(pango.FontDescription("Monospace"))
111
self.window.show()
112
return True
113
114
def _create_file_view(self):
115
self.file_store = gtk.ListStore(gobject.TYPE_BOOLEAN, # [0] checkbox
116
gobject.TYPE_STRING, # [1] path to display
117
gobject.TYPE_STRING, # [2] changes type
118
gobject.TYPE_STRING) # [3] real path
119
self.file_view.set_model(self.file_store)
120
crt = gtk.CellRendererToggle()
121
crt.set_property("activatable", True)
122
crt.connect("toggled", self._toggle_commit, self.file_store)
123
self.file_view.append_column(gtk.TreeViewColumn(_('Commit'),
124
crt, active=0))
125
self.file_view.append_column(gtk.TreeViewColumn(_('Path'),
126
gtk.CellRendererText(), text=1))
127
self.file_view.append_column(gtk.TreeViewColumn(_('Type'),
128
gtk.CellRendererText(), text=2))
129
130
for path, id, kind in self.delta.added:
131
marker = osutils.kind_marker(kind)
132
self.file_store.append([ True, path+marker, _('added'), path ])
133
134
for path, id, kind in self.delta.removed:
135
marker = osutils.kind_marker(kind)
136
self.file_store.append([ True, path+marker, _('removed'), path ])
137
138
for oldpath, newpath, id, kind, text_modified, meta_modified in self.delta.renamed:
139
marker = osutils.kind_marker(kind)
140
if text_modified or meta_modified:
141
changes = _('renamed and modified')
142
else:
143
changes = _('renamed')
144
self.file_store.append([ True,
145
oldpath+marker + ' => ' + newpath+marker,
146
changes,
147
newpath
148
])
149
150
for path, id, kind, text_modified, meta_modified in self.delta.modified:
151
marker = osutils.kind_marker(kind)
152
self.file_store.append([ True, path+marker, _('modified'), path ])
153
154
def _create_pending_merges(self):
155
if not self.pending:
156
# hide unused pending merge part
157
scrolled_window = self.glade.get_widget('scrolledwindow_commit_pending')
158
parent = scrolled_window.get_parent()
159
parent.remove(scrolled_window)
160
parent = self.pending_label.get_parent()
161
parent.remove(self.pending_label)
162
return
163
164
liststore = gtk.ListStore(gobject.TYPE_STRING,
165
gobject.TYPE_STRING,
166
gobject.TYPE_STRING)
167
self.pending_view.set_model(liststore)
168
169
self.pending_view.append_column(gtk.TreeViewColumn(_('Date'),
170
gtk.CellRendererText(), text=0))
171
self.pending_view.append_column(gtk.TreeViewColumn(_('Committer'),
172
gtk.CellRendererText(), text=1))
173
self.pending_view.append_column(gtk.TreeViewColumn(_('Summary'),
174
gtk.CellRendererText(), text=2))
175
176
for item in self.pending:
177
liststore.append([ item['date'],
178
item['committer'],
179
item['summary'] ])
180
181
def _get_specific_files(self):
182
ret = []
183
it = self.file_store.get_iter_first()
184
while it:
185
if self.file_store.get_value(it, 0):
186
# get real path from hidden column 3
187
ret.append(self.file_store.get_value(it, 3))
188
it = self.file_store.iter_next(it)
189
190
return ret
191
192
def _toggle_commit(self, cell, path, model):
193
model[path][0] = not model[path][0]
194
return
195
196
def _pending_merges(self, wt):
197
""" Return a list of pending merges or None if there are none of them. """
198
parents = wt.get_parent_ids()
199
if len(parents) < 2:
200
return None
201
202
import re
203
from bzrlib.osutils import format_date
204
205
pending = parents[1:]
206
branch = wt.branch
207
last_revision = parents[0]
208
209
if last_revision is not None:
210
try:
211
ignore = set(branch.repository.get_ancestry(last_revision))
212
except errors.NoSuchRevision:
213
# the last revision is a ghost : assume everything is new
214
# except for it
215
ignore = set([None, last_revision])
216
else:
217
ignore = set([None])
218
219
pm = []
220
for merge in pending:
221
ignore.add(merge)
222
try:
223
m_revision = branch.repository.get_revision(merge)
224
225
rev = {}
226
rev['committer'] = re.sub('<.*@.*>', '', m_revision.committer).strip(' ')
227
rev['summary'] = m_revision.get_summary()
228
rev['date'] = format_date(m_revision.timestamp,
229
m_revision.timezone or 0,
230
'original', date_fmt="%Y-%m-%d",
231
show_offset=False)
232
233
pm.append(rev)
234
235
inner_merges = branch.repository.get_ancestry(merge)
236
assert inner_merges[0] is None
237
inner_merges.pop(0)
238
inner_merges.reverse()
239
for mmerge in inner_merges:
240
if mmerge in ignore:
241
continue
242
mm_revision = branch.repository.get_revision(mmerge)
243
244
rev = {}
245
rev['committer'] = re.sub('<.*@.*>', '', mm_revision.committer).strip(' ')
246
rev['summary'] = mm_revision.get_summary()
247
rev['date'] = format_date(mm_revision.timestamp,
248
mm_revision.timezone or 0,
249
'original', date_fmt="%Y-%m-%d",
250
show_offset=False)
251
252
pm.append(rev)
253
254
ignore.add(mmerge)
255
except errors.NoSuchRevision:
256
print "DEBUG: NoSuchRevision:", merge
257
258
return pm
259
260
def commit(self, widget):
261
textbuffer = self.textview.get_buffer()
262
start, end = textbuffer.get_bounds()
263
message = textbuffer.get_text(start, end).decode('utf-8')
264
265
checkbutton_strict = self.glade.get_widget('checkbutton_commit_strict')
266
checkbutton_force = self.glade.get_widget('checkbutton_commit_force')
267
268
if not self.pending:
269
specific_files = self._get_specific_files()
270
else:
271
specific_files = None
272
273
if message == '':
274
response = question_dialog('Commit with an empty message ?',
275
'You can describe your commit intent'
276
+' in the message')
277
if response == gtk.RESPONSE_NO:
278
# Kindly give focus to message area
279
self.textview.grab_focus()
280
return
281
282
try:
283
self.wt.commit(message,
284
allow_pointless=checkbutton_force.get_active(),
285
strict=checkbutton_strict.get_active(),
286
local=self.checkbutton_local.get_active(),
287
specific_files=specific_files)
288
except errors.NotBranchError:
289
error_dialog(_('Directory is not a branch'),
290
_('You can perform this action only in a branch.'))
291
return
292
except errors.LocalRequiresBoundBranch:
293
error_dialog(_('Directory is not a checkout'),
294
_('You can perform local commit only on checkouts.'))
295
return
296
except errors.PointlessCommit:
297
error_dialog(_('No changes to commit'),
298
_('Try force commit if you want to commit anyway.'))
299
return
300
except errors.ConflictsInTree:
301
error_dialog(_('Conflicts in tree'),
302
_('You need to resolve the conflicts before committing.'))
303
return
304
except errors.StrictCommitFailed:
305
error_dialog(_('Strict commit failed'),
306
_('There are unknown files in the working tree.\nPlease add or delete them.'))
307
return
308
except errors.BoundBranchOutOfDate, errmsg:
309
error_dialog(_('Bound branch is out of date'),
310
_('%s') % errmsg)
311
return
312
except errors.BzrError, msg:
313
error_dialog(_('Unknown bzr error'), str(msg))
314
return
315
except Exception, msg:
316
error_dialog(_('Unknown error'), str(msg))
317
return
318
319
self.close()
320
321
def close(self, widget=None):
322
self.window.destroy()
323
324
class CommitDialogNew(gtk.Dialog):
325
""" New implementation of the Commit dialog. """
326
def __init__(self, wt, wtpath, notbranch, selected=None, parent=None):
327
""" Initialize the Commit Dialog. """
328
gtk.Dialog.__init__(self, title="Commit - Olive",
329
parent=parent,
330
flags=0,
331
buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
332
333
# Get arguments
334
self.wt = wt
335
self.wtpath = wtpath
336
self.notbranch = notbranch
337
self.selected = selected
338
339
# Set the delta
340
self.old_tree = self.wt.branch.repository.revision_tree(self.wt.branch.last_revision())
341
self.delta = self.wt.changes_from(self.old_tree)
342
343
# Get pending merges
344
self.pending = self._pending_merges(self.wt)
345
346
# Do some preliminary checks
347
self._is_checkout = False
348
self._is_pending = False
349
if self.wt is None and not self.notbranch:
350
error_dialog(_('Directory does not have a working tree'),
351
_('Operation aborted.'))
352
self.close()
353
return
354
355
if self.notbranch:
356
error_dialog(_('Directory is not a branch'),
357
_('You can perform this action only in a branch.'))
358
self.close()
359
return
360
else:
361
if self.wt.branch.get_bound_location() is not None:
362
# we have a checkout, so the local commit checkbox must appear
363
self._is_checkout = True
364
365
if self.pending:
366
# There are pending merges, file selection not supported
367
self._is_pending = True
368
369
# Create the widgets
370
self._button_commit = gtk.Button(_("Comm_it"), use_underline=True)
371
if self._is_checkout:
372
self._check_local = gtk.CheckButton(_("_Local only commit (works in checkouts)"),
373
use_underline=True)
374
self._check_strict = gtk.CheckButton(_("_Strict commit (fails if unknown files are present)"),
375
use_underline=True)
376
self._expander_files = gtk.Expander(_("Please select the file(s) to commit"))
377
self._vpaned_main = gtk.VPaned()
378
self._scrolledwindow_files = gtk.ScrolledWindow()
379
self._scrolledwindow_message = gtk.ScrolledWindow()
380
self._treeview_files = gtk.TreeView()
381
self._vbox_message = gtk.VBox()
382
self._label_message = gtk.Label(_("Please specify a commit message:"))
383
self._textview_message = gtk.TextView()
384
385
if self._is_pending:
386
self._expander_merges = gtk.Expander(_("Pending merges"))
387
self._vpaned_list = gtk.VPaned()
388
self._scrolledwindow_merges = gtk.ScrolledWindow()
389
self._treeview_merges = gtk.TreeView()
390
391
# Set callbacks
392
self._button_commit.connect('clicked', self._on_commit_clicked)
393
self._treeview_files.connect('row_activated', self._on_treeview_files_row_activated)
394
395
# Set properties
396
self._scrolledwindow_files.set_policy(gtk.POLICY_AUTOMATIC,
397
gtk.POLICY_AUTOMATIC)
398
self._scrolledwindow_message.set_policy(gtk.POLICY_AUTOMATIC,
399
gtk.POLICY_AUTOMATIC)
400
self._textview_message.modify_font(pango.FontDescription("Monospace"))
401
self.set_default_size(500, 500)
402
self._vpaned_main.set_position(200)
403
404
if self._is_pending:
405
self._scrolledwindow_merges.set_policy(gtk.POLICY_AUTOMATIC,
406
gtk.POLICY_AUTOMATIC)
407
self._treeview_files.set_sensitive(False)
408
409
# Construct the dialog
410
self.action_area.pack_end(self._button_commit)
411
412
self._scrolledwindow_files.add(self._treeview_files)
413
self._scrolledwindow_message.add(self._textview_message)
414
415
self._expander_files.add(self._scrolledwindow_files)
416
417
self._vbox_message.pack_start(self._label_message, False, False)
418
self._vbox_message.pack_start(self._scrolledwindow_message, True, True)
419
420
if self._is_pending:
421
self._expander_merges.add(self._scrolledwindow_merges)
422
self._scrolledwindow_merges.add(self._treeview_merges)
423
self._vpaned_list.add1(self._expander_files)
424
self._vpaned_list.add2(self._expander_merges)
425
self._vpaned_main.add1(self._vpaned_list)
426
else:
427
self._vpaned_main.add1(self._expander_files)
428
429
self._vpaned_main.add2(self._vbox_message)
430
431
self.vbox.pack_start(self._vpaned_main, True, True)
432
if self._is_checkout:
433
self.vbox.pack_start(self._check_local, False, False)
434
self.vbox.pack_start(self._check_strict, False, False)
435
436
# Create the file list
437
self._create_file_view()
438
# Create the pending merges
439
self._create_pending_merges()
440
441
# Expand the corresponding expander
442
if self._is_pending:
443
self._expander_merges.set_expanded(True)
444
else:
445
self._expander_files.set_expanded(True)
446
447
# Display dialog
448
self.vbox.show_all()
449
450
def _on_treeview_files_row_activated(self, treeview, path, view_column):
451
# FIXME: the diff window freezes for some reason
452
treeselection = treeview.get_selection()
453
(model, iter) = treeselection.get_selected()
454
455
if iter is not None:
456
from olive import DiffWindow
457
458
_selected = model.get_value(iter, 1)
459
460
diff = DiffWindow()
461
parent_tree = self.wt.branch.repository.revision_tree(self.wt.branch.last_revision())
462
diff.set_diff(self.wt.branch.nick, self.wt, parent_tree)
463
try:
464
diff.set_file(_selected)
465
except errors.NoSuchFile:
466
pass
467
diff.show()
468
469
@show_bzr_error
470
def _on_commit_clicked(self, button):
471
""" Commit button clicked handler. """
472
textbuffer = self._textview_message.get_buffer()
473
start, end = textbuffer.get_bounds()
474
message = textbuffer.get_text(start, end).decode('utf-8')
475
476
if not self.pending:
477
specific_files = self._get_specific_files()
478
else:
479
specific_files = None
480
481
if message == '':
482
response = question_dialog(_('Commit with an empty message?'),
483
_('You can describe your commit intent in the message.'))
484
if response == gtk.RESPONSE_NO:
485
# Kindly give focus to message area
486
self._textview_message.grab_focus()
487
return
488
489
if self._is_checkout:
490
local = self._check_local.get_active()
491
else:
492
local = False
493
494
try:
495
self.wt.commit(message,
496
allow_pointless=False,
497
strict=self._check_strict.get_active(),
498
local=local,
499
specific_files=specific_files)
500
except errors.PointlessCommit:
501
response = question_dialog(_('Commit with no changes?'),
502
_('There are no changes in the working tree.'))
503
if response == gtk.RESPONSE_YES:
504
self.wt.commit(message,
505
allow_pointless=True,
506
strict=self._check_strict.get_active(),
507
local=local,
508
specific_files=specific_files)
509
self.response(gtk.RESPONSE_OK)
510
511
def _pending_merges(self, wt):
512
""" Return a list of pending merges or None if there are none of them. """
513
parents = wt.get_parent_ids()
514
if len(parents) < 2:
515
return None
516
517
import re
518
from bzrlib.osutils import format_date
519
520
pending = parents[1:]
521
branch = wt.branch
522
last_revision = parents[0]
523
524
if last_revision is not None:
525
try:
526
ignore = set(branch.repository.get_ancestry(last_revision))
527
except errors.NoSuchRevision:
528
# the last revision is a ghost : assume everything is new
529
# except for it
530
ignore = set([None, last_revision])
531
else:
532
ignore = set([None])
533
534
pm = []
535
for merge in pending:
536
ignore.add(merge)
537
try:
538
m_revision = branch.repository.get_revision(merge)
539
540
rev = {}
541
rev['committer'] = re.sub('<.*@.*>', '', m_revision.committer).strip(' ')
542
rev['summary'] = m_revision.get_summary()
543
rev['date'] = format_date(m_revision.timestamp,
544
m_revision.timezone or 0,
545
'original', date_fmt="%Y-%m-%d",
546
show_offset=False)
547
548
pm.append(rev)
549
550
inner_merges = branch.repository.get_ancestry(merge)
551
assert inner_merges[0] is None
552
inner_merges.pop(0)
553
inner_merges.reverse()
554
for mmerge in inner_merges:
555
if mmerge in ignore:
556
continue
557
mm_revision = branch.repository.get_revision(mmerge)
558
559
rev = {}
560
rev['committer'] = re.sub('<.*@.*>', '', mm_revision.committer).strip(' ')
561
rev['summary'] = mm_revision.get_summary()
562
rev['date'] = format_date(mm_revision.timestamp,
563
mm_revision.timezone or 0,
564
'original', date_fmt="%Y-%m-%d",
565
show_offset=False)
566
567
pm.append(rev)
568
569
ignore.add(mmerge)
570
except errors.NoSuchRevision:
571
print "DEBUG: NoSuchRevision:", merge
572
573
return pm
574
575
def _create_file_view(self):
576
self._file_store = gtk.ListStore(gobject.TYPE_BOOLEAN, # [0] checkbox
577
gobject.TYPE_STRING, # [1] path to display
578
gobject.TYPE_STRING, # [2] changes type
579
gobject.TYPE_STRING) # [3] real path
580
self._treeview_files.set_model(self._file_store)
581
crt = gtk.CellRendererToggle()
582
crt.set_property("activatable", True)
583
crt.connect("toggled", self._toggle_commit, self._file_store)
584
self._treeview_files.append_column(gtk.TreeViewColumn(_('Commit'),
585
crt, active=0))
586
self._treeview_files.append_column(gtk.TreeViewColumn(_('Path'),
587
gtk.CellRendererText(), text=1))
588
self._treeview_files.append_column(gtk.TreeViewColumn(_('Type'),
589
gtk.CellRendererText(), text=2))
590
591
for path, id, kind in self.delta.added:
592
marker = osutils.kind_marker(kind)
593
self._file_store.append([ True, path+marker, _('added'), path ])
594
595
for path, id, kind in self.delta.removed:
596
marker = osutils.kind_marker(kind)
597
self._file_store.append([ True, path+marker, _('removed'), path ])
598
599
for oldpath, newpath, id, kind, text_modified, meta_modified in self.delta.renamed:
600
marker = osutils.kind_marker(kind)
601
if text_modified or meta_modified:
602
changes = _('renamed and modified')
603
else:
604
changes = _('renamed')
605
self._file_store.append([ True,
606
oldpath+marker + ' => ' + newpath+marker,
607
changes,
608
newpath
609
])
610
611
for path, id, kind, text_modified, meta_modified in self.delta.modified:
612
marker = osutils.kind_marker(kind)
613
self._file_store.append([ True, path+marker, _('modified'), path ])
614
615
def _create_pending_merges(self):
616
if not self.pending:
617
return
618
619
liststore = gtk.ListStore(gobject.TYPE_STRING,
620
gobject.TYPE_STRING,
621
gobject.TYPE_STRING)
622
self._treeview_merges.set_model(liststore)
623
624
self._treeview_merges.append_column(gtk.TreeViewColumn(_('Date'),
625
gtk.CellRendererText(), text=0))
626
self._treeview_merges.append_column(gtk.TreeViewColumn(_('Committer'),
627
gtk.CellRendererText(), text=1))
628
self._treeview_merges.append_column(gtk.TreeViewColumn(_('Summary'),
629
gtk.CellRendererText(), text=2))
630
631
for item in self.pending:
632
liststore.append([ item['date'],
633
item['committer'],
634
item['summary'] ])
635
636
def _get_specific_files(self):
637
ret = []
638
it = self._file_store.get_iter_first()
639
while it:
640
if self._file_store.get_value(it, 0):
641
# get real path from hidden column 3
642
ret.append(self._file_store.get_value(it, 3))
643
it = self._file_store.iter_next(it)
644
645
return ret
646
647
def _toggle_commit(self, cell, path, model):
648
model[path][0] = not model[path][0]
649
return
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0