/b-gtk/fix-viz

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

  • Committer: Curtis Hovey
  • Date: 2012-02-03 19:49:55 UTC
  • mto: This revision was merged to the branch mainline in revision 773.
  • Revision ID: sinzui.is@verizon.net-20120203194955-69jvr0mgu8igea0i
Updated bzr-notify to gtk3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
commit.py
21
21
from gi.repository import GObject
22
22
from gi.repository import Pango
23
23
 
24
 
try:
25
 
    from bzrlib import bencode
26
 
except ImportError:
27
 
    from bzrlib.util import bencode
28
 
 
29
24
from bzrlib import (
 
25
    bencode,
30
26
    errors,
 
27
    osutils,
31
28
    trace,
32
29
    )
33
30
from bzrlib.plugins.gtk.dialog import question_dialog
62
59
    last_revision = parents[0]
63
60
 
64
61
    if last_revision is not None:
65
 
        try:
66
 
            ignore = set(branch.repository.get_ancestry(last_revision,
67
 
                                                        topo_sorted=False))
68
 
        except errors.NoSuchRevision:
69
 
            # the last revision is a ghost : assume everything is new
70
 
            # except for it
71
 
            ignore = set([None, last_revision])
 
62
        graph = branch.repository.get_graph()
 
63
        ignore = set([r for r,ps in graph.iter_ancestry([last_revision])])
72
64
    else:
73
 
        ignore = set([None])
 
65
        ignore = set([])
74
66
 
75
67
    pm = []
76
68
    for merge in pending:
101
93
def _sanitize_and_decode_message(utf8_message):
102
94
    """Turn a utf-8 message into a sanitized Unicode message."""
103
95
    fixed_newline = _newline_variants_re.sub('\n', utf8_message)
104
 
    return fixed_newline.decode('utf-8')
 
96
    return osutils.safe_unicode(fixed_newline)
105
97
 
106
98
 
107
99
class CommitDialog(Gtk.Dialog):
122
114
        self._enable_per_file_commits = True
123
115
        self._commit_all_changes = True
124
116
        self.committed_revision_id = None # Nothing has been committed yet
 
117
        self._last_selected_file = None
125
118
        self._saved_commit_messages_manager = SavedCommitMessagesManager(
126
119
            self._wt, self._wt.branch)
127
120
 
133
126
        """Setup the member variables for state."""
134
127
        self._basis_tree = self._wt.basis_tree()
135
128
        self._delta = None
136
 
        self._pending = pending_revisions(self._wt)
 
129
        self._wt.lock_read()
 
130
        try:
 
131
            self._pending = pending_revisions(self._wt)
 
132
        finally:
 
133
            self._wt.unlock()
137
134
 
138
135
        self._is_checkout = (self._wt.branch.get_bound_location() is not None)
139
136
 
191
188
 
192
189
        all_enabled = (self._selected is None)
193
190
        # The first entry is always the 'whole tree'
194
 
        all_iter = store.append([None, None, all_enabled, 'All Files', '', ''])
 
191
        all_iter = store.append(["", "", all_enabled, 'All Files', '', ''])
195
192
        initial_cursor = store.get_path(all_iter)
196
193
        # should we pass specific_files?
197
194
        self._wt.lock_read()
448
445
                                     self._on_treeview_files_cursor_changed)
449
446
 
450
447
    def _toggle_commit(self, cell, path, model):
451
 
        if model[path][0] is None: # No file_id means 'All Files'
 
448
        if model[path][0] == "": # No file_id means 'All Files'
452
449
            new_val = not model[path][2]
453
450
            for node in model:
454
451
                node[2] = new_val
571
568
 
572
569
    def _on_treeview_files_cursor_changed(self, treeview):
573
570
        treeselection = treeview.get_selection()
 
571
        if treeselection is None:
 
572
            # The treeview was probably destroyed as the dialog closes.
 
573
            return
574
574
        (model, selection) = treeselection.get_selected()
575
575
 
576
576
        if selection is not None:
577
577
            path, display_path = model.get(selection, 1, 3)
578
578
            self._diff_label.set_text(_i18n('Diff for ') + display_path)
579
 
            if path is None:
 
579
            if path == "":
580
580
                self._diff_view.show_diff(None)
581
581
            else:
582
 
                self._diff_view.show_diff([path.decode('UTF-8')])
 
582
                self._diff_view.show_diff([osutils.safe_unicode(path)])
583
583
            self._update_per_file_info(selection)
584
584
 
585
585
    def _on_accel_next(self, accel_group, window, keyval, modifier):
597
597
            # selected. Either way, select All Files, and jump to the global
598
598
            # commit message.
599
599
            self._treeview_files.set_cursor(
600
 
                Gtk.TreePath(path=0), None, False)
 
600
                Gtk.TreePath(path=0), "", False)
601
601
            self._global_message_text_view.grab_focus()
602
602
        else:
603
603
            # Set the cursor to this entry, and jump to the per-file commit
622
622
        self._save_current_file_message()
623
623
        text_buffer = self._file_message_text_view.get_buffer()
624
624
        file_id, display_path, message = self._files_store.get(selection, 0, 3, 5)
625
 
        if file_id is None: # Whole tree
 
625
        if file_id == "": # Whole tree
626
626
            self._file_message_expander.set_label(_i18n('File commit message'))
627
627
            self._file_message_expander.set_expanded(False)
628
628
            self._file_message_expander.set_sensitive(False)
645
645
        files = []
646
646
        records = iter(self._files_store)
647
647
        rec = records.next() # Skip the All Files record
648
 
        assert rec[0] is None, "Are we skipping the wrong record?"
 
648
        assert rec[0] == "", "Are we skipping the wrong record?"
649
649
 
650
650
        file_info = []
651
651
        for record in records:
652
652
            if self._commit_all_changes or record[2]:# [2] checkbox
653
 
                file_id = record[0] # [0] file_id
654
 
                path = record[1]    # [1] real path
 
653
                file_id = osutils.safe_utf8(record[0]) # [0] file_id
 
654
                path = osutils.safe_utf8(record[1])    # [1] real path
655
655
                # [5] commit message
656
656
                file_message = _sanitize_and_decode_message(record[5])
657
657
                files.append(path.decode('UTF-8'))