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 commit.py
- browse files at revision 793.1.1
- compare with another revision
- download diff
- download tarball
- view history from revision 793.1.1
- Committer: Jelmer Vernooij
- Date: 2012-07-09 15:23:26 UTC
- mto: This revision was merged to the branch mainline in revision 794.
- Revision ID: jelmer@samba.org-20120709152326-dzxb8zoz0btull7n
Remove bzr-notify.
- files added:
- commitmsgs.py
- files removed:
- bzr-notify
- files modified:
- AUTHORS
added
removed
commit.py
16
16
17
17
import re
18
18
19
try:
20
import pygtk
21
pygtk.require("2.0")
22
except:
23
pass
24
19
from gi.repository import Gdk
25
20
from gi.repository import Gtk
26
21
from gi.repository import GObject
27
22
from gi.repository import Pango
28
23
29
24
from bzrlib import (
25
bencode,
30
26
errors,
31
27
osutils,
28
revision as _mod_revision,
32
29
trace,
30
tsort,
33
31
)
34
try:
35
from bzrlib import bencode
36
except ImportError:
37
from bzrlib.util import bencode
38
39
32
from bzrlib.plugins.gtk.dialog import question_dialog
33
from bzrlib.plugins.gtk.diff import DiffView
40
34
from bzrlib.plugins.gtk.errors import show_bzr_error
41
35
from bzrlib.plugins.gtk.i18n import _i18n
36
from bzrlib.plugins.gtk.commitmsgs import SavedCommitMessagesManager
42
37
43
38
try:
44
39
import dbus
48
43
have_dbus = False
49
44
50
45
46
def _get_sorted_revisions(tip_revision, revision_ids, parent_map):
47
"""Get an iterator which will return the revisions in merge sorted order.
48
49
This will build up a list of all nodes, such that only nodes in the list
50
are referenced. It then uses MergeSorter to return them in 'merge-sorted'
51
order.
52
53
:param revision_ids: A set of revision_ids
54
:param parent_map: The parent information for each node. Revisions which
55
are considered ghosts should not be present in the map.
56
:return: iterator from MergeSorter.iter_topo_order()
57
"""
58
# MergeSorter requires that all nodes be present in the graph, so get rid
59
# of any references pointing outside of this graph.
60
parent_graph = {}
61
for revision_id in revision_ids:
62
if revision_id not in parent_map: # ghost
63
parent_graph[revision_id] = []
64
else:
65
# Only include parents which are in this sub-graph
66
parent_graph[revision_id] = [p for p in parent_map[revision_id]
67
if p in revision_ids]
68
sorter = tsort.MergeSorter(parent_graph, tip_revision)
69
return sorter.iter_topo_order()
70
71
51
72
def pending_revisions(wt):
52
73
"""Return a list of pending merges or None if there are none of them.
53
74
58
79
"""
59
80
parents = wt.get_parent_ids()
60
81
if len(parents) < 2:
61
return None
82
return
62
83
63
84
# The basic pending merge algorithm uses the same algorithm as
64
85
# bzrlib.status.show_pending_merges
66
87
branch = wt.branch
67
88
last_revision = parents[0]
68
89
69
if last_revision is not None:
70
try:
71
ignore = set(branch.repository.get_ancestry(last_revision,
72
topo_sorted=False))
73
except errors.NoSuchRevision:
74
# the last revision is a ghost : assume everything is new
75
# except for it
76
ignore = set([None, last_revision])
77
else:
78
ignore = set([None])
90
graph = branch.repository.get_graph()
91
other_revisions = [last_revision]
79
92
80
93
pm = []
81
94
for merge in pending:
82
ignore.add(merge)
83
try:
84
rev = branch.repository.get_revision(merge)
85
children = []
86
pm.append((rev, children))
87
88
# This does need to be topo sorted, so we search backwards
89
inner_merges = branch.repository.get_ancestry(merge)
90
assert inner_merges[0] is None
91
inner_merges.pop(0)
92
for mmerge in reversed(inner_merges):
93
if mmerge in ignore:
94
continue
95
rev = branch.repository.get_revision(mmerge)
96
children.append(rev)
97
98
ignore.add(mmerge)
99
except errors.NoSuchRevision:
100
print "DEBUG: NoSuchRevision:", merge
101
102
return pm
95
try:
96
merge_rev = branch.repository.get_revision(merge)
97
except errors.NoSuchRevision:
98
# If we are missing a revision, just print out the revision id
99
trace.mutter("ghost: %r", merge)
100
other_revisions.append(merge)
101
continue
102
103
# Find all of the revisions in the merge source, which are not in the
104
# last committed revision.
105
merge_extra = graph.find_unique_ancestors(merge, other_revisions)
106
other_revisions.append(merge)
107
merge_extra.discard(_mod_revision.NULL_REVISION)
108
109
# Get a handle to all of the revisions we will need
110
try:
111
revisions = dict((rev.revision_id, rev) for rev in
112
branch.repository.get_revisions(merge_extra))
113
except errors.NoSuchRevision:
114
# One of the sub nodes is a ghost, check each one
115
revisions = {}
116
for revision_id in merge_extra:
117
try:
118
rev = branch.repository.get_revisions([revision_id])[0]
119
except errors.NoSuchRevision:
120
revisions[revision_id] = None
121
else:
122
revisions[revision_id] = rev
123
124
# Display the revisions brought in by this merge.
125
rev_id_iterator = _get_sorted_revisions(merge, merge_extra,
126
branch.repository.get_parent_map(merge_extra))
127
# Skip the first node
128
num, first, depth, eom = rev_id_iterator.next()
129
if first != merge:
130
raise AssertionError('Somehow we misunderstood how'
131
' iter_topo_order works %s != %s' % (first, merge))
132
children = []
133
for num, sub_merge, depth, eom in rev_id_iterator:
134
rev = revisions[sub_merge]
135
if rev is None:
136
trace.warning("ghost: %r", sub_merge)
137
continue
138
children.append(rev)
139
yield (merge_rev, children)
103
140
104
141
105
142
_newline_variants_re = re.compile(r'\r\n?')
106
143
def _sanitize_and_decode_message(utf8_message):
107
144
"""Turn a utf-8 message into a sanitized Unicode message."""
108
145
fixed_newline = _newline_variants_re.sub('\n', utf8_message)
109
return fixed_newline.decode('utf-8')
146
return osutils.safe_unicode(fixed_newline)
110
147
111
148
112
149
class CommitDialog(Gtk.Dialog):
113
150
"""Implementation of Commit."""
114
151
115
152
def __init__(self, wt, selected=None, parent=None):
116
GObject.GObject.__init__(self, title="Commit to %s" % wt.basedir,
117
parent=parent, flags=0,)
153
super(CommitDialog, self).__init__(
154
title="Commit to %s" % wt.basedir, parent=parent, flags=0)
118
155
self.connect('delete-event', self._on_delete_window)
119
156
self._question_dialog = question_dialog
120
157
127
164
self._enable_per_file_commits = True
128
165
self._commit_all_changes = True
129
166
self.committed_revision_id = None # Nothing has been committed yet
130
self._saved_commit_messages_manager = SavedCommitMessagesManager(self._wt, self._wt.branch)
167
self._last_selected_file = None
168
self._saved_commit_messages_manager = SavedCommitMessagesManager(
169
self._wt, self._wt.branch)
131
170
132
171
self.setup_params()
133
172
self.construct()
137
176
"""Setup the member variables for state."""
138
177
self._basis_tree = self._wt.basis_tree()
139
178
self._delta = None
140
self._pending = pending_revisions(self._wt)
179
self._wt.lock_read()
180
try:
181
self._pending = list(pending_revisions(self._wt))
182
finally:
183
self._wt.unlock()
141
184
142
185
self._is_checkout = (self._wt.branch.get_bound_location() is not None)
143
186
195
238
196
239
all_enabled = (self._selected is None)
197
240
# The first entry is always the 'whole tree'
198
all_iter = store.append([None, None, all_enabled, 'All Files', '', ''])
241
all_iter = store.append(["", "", all_enabled, 'All Files', '', ''])
199
242
initial_cursor = store.get_path(all_iter)
200
243
# should we pass specific_files?
201
244
self._wt.lock_read()
232
275
# This sets the cursor, which causes the expander to close, which
233
276
# causes the _file_message_text_view to never get realized. So we have
234
277
# to give it a little kick, or it warns when we try to grab the focus
235
self._treeview_files.set_cursor(initial_cursor)
278
self._treeview_files.set_cursor(initial_cursor, None, False)
236
279
237
280
def _realize_file_message_tree_view(*args):
238
281
self._file_message_text_view.realize()
246
289
self._check_local.hide()
247
290
return
248
291
if have_dbus:
249
bus = dbus.SystemBus()
292
try:
293
bus = dbus.SystemBus()
294
except dbus.DBusException:
295
trace.mutter("DBus system bus not available")
296
self._check_local.show()
297
return
250
298
try:
251
299
proxy_obj = bus.get_object('org.freedesktop.NetworkManager',
252
300
'/org/freedesktop/NetworkManager')
254
302
trace.mutter("networkmanager not available.")
255
303
self._check_local.show()
256
304
return
257
305
258
306
dbus_iface = dbus.Interface(proxy_obj,
259
307
'org.freedesktop.NetworkManager')
260
308
try:
286
334
"""Build up the dialog widgets."""
287
335
# The primary pane which splits it into left and right (adjustable)
288
336
# sections.
289
self._hpane = Gtk.HPaned()
337
self._hpane = Gtk.Paned.new(Gtk.Orientation.HORIZONTAL)
290
338
291
339
self._construct_left_pane()
292
340
self._construct_right_pane()
293
341
self._construct_action_pane()
294
342
295
self.vbox.pack_start(self._hpane, True, True, 0)
343
self.get_content_area().pack_start(self._hpane, True, True, 0)
296
344
self._hpane.show()
297
345
self.set_focus(self._global_message_text_view)
298
346
318
366
319
367
def _construct_accelerators(self):
320
368
group = Gtk.AccelGroup()
321
group.connect_group(Gdk.keyval_from_name('N'),
322
Gdk.EventMask.CONTROL_MASK, 0, self._on_accel_next)
369
group.connect(Gdk.keyval_from_name('N'),
370
Gdk.ModifierType.CONTROL_MASK, 0, self._on_accel_next)
323
371
self.add_accel_group(group)
324
372
325
373
# ignore the escape key (avoid closing the window)
332
380
333
381
self._check_local = Gtk.CheckButton(_i18n("_Only commit locally"),
334
382
use_underline=True)
335
self._left_pane_box.pack_end(self._check_local, False, False)
383
self._left_pane_box.pack_end(self._check_local, False, False, 0)
336
384
self._check_local.set_active(False)
337
385
338
386
self._hpane.pack1(self._left_pane_box, resize=False, shrink=False)
360
408
self._button_cancel = Gtk.Button(stock=Gtk.STOCK_CANCEL)
361
409
self._button_cancel.connect('clicked', self._on_cancel_clicked)
362
410
self._button_cancel.show()
363
self.action_area.pack_end(self._button_cancel)
411
self.get_action_area().pack_end(
412
self._button_cancel, True, True, 0)
364
413
self._button_commit = Gtk.Button(_i18n("Comm_it"), use_underline=True)
365
414
self._button_commit.connect('clicked', self._on_commit_clicked)
366
415
self._button_commit.set_can_default(True)
367
416
self._button_commit.show()
368
self.action_area.pack_end(self._button_commit)
417
self.get_action_area().pack_end(
418
self._button_commit, True, True, 0)
369
419
self._button_commit.grab_default()
370
420
371
421
def _add_to_right_table(self, widget, weight, expanding=False):
391
441
# file_label.show()
392
442
self._files_box.pack_start(file_label, False, True, 0)
393
443
394
self._commit_all_files_radio = Gtk.RadioButton(
444
self._commit_all_files_radio = Gtk.RadioButton.new_with_label(
395
445
None, _i18n("Commit all changes"))
396
446
self._files_box.pack_start(self._commit_all_files_radio, False, True, 0)
397
447
self._commit_all_files_radio.show()
398
448
self._commit_all_files_radio.connect('toggled',
399
449
self._toggle_commit_selection)
400
self._commit_selected_radio = Gtk.RadioButton(
450
self._commit_selected_radio = Gtk.RadioButton.new_with_label_from_widget(
401
451
self._commit_all_files_radio, _i18n("Only commit selected changes"))
402
452
self._files_box.pack_start(self._commit_selected_radio, False, True, 0)
403
453
self._commit_selected_radio.show()
415
465
scroller.add(self._treeview_files)
416
466
scroller.set_shadow_type(Gtk.ShadowType.IN)
417
467
scroller.show()
418
self._files_box.pack_start(scroller,
419
expand=True, fill=True)
468
self._files_box.pack_start(scroller, True, True, 0)
420
469
self._files_box.show()
421
470
self._left_pane_box.pack_start(self._files_box, True, True, 0)
422
471
451
500
self._on_treeview_files_cursor_changed)
452
501
453
502
def _toggle_commit(self, cell, path, model):
454
if model[path][0] is None: # No file_id means 'All Files'
503
if model[path][0] == "": # No file_id means 'All Files'
455
504
new_val = not model[path][2]
456
505
for node in model:
457
506
node[2] = new_val
467
516
checked_col.set_visible(False)
468
517
else:
469
518
checked_col.set_visible(True)
470
renderer = checked_col.get_cell_renderers()[0]
519
renderer = checked_col.get_cells()[0]
471
520
renderer.set_property('activatable', not all_files)
472
521
473
522
def _construct_pending_list(self):
479
528
pending_message = Gtk.Label()
480
529
pending_message.set_markup(
481
530
_i18n('<i>* Cannot select specific files when merging</i>'))
482
self._pending_box.pack_start(pending_message, expand=False, padding=5)
531
self._pending_box.pack_start(pending_message, False, True, 5)
483
532
pending_message.show()
484
533
485
534
pending_label = Gtk.Label(label=_i18n('Pending Revisions'))
486
self._pending_box.pack_start(pending_label, expand=False, padding=0)
535
self._pending_box.pack_start(pending_label, False, True, 0)
487
536
pending_label.show()
488
537
489
538
scroller = Gtk.ScrolledWindow()
492
541
scroller.add(self._treeview_pending)
493
542
scroller.set_shadow_type(Gtk.ShadowType.IN)
494
543
scroller.show()
495
self._pending_box.pack_start(scroller,
496
expand=True, fill=True, padding=5)
544
self._pending_box.pack_start(scroller, True, True, 5)
497
545
self._treeview_pending.show()
498
546
self._left_pane_box.pack_start(self._pending_box, True, True, 0)
499
547
512
560
Gtk.CellRendererText(), text=3))
513
561
514
562
def _construct_diff_view(self):
515
from bzrlib.plugins.gtk.diff import DiffView
516
517
563
# TODO: jam 2007-10-30 The diff label is currently disabled. If we
518
564
# decide that we really don't ever want to display it, we should
519
565
# actually remove it, and other references to it, along with the
528
574
self._add_to_right_table(self._diff_view, 4, True)
529
575
self._diff_view.show()
530
576
577
@staticmethod
578
def get_line_height(widget):
579
pango_layout = widget.create_pango_layout("X");
580
ink_rectangle, logical_rectangle = pango_layout.get_pixel_extents()
581
return logical_rectangle.height
582
531
583
def _construct_file_message(self):
532
584
scroller = Gtk.ScrolledWindow()
533
585
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
540
592
self._file_message_text_view.modify_font(Pango.FontDescription("Monospace"))
541
593
self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
542
594
self._file_message_text_view.set_accepts_tab(False)
595
line_height = self.get_line_height(self._file_message_text_view)
596
self._file_message_text_view.set_size_request(-1, line_height * 2)
543
597
self._file_message_text_view.show()
544
598
545
self._file_message_expander = Gtk.Expander(_i18n('File commit message'))
599
self._file_message_expander = Gtk.Expander(
600
label=_i18n('File commit message'))
546
601
self._file_message_expander.set_expanded(True)
547
602
self._file_message_expander.add(scroller)
548
603
self._add_to_right_table(self._file_message_expander, 1, False)
574
629
575
630
def _on_treeview_files_cursor_changed(self, treeview):
576
631
treeselection = treeview.get_selection()
632
if treeselection is None:
633
# The treeview was probably destroyed as the dialog closes.
634
return
577
635
(model, selection) = treeselection.get_selected()
578
636
579
637
if selection is not None:
580
638
path, display_path = model.get(selection, 1, 3)
581
639
self._diff_label.set_text(_i18n('Diff for ') + display_path)
582
if path is None:
640
if path == "":
583
641
self._diff_view.show_diff(None)
584
642
else:
585
self._diff_view.show_diff([path.decode('UTF-8')])
643
self._diff_view.show_diff([osutils.safe_unicode(path)])
586
644
self._update_per_file_info(selection)
587
645
588
646
def _on_accel_next(self, accel_group, window, keyval, modifier):
599
657
# We have either made it to the end of the list, or nothing was
600
658
# selected. Either way, select All Files, and jump to the global
601
659
# commit message.
602
self._treeview_files.set_cursor((0,))
660
self._treeview_files.set_cursor(
661
Gtk.TreePath(path=0), "", False)
603
662
self._global_message_text_view.grab_focus()
604
663
else:
605
664
# Set the cursor to this entry, and jump to the per-file commit
606
665
# message
607
self._treeview_files.set_cursor(model.get_path(next))
666
self._treeview_files.set_cursor(model.get_path(next), None, False)
608
667
self._file_message_text_view.grab_focus()
609
668
610
669
def _save_current_file_message(self):
612
671
return # Nothing to save
613
672
text_buffer = self._file_message_text_view.get_buffer()
614
673
cur_text = text_buffer.get_text(text_buffer.get_start_iter(),
615
text_buffer.get_end_iter())
674
text_buffer.get_end_iter(), True)
616
675
last_selected = self._files_store.get_iter(self._last_selected_file)
617
676
self._files_store.set_value(last_selected, 5, cur_text)
618
677
624
683
self._save_current_file_message()
625
684
text_buffer = self._file_message_text_view.get_buffer()
626
685
file_id, display_path, message = self._files_store.get(selection, 0, 3, 5)
627
if file_id is None: # Whole tree
686
if file_id == "": # Whole tree
628
687
self._file_message_expander.set_label(_i18n('File commit message'))
629
688
self._file_message_expander.set_expanded(False)
630
689
self._file_message_expander.set_sensitive(False)
647
706
files = []
648
707
records = iter(self._files_store)
649
708
rec = records.next() # Skip the All Files record
650
assert rec[0] is None, "Are we skipping the wrong record?"
709
assert rec[0] == "", "Are we skipping the wrong record?"
651
710
652
711
file_info = []
653
712
for record in records:
654
713
if self._commit_all_changes or record[2]:# [2] checkbox
655
file_id = record[0] # [0] file_id
656
path = record[1] # [1] real path
714
file_id = osutils.safe_utf8(record[0]) # [0] file_id
715
path = osutils.safe_utf8(record[1]) # [1] real path
657
716
# [5] commit message
658
717
file_message = _sanitize_and_decode_message(record[5])
659
718
files.append(path.decode('UTF-8'))
766
825
def _get_global_commit_message(self):
767
826
buf = self._global_message_text_view.get_buffer()
768
827
start, end = buf.get_bounds()
769
text = buf.get_text(start, end)
828
text = buf.get_text(start, end, True)
770
829
return _sanitize_and_decode_message(text)
771
830
772
831
def _set_global_commit_message(self, message):
795
854
rev_dict['revision_id'] = rev.revision_id
796
855
return rev_dict
797
856
798
799
class SavedCommitMessagesManager:
800
"""Save glogal and per-file commit messages.
801
802
Saves global commit message and utf-8 file_id->message dictionary
803
of per-file commit messages on disk. Re-reads them later for re-using.
804
"""
805
806
def __init__(self, tree=None, branch=None):
807
"""If branch is None, builds empty messages, otherwise reads them
808
from branch's disk storage. 'tree' argument is for the future."""
809
if branch is None:
810
self.global_message = u''
811
self.file_messages = {}
812
else:
813
config = branch.get_config()
814
self.global_message = config.get_user_option(
815
'gtk_global_commit_message')
816
if self.global_message is None:
817
self.global_message = u''
818
file_messages = config.get_user_option('gtk_file_commit_messages')
819
if file_messages: # unicode and B-encoded:
820
self.file_messages = bencode.bdecode(
821
file_messages.encode('UTF-8'))
822
else:
823
self.file_messages = {}
824
825
def get(self):
826
return self.global_message, self.file_messages
827
828
def is_not_empty(self):
829
return bool(self.global_message or self.file_messages)
830
831
def insert(self, global_message, file_info):
832
"""Formats per-file commit messages (list of dictionaries, one per file)
833
into one utf-8 file_id->message dictionary and merges this with
834
previously existing dictionary. Merges global commit message too."""
835
file_messages = {}
836
for fi in file_info:
837
file_message = fi['message']
838
if file_message:
839
file_messages[fi['file_id']] = file_message # utf-8 strings
840
for k,v in file_messages.iteritems():
841
try:
842
self.file_messages[k] = v + '\n******\n' + self.file_messages[k]
843
except KeyError:
844
self.file_messages[k] = v
845
if self.global_message:
846
self.global_message = global_message + '\n******\n' \
847
+ self.global_message
848
else:
849
self.global_message = global_message
850
851
def save(self, tree, branch):
852
# We store in branch's config, which can be a problem if two gcommit
853
# are done in two checkouts of one single branch (comments overwrite
854
# each other). Ideally should be in working tree. But uncommit does
855
# not always have a working tree, though it always has a branch.
856
# 'tree' argument is for the future
857
config = branch.get_config()
858
# should it be named "gtk_" or some more neutral name ("gui_" ?) to
859
# be compatible with qbzr in the future?
860
config.set_user_option('gtk_global_commit_message', self.global_message)
861
# bencode() does not know unicode objects but set_user_option()
862
# requires one:
863
config.set_user_option(
864
'gtk_file_commit_messages',
865
bencode.bencode(self.file_messages).decode('UTF-8'))
866
867
868
def save_commit_messages(local, master, old_revno, old_revid,
869
new_revno, new_revid):
870
b = local
871
if b is None:
872
b = master
873
mgr = SavedCommitMessagesManager(None, b)
874
revid_iterator = b.repository.iter_reverse_revision_history(old_revid)
875
cur_revno = old_revno
876
new_revision_id = old_revid
877
graph = b.repository.get_graph()
878
for rev_id in revid_iterator:
879
if cur_revno == new_revno:
880
break
881
cur_revno -= 1
882
rev = b.repository.get_revision(rev_id)
883
file_info = rev.properties.get('file-info', None)
884
if file_info is None:
885
file_info = {}
886
else:
887
file_info = bencode.bdecode(file_info.encode('UTF-8'))
888
global_message = osutils.safe_unicode(rev.message)
889
# Concatenate comment of the uncommitted revision
890
mgr.insert(global_message, file_info)
891
892
parents = graph.get_parent_map([rev_id]).get(rev_id, None)
893
if not parents:
894
continue
895
mgr.save(None, b)
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0