/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz
0.8.19 by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
1
# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <szilveszter.farkas@gmail.com>
0.8.46 by Szilveszter Farkas (Phanatic)
Modified OliveDialog class interface; huge cleanups.
2
#
0.8.19 by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
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.
0.8.46 by Szilveszter Farkas (Phanatic)
Modified OliveDialog class interface; huge cleanups.
7
#
0.8.19 by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
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.
0.8.46 by Szilveszter Farkas (Phanatic)
Modified OliveDialog class interface; huge cleanups.
12
#
0.8.19 by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
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
576.1.1 by Jasper Groenewegen
Add parent setting to dialogs and implement in gcommit
17
import re
18
734.1.4 by Curtis Hovey
Updated commit to gtk3.
19
from gi.repository import Gdk
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
20
from gi.repository import Gtk
21
from gi.repository import GObject
22
from gi.repository import Pango
0.8.19 by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
23
635.2.12 by Vincent Ladeuil
Implement commit message saving without modifying bzrlib.
24
from bzrlib import (
25
    errors,
26
    osutils,
27
    trace,
28
    )
643 by Jelmer Vernooij
Fix import of bencode.
29
try:
646 by Jelmer Vernooij
Reorder bencode imports, prefer the new location to prevent deprecation warnings.
30
    from bzrlib import bencode
31
except ImportError:
643 by Jelmer Vernooij
Fix import of bencode.
32
    from bzrlib.util import bencode
0.8.20 by Szilveszter Farkas (Phanatic)
2006-07-24 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
33
576.1.1 by Jasper Groenewegen
Add parent setting to dialogs and implement in gcommit
34
from bzrlib.plugins.gtk.dialog import question_dialog
35
from bzrlib.plugins.gtk.errors import show_bzr_error
729.1.1 by Jelmer Vernooij
Move i18n support to a separate file, so gettext files aren't loaded unless bzr-gtk is used.
36
from bzrlib.plugins.gtk.i18n import _i18n
93.1.6 by Alexander Belchenko
detecting name of glade file doing in separate module (olive.gladefile)
37
158 by Jelmer Vernooij
If available, use NetworkManager to find out whether a commit should be local or not.
38
try:
39
    import dbus
40
    import dbus.glib
180 by Jelmer Vernooij
Don't obtain handle to network manager until it's actually needed.
41
    have_dbus = True
158 by Jelmer Vernooij
If available, use NetworkManager to find out whether a commit should be local or not.
42
except ImportError:
180 by Jelmer Vernooij
Don't obtain handle to network manager until it's actually needed.
43
    have_dbus = False
158 by Jelmer Vernooij
If available, use NetworkManager to find out whether a commit should be local or not.
44
278.1.4 by John Arbash Meinel
Just playing around.
45
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
46
def pending_revisions(wt):
47
    """Return a list of pending merges or None if there are none of them.
48
49
    Arguably this should be a core function, and
50
    ``bzrlib.status.show_pending_merges`` should be built on top of it.
51
52
    :return: [(rev, [children])]
53
    """
54
    parents = wt.get_parent_ids()
55
    if len(parents) < 2:
56
        return None
57
58
    # The basic pending merge algorithm uses the same algorithm as
59
    # bzrlib.status.show_pending_merges
60
    pending = parents[1:]
61
    branch = wt.branch
62
    last_revision = parents[0]
63
64
    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])
72
    else:
73
        ignore = set([None])
74
75
    pm = []
76
    for merge in pending:
77
        ignore.add(merge)
78
        try:
79
            rev = branch.repository.get_revision(merge)
80
            children = []
81
            pm.append((rev, children))
82
83
            # This does need to be topo sorted, so we search backwards
84
            inner_merges = branch.repository.get_ancestry(merge)
85
            assert inner_merges[0] is None
86
            inner_merges.pop(0)
87
            for mmerge in reversed(inner_merges):
88
                if mmerge in ignore:
89
                    continue
90
                rev = branch.repository.get_revision(mmerge)
91
                children.append(rev)
92
93
                ignore.add(mmerge)
94
        except errors.NoSuchRevision:
95
            print "DEBUG: NoSuchRevision:", merge
96
97
    return pm
98
99
622.1.1 by John Arbash Meinel
Ensure that per-file commit messages and global commit messages get sanitized.
100
_newline_variants_re = re.compile(r'\r\n?')
101
def _sanitize_and_decode_message(utf8_message):
102
    """Turn a utf-8 message into a sanitized Unicode message."""
103
    fixed_newline = _newline_variants_re.sub('\n', utf8_message)
104
    return fixed_newline.decode('utf-8')
105
106
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
107
class CommitDialog(Gtk.Dialog):
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
108
    """Implementation of Commit."""
109
110
    def __init__(self, wt, selected=None, parent=None):
734.1.51 by Curtis Hovey
Fix the initializer for many classes.
111
        super(CommitDialog, self).__init__(
112
            title="Commit to %s" % wt.basedir, parent=parent, flags=0)
635.2.7 by Vincent Ladeuil
Land Anne Mohsen's patch for bug 215674.
113
        self.connect('delete-event', self._on_delete_window)
606 by Vincent Ladeuil
Fix gtk dialogs popping up and asking for input during selftest.
114
        self._question_dialog = question_dialog
635.2.7 by Vincent Ladeuil
Land Anne Mohsen's patch for bug 215674.
115
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
116
        self.set_type_hint(Gdk.WindowTypeHint.NORMAL)
278.1.24 by John Arbash Meinel
Actually show the commit button.
117
278.1.16 by John Arbash Meinel
Implement the file changes list on top of _iter_changes rather than
118
        self._wt = wt
278.1.34 by John Arbash Meinel
Cleanup, we are still ignoring the 'selected' property, and the 'wtpath'
119
        # TODO: Do something with this value, it is used by Olive
120
        #       It used to set all changes but this one to False
278.1.16 by John Arbash Meinel
Implement the file changes list on top of _iter_changes rather than
121
        self._selected = selected
278.1.33 by John Arbash Meinel
Only enable the per-file dialog if 'per_file_commits' is enabled in the config.
122
        self._enable_per_file_commits = True
278.1.43 by John Arbash Meinel
Finish connecting the 'Commit all changes' radio buttons.
123
        self._commit_all_changes = True
278.1.23 by John Arbash Meinel
Beginning to support actual commit.
124
        self.committed_revision_id = None # Nothing has been committed yet
734.1.4 by Curtis Hovey
Updated commit to gtk3.
125
        self._saved_commit_messages_manager = SavedCommitMessagesManager(
126
            self._wt, self._wt.branch)
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
127
278.1.16 by John Arbash Meinel
Implement the file changes list on top of _iter_changes rather than
128
        self.setup_params()
129
        self.construct()
130
        self.fill_in_data()
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
131
132
    def setup_params(self):
133
        """Setup the member variables for state."""
134
        self._basis_tree = self._wt.basis_tree()
278.1.12 by John Arbash Meinel
Delay computing the delta, and clean up some of the diff view names.
135
        self._delta = None
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
136
        self._pending = pending_revisions(self._wt)
137
138
        self._is_checkout = (self._wt.branch.get_bound_location() is not None)
139
278.1.14 by John Arbash Meinel
Tests that we fill out the pending list correctly.
140
    def fill_in_data(self):
141
        # Now that we are built, handle changes to the view based on the state
142
        self._fill_in_pending()
278.1.20 by John Arbash Meinel
We always select the All Files record in the files view,
143
        self._fill_in_diff()
278.1.15 by John Arbash Meinel
Hook up the list of modified files.
144
        self._fill_in_files()
278.1.25 by John Arbash Meinel
Add the 'Only Commit Locally' checkbox, we may want to put it elsewhere, though.
145
        self._fill_in_checkout()
278.1.33 by John Arbash Meinel
Only enable the per-file dialog if 'per_file_commits' is enabled in the config.
146
        self._fill_in_per_file_info()
278.1.14 by John Arbash Meinel
Tests that we fill out the pending list correctly.
147
148
    def _fill_in_pending(self):
149
        if not self._pending:
150
            self._pending_box.hide()
151
            return
152
153
        # TODO: We'd really prefer this to be a nested list
154
        for rev, children in self._pending:
155
            rev_info = self._rev_to_pending_info(rev)
278.1.15 by John Arbash Meinel
Hook up the list of modified files.
156
            self._pending_store.append([
278.1.14 by John Arbash Meinel
Tests that we fill out the pending list correctly.
157
                rev_info['revision_id'],
158
                rev_info['date'],
159
                rev_info['committer'],
160
                rev_info['summary'],
161
                ])
162
            for child in children:
163
                rev_info = self._rev_to_pending_info(child)
278.1.15 by John Arbash Meinel
Hook up the list of modified files.
164
                self._pending_store.append([
278.1.14 by John Arbash Meinel
Tests that we fill out the pending list correctly.
165
                    rev_info['revision_id'],
166
                    rev_info['date'],
167
                    rev_info['committer'],
168
                    rev_info['summary'],
169
                    ])
170
        self._pending_box.show()
171
278.1.15 by John Arbash Meinel
Hook up the list of modified files.
172
    def _fill_in_files(self):
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
173
        # We should really use add a progress bar of some kind.
278.1.15 by John Arbash Meinel
Hook up the list of modified files.
174
        # While we fill in the view, hide the store
175
        store = self._files_store
176
        self._treeview_files.set_model(None)
177
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
178
        added = _i18n('added')
179
        removed = _i18n('removed')
180
        renamed = _i18n('renamed')
181
        renamed_and_modified = _i18n('renamed and modified')
182
        modified = _i18n('modified')
183
        kind_changed = _i18n('kind changed')
278.1.15 by John Arbash Meinel
Hook up the list of modified files.
184
278.1.16 by John Arbash Meinel
Implement the file changes list on top of _iter_changes rather than
185
        # The store holds:
278.1.21 by John Arbash Meinel
Start tracking the per-file commit messages.
186
        # [file_id, real path, checkbox, display path, changes type, message]
450 by Aaron Bentley
Update to use new Tree.iter_changes
187
        # iter_changes returns:
278.1.16 by John Arbash Meinel
Implement the file changes list on top of _iter_changes rather than
188
        # (file_id, (path_in_source, path_in_target),
189
        #  changed_content, versioned, parent, name, kind,
190
        #  executable)
191
278.1.35 by John Arbash Meinel
Make use of the 'selected' parameter to CommitDialog.
192
        all_enabled = (self._selected is None)
278.1.20 by John Arbash Meinel
We always select the All Files record in the files view,
193
        # The first entry is always the 'whole tree'
278.1.35 by John Arbash Meinel
Make use of the 'selected' parameter to CommitDialog.
194
        all_iter = store.append([None, None, all_enabled, 'All Files', '', ''])
195
        initial_cursor = store.get_path(all_iter)
278.1.16 by John Arbash Meinel
Implement the file changes list on top of _iter_changes rather than
196
        # should we pass specific_files?
197
        self._wt.lock_read()
198
        self._basis_tree.lock_read()
199
        try:
450 by Aaron Bentley
Update to use new Tree.iter_changes
200
            from diff import iter_changes_to_status
635.2.12 by Vincent Ladeuil
Implement commit message saving without modifying bzrlib.
201
            saved_file_messages = self._saved_commit_messages_manager.get()[1]
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
202
            for (file_id, real_path, change_type, display_path
450 by Aaron Bentley
Update to use new Tree.iter_changes
203
                ) in iter_changes_to_status(self._basis_tree, self._wt):
278.1.35 by John Arbash Meinel
Make use of the 'selected' parameter to CommitDialog.
204
                if self._selected and real_path != self._selected:
205
                    enabled = False
206
                else:
207
                    enabled = True
635.2.7 by Vincent Ladeuil
Land Anne Mohsen's patch for bug 215674.
208
                try:
209
                    default_message = saved_file_messages[file_id]
210
                except KeyError:
211
                    default_message = ''
278.1.35 by John Arbash Meinel
Make use of the 'selected' parameter to CommitDialog.
212
                item_iter = store.append([
213
                    file_id,
214
                    real_path.encode('UTF-8'),
215
                    enabled,
216
                    display_path.encode('UTF-8'),
217
                    change_type,
635.2.7 by Vincent Ladeuil
Land Anne Mohsen's patch for bug 215674.
218
                    default_message, # Initial comment
278.1.35 by John Arbash Meinel
Make use of the 'selected' parameter to CommitDialog.
219
                    ])
220
                if self._selected and enabled:
221
                    initial_cursor = store.get_path(item_iter)
278.1.16 by John Arbash Meinel
Implement the file changes list on top of _iter_changes rather than
222
        finally:
223
            self._basis_tree.unlock()
224
            self._wt.unlock()
278.1.15 by John Arbash Meinel
Hook up the list of modified files.
225
226
        self._treeview_files.set_model(store)
278.1.21 by John Arbash Meinel
Start tracking the per-file commit messages.
227
        self._last_selected_file = None
278.1.32 by John Arbash Meinel
Add the Ctrl+n accelerator to jump through the commit messages.
228
        # This sets the cursor, which causes the expander to close, which
229
        # causes the _file_message_text_view to never get realized. So we have
230
        # to give it a little kick, or it warns when we try to grab the focus
734.1.22 by Curtis Hovey
GtkTreeView.set_cursor(tree_path, None, False) is the default args.
231
        self._treeview_files.set_cursor(initial_cursor, None, False)
278.1.15 by John Arbash Meinel
Hook up the list of modified files.
232
278.1.32 by John Arbash Meinel
Add the Ctrl+n accelerator to jump through the commit messages.
233
        def _realize_file_message_tree_view(*args):
234
            self._file_message_text_view.realize()
235
        self.connect_after('realize', _realize_file_message_tree_view)
236
278.1.17 by John Arbash Meinel
Add a * reference for why you can't change the commit selection.
237
    def _fill_in_diff(self):
238
        self._diff_view.set_trees(self._wt, self._basis_tree)
239
278.1.25 by John Arbash Meinel
Add the 'Only Commit Locally' checkbox, we may want to put it elsewhere, though.
240
    def _fill_in_checkout(self):
241
        if not self._is_checkout:
242
            self._check_local.hide()
243
            return
244
        if have_dbus:
245
            bus = dbus.SystemBus()
445 by Szilveszter Farkas (Phanatic)
Fix a traceback if NetworkManager is not available (#199513).
246
            try:
247
                proxy_obj = bus.get_object('org.freedesktop.NetworkManager',
248
                                           '/org/freedesktop/NetworkManager')
446 by Szilveszter Farkas (Phanatic)
Hot fix. Sorry dudes.
249
            except dbus.DBusException:
635.2.12 by Vincent Ladeuil
Implement commit message saving without modifying bzrlib.
250
                trace.mutter("networkmanager not available.")
445 by Szilveszter Farkas (Phanatic)
Fix a traceback if NetworkManager is not available (#199513).
251
                self._check_local.show()
252
                return
253
            
278.1.25 by John Arbash Meinel
Add the 'Only Commit Locally' checkbox, we may want to put it elsewhere, though.
254
            dbus_iface = dbus.Interface(proxy_obj,
255
                                        'org.freedesktop.NetworkManager')
256
            try:
257
                # 3 is the enum value for STATE_CONNECTED
258
                self._check_local.set_active(dbus_iface.state() != 3)
259
            except dbus.DBusException, e:
260
                # Silently drop errors. While DBus may be
261
                # available, NetworkManager doesn't necessarily have to be
635.2.12 by Vincent Ladeuil
Implement commit message saving without modifying bzrlib.
262
                trace.mutter("unable to get networkmanager state: %r" % e)
278.1.25 by John Arbash Meinel
Add the 'Only Commit Locally' checkbox, we may want to put it elsewhere, though.
263
        self._check_local.show()
264
278.1.33 by John Arbash Meinel
Only enable the per-file dialog if 'per_file_commits' is enabled in the config.
265
    def _fill_in_per_file_info(self):
266
        config = self._wt.branch.get_config()
267
        enable_per_file_commits = config.get_user_option('per_file_commits')
268
        if (enable_per_file_commits is None
269
            or enable_per_file_commits.lower()
270
                not in ('y', 'yes', 'on', 'enable', '1', 't', 'true')):
271
            self._enable_per_file_commits = False
272
        else:
273
            self._enable_per_file_commits = True
274
        if not self._enable_per_file_commits:
275
            self._file_message_expander.hide()
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
276
            self._global_message_label.set_markup(_i18n('<b>Commit Message</b>'))
278.1.33 by John Arbash Meinel
Only enable the per-file dialog if 'per_file_commits' is enabled in the config.
277
278.1.12 by John Arbash Meinel
Delay computing the delta, and clean up some of the diff view names.
278
    def _compute_delta(self):
279
        self._delta = self._wt.changes_from(self._basis_tree)
280
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
281
    def construct(self):
282
        """Build up the dialog widgets."""
283
        # The primary pane which splits it into left and right (adjustable)
284
        # sections.
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
285
        self._hpane = Gtk.HPaned()
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
286
287
        self._construct_left_pane()
288
        self._construct_right_pane()
278.1.23 by John Arbash Meinel
Beginning to support actual commit.
289
        self._construct_action_pane()
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
290
734.1.4 by Curtis Hovey
Updated commit to gtk3.
291
        self.get_content_area().pack_start(self._hpane, True, True, 0)
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
292
        self._hpane.show()
293
        self.set_focus(self._global_message_text_view)
294
278.1.32 by John Arbash Meinel
Add the Ctrl+n accelerator to jump through the commit messages.
295
        self._construct_accelerators()
296
        self._set_sizes()
297
298
    def _set_sizes(self):
278.1.17 by John Arbash Meinel
Add a * reference for why you can't change the commit selection.
299
        # This seems like a reasonable default, we might like it to
300
        # be a bit wider, so that by default we can fit an 80-line diff in the
301
        # diff window.
302
        # Alternatively, we should be saving the last position/size rather than
303
        # setting it to a fixed value every time we start up.
304
        screen = self.get_screen()
305
        monitor = 0 # We would like it to be the monitor we are going to
306
                    # display on, but I don't know how to figure that out
307
                    # Only really useful for freaks like me that run dual
308
                    # monitor, with different sizes on the monitors
309
        monitor_rect = screen.get_monitor_geometry(monitor)
310
        width = int(monitor_rect.width * 0.66)
311
        height = int(monitor_rect.height * 0.66)
312
        self.set_default_size(width, height)
278.1.16 by John Arbash Meinel
Implement the file changes list on top of _iter_changes rather than
313
        self._hpane.set_position(300)
314
278.1.32 by John Arbash Meinel
Add the Ctrl+n accelerator to jump through the commit messages.
315
    def _construct_accelerators(self):
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
316
        group = Gtk.AccelGroup()
734.1.4 by Curtis Hovey
Updated commit to gtk3.
317
        group.connect(Gdk.keyval_from_name('N'),
318
                      Gdk.ModifierType.CONTROL_MASK, 0, self._on_accel_next)
278.1.32 by John Arbash Meinel
Add the Ctrl+n accelerator to jump through the commit messages.
319
        self.add_accel_group(group)
320
500.2.1 by Scott Scriven
Made 'gcommit' ignore the escape key ('close' signal).
321
        # ignore the escape key (avoid closing the window)
500.2.2 by Scott Scriven
Simpler/cleaner way to ignore the 'close' signal.
322
        self.connect_object('close', self.emit_stop_by_name, 'close')
500.2.1 by Scott Scriven
Made 'gcommit' ignore the escape key ('close' signal).
323
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
324
    def _construct_left_pane(self):
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
325
        self._left_pane_box = Gtk.VBox(homogeneous=False, spacing=5)
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
326
        self._construct_file_list()
327
        self._construct_pending_list()
328
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
329
        self._check_local = Gtk.CheckButton(_i18n("_Only commit locally"),
278.1.25 by John Arbash Meinel
Add the 'Only Commit Locally' checkbox, we may want to put it elsewhere, though.
330
                                            use_underline=True)
734.1.4 by Curtis Hovey
Updated commit to gtk3.
331
        self._left_pane_box.pack_end(self._check_local, False, False, 0)
278.1.25 by John Arbash Meinel
Add the 'Only Commit Locally' checkbox, we may want to put it elsewhere, though.
332
        self._check_local.set_active(False)
333
278.1.15 by John Arbash Meinel
Hook up the list of modified files.
334
        self._hpane.pack1(self._left_pane_box, resize=False, shrink=False)
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
335
        self._left_pane_box.show()
336
337
    def _construct_right_pane(self):
338
        # TODO: I really want to make it so the diff view gets more space than
339
        # the global commit message, and the per-file commit message gets even
340
        # less. When I did it with wxGlade, I set it to 4 for diff, 2 for
341
        # commit, and 1 for file commit, and it looked good. But I don't seem
342
        # to have a way to do that with the gtk boxes... :( (Which is extra
343
        # weird since wx uses gtk on Linux...)
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
344
        self._right_pane_table = Gtk.Table(rows=10, columns=1, homogeneous=False)
278.1.11 by John Arbash Meinel
Worked out the rest of the spacing.
345
        self._right_pane_table.set_row_spacings(5)
346
        self._right_pane_table.set_col_spacings(5)
278.1.10 by John Arbash Meinel
To get the space weighting I wanted, I turned to a Table.
347
        self._right_pane_table_row = 0
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
348
        self._construct_diff_view()
349
        self._construct_file_message()
350
        self._construct_global_message()
351
278.1.10 by John Arbash Meinel
To get the space weighting I wanted, I turned to a Table.
352
        self._right_pane_table.show()
353
        self._hpane.pack2(self._right_pane_table, resize=True, shrink=True)
354
278.1.23 by John Arbash Meinel
Beginning to support actual commit.
355
    def _construct_action_pane(self):
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
356
        self._button_cancel = Gtk.Button(stock=Gtk.STOCK_CANCEL)
635.2.7 by Vincent Ladeuil
Land Anne Mohsen's patch for bug 215674.
357
        self._button_cancel.connect('clicked', self._on_cancel_clicked)
358
        self._button_cancel.show()
734.1.4 by Curtis Hovey
Updated commit to gtk3.
359
        self.get_action_area().pack_end(
360
            self._button_cancel, True, True, 0)
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
361
        self._button_commit = Gtk.Button(_i18n("Comm_it"), use_underline=True)
278.1.23 by John Arbash Meinel
Beginning to support actual commit.
362
        self._button_commit.connect('clicked', self._on_commit_clicked)
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
363
        self._button_commit.set_can_default(True)
278.1.24 by John Arbash Meinel
Actually show the commit button.
364
        self._button_commit.show()
734.1.4 by Curtis Hovey
Updated commit to gtk3.
365
        self.get_action_area().pack_end(
366
            self._button_commit, True, True, 0)
278.1.24 by John Arbash Meinel
Actually show the commit button.
367
        self._button_commit.grab_default()
278.1.23 by John Arbash Meinel
Beginning to support actual commit.
368
278.1.10 by John Arbash Meinel
To get the space weighting I wanted, I turned to a Table.
369
    def _add_to_right_table(self, widget, weight, expanding=False):
370
        """Add another widget to the table
371
372
        :param widget: The object to add
373
        :param weight: How many rows does this widget get to request
374
        :param expanding: Should expand|fill|shrink be set?
375
        """
376
        end_row = self._right_pane_table_row + weight
377
        options = 0
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
378
        expand_opts = Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL | Gtk.AttachOptions.SHRINK
278.1.10 by John Arbash Meinel
To get the space weighting I wanted, I turned to a Table.
379
        if expanding:
380
            options = expand_opts
381
        self._right_pane_table.attach(widget, 0, 1,
382
                                      self._right_pane_table_row, end_row,
383
                                      xoptions=expand_opts, yoptions=options)
384
        self._right_pane_table_row = end_row
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
385
386
    def _construct_file_list(self):
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
387
        self._files_box = Gtk.VBox(homogeneous=False, spacing=0)
388
        file_label = Gtk.Label(label=_i18n('Files'))
278.1.41 by John Arbash Meinel
For the moment, just hide the section headings Files and Diff for *.
389
        # file_label.show()
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
390
        self._files_box.pack_start(file_label, False, True, 0)
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
391
734.1.19 by Curtis Hovey
Updated RadioButtons to gtk3.
392
        self._commit_all_files_radio = Gtk.RadioButton.new_with_label(
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
393
            None, _i18n("Commit all changes"))
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
394
        self._files_box.pack_start(self._commit_all_files_radio, False, True, 0)
278.1.42 by John Arbash Meinel
start playing with using a radial box, rather than an entry in the list
395
        self._commit_all_files_radio.show()
278.1.43 by John Arbash Meinel
Finish connecting the 'Commit all changes' radio buttons.
396
        self._commit_all_files_radio.connect('toggled',
397
            self._toggle_commit_selection)
734.1.19 by Curtis Hovey
Updated RadioButtons to gtk3.
398
        self._commit_selected_radio = Gtk.RadioButton.new_with_label_from_widget(
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
399
            self._commit_all_files_radio, _i18n("Only commit selected changes"))
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
400
        self._files_box.pack_start(self._commit_selected_radio, False, True, 0)
278.1.42 by John Arbash Meinel
start playing with using a radial box, rather than an entry in the list
401
        self._commit_selected_radio.show()
278.1.43 by John Arbash Meinel
Finish connecting the 'Commit all changes' radio buttons.
402
        self._commit_selected_radio.connect('toggled',
403
            self._toggle_commit_selection)
404
        if self._pending:
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
405
            self._commit_all_files_radio.set_label(_i18n('Commit all changes*'))
278.1.43 by John Arbash Meinel
Finish connecting the 'Commit all changes' radio buttons.
406
            self._commit_all_files_radio.set_sensitive(False)
407
            self._commit_selected_radio.set_sensitive(False)
278.1.42 by John Arbash Meinel
start playing with using a radial box, rather than an entry in the list
408
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
409
        scroller = Gtk.ScrolledWindow()
410
        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
411
        self._treeview_files = Gtk.TreeView()
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
412
        self._treeview_files.show()
413
        scroller.add(self._treeview_files)
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
414
        scroller.set_shadow_type(Gtk.ShadowType.IN)
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
415
        scroller.show()
734.1.4 by Curtis Hovey
Updated commit to gtk3.
416
        self._files_box.pack_start(scroller, True, True, 0)
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
417
        self._files_box.show()
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
418
        self._left_pane_box.pack_start(self._files_box, True, True, 0)
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
419
278.1.31 by John Arbash Meinel
We can make bencode work again by a simple decode/encode step.
420
        # Keep note that all strings stored in a ListStore must be UTF-8
421
        # strings. GTK does not support directly setting and restoring Unicode
422
        # objects.
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
423
        liststore = Gtk.ListStore(
424
            GObject.TYPE_STRING,  # [0] file_id
425
            GObject.TYPE_STRING,  # [1] real path
426
            GObject.TYPE_BOOLEAN, # [2] checkbox
427
            GObject.TYPE_STRING,  # [3] display path
428
            GObject.TYPE_STRING,  # [4] changes type
429
            GObject.TYPE_STRING,  # [5] commit message
278.1.15 by John Arbash Meinel
Hook up the list of modified files.
430
            )
431
        self._files_store = liststore
432
        self._treeview_files.set_model(liststore)
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
433
        crt = Gtk.CellRendererToggle()
278.1.39 by John Arbash Meinel
To disable a checkbox it is set_property('activatable', False),
434
        crt.set_property('activatable', not bool(self._pending))
278.1.15 by John Arbash Meinel
Hook up the list of modified files.
435
        crt.connect("toggled", self._toggle_commit, self._files_store)
278.1.17 by John Arbash Meinel
Add a * reference for why you can't change the commit selection.
436
        if self._pending:
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
437
            name = _i18n('Commit*')
278.1.17 by John Arbash Meinel
Add a * reference for why you can't change the commit selection.
438
        else:
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
439
            name = _i18n('Commit')
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
440
        commit_col = Gtk.TreeViewColumn(name, crt, active=2)
278.1.43 by John Arbash Meinel
Finish connecting the 'Commit all changes' radio buttons.
441
        commit_col.set_visible(False)
442
        self._treeview_files.append_column(commit_col)
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
443
        self._treeview_files.append_column(Gtk.TreeViewColumn(_i18n('Path'),
444
                                           Gtk.CellRendererText(), text=3))
445
        self._treeview_files.append_column(Gtk.TreeViewColumn(_i18n('Type'),
446
                                           Gtk.CellRendererText(), text=4))
278.1.17 by John Arbash Meinel
Add a * reference for why you can't change the commit selection.
447
        self._treeview_files.connect('cursor-changed',
448
                                     self._on_treeview_files_cursor_changed)
278.1.15 by John Arbash Meinel
Hook up the list of modified files.
449
450
    def _toggle_commit(self, cell, path, model):
278.1.20 by John Arbash Meinel
We always select the All Files record in the files view,
451
        if model[path][0] is None: # No file_id means 'All Files'
452
            new_val = not model[path][2]
453
            for node in model:
454
                node[2] = new_val
455
        else:
456
            model[path][2] = not model[path][2]
278.1.15 by John Arbash Meinel
Hook up the list of modified files.
457
278.1.43 by John Arbash Meinel
Finish connecting the 'Commit all changes' radio buttons.
458
    def _toggle_commit_selection(self, button):
459
        all_files = self._commit_all_files_radio.get_active()
460
        if self._commit_all_changes != all_files:
461
            checked_col = self._treeview_files.get_column(0)
462
            self._commit_all_changes = all_files
463
            if all_files:
464
                checked_col.set_visible(False)
465
            else:
466
                checked_col.set_visible(True)
734.1.20 by Curtis Hovey
col.get_cell_renderers => col.get_cells.
467
            renderer = checked_col.get_cells()[0]
278.1.43 by John Arbash Meinel
Finish connecting the 'Commit all changes' radio buttons.
468
            renderer.set_property('activatable', not all_files)
469
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
470
    def _construct_pending_list(self):
471
        # Pending information defaults to hidden, we put it all in 1 box, so
472
        # that we can show/hide all of them at once
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
473
        self._pending_box = Gtk.VBox()
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
474
        self._pending_box.hide()
475
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
476
        pending_message = Gtk.Label()
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
477
        pending_message.set_markup(
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
478
            _i18n('<i>* Cannot select specific files when merging</i>'))
734.1.4 by Curtis Hovey
Updated commit to gtk3.
479
        self._pending_box.pack_start(pending_message, False, True, 5)
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
480
        pending_message.show()
481
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
482
        pending_label = Gtk.Label(label=_i18n('Pending Revisions'))
734.1.4 by Curtis Hovey
Updated commit to gtk3.
483
        self._pending_box.pack_start(pending_label, False, True, 0)
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
484
        pending_label.show()
485
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
486
        scroller = Gtk.ScrolledWindow()
487
        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
488
        self._treeview_pending = Gtk.TreeView()
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
489
        scroller.add(self._treeview_pending)
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
490
        scroller.set_shadow_type(Gtk.ShadowType.IN)
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
491
        scroller.show()
734.1.4 by Curtis Hovey
Updated commit to gtk3.
492
        self._pending_box.pack_start(scroller, True, True, 5)
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
493
        self._treeview_pending.show()
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
494
        self._left_pane_box.pack_start(self._pending_box, True, True, 0)
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
495
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
496
        liststore = Gtk.ListStore(GObject.TYPE_STRING, # revision_id
497
                                  GObject.TYPE_STRING, # date
498
                                  GObject.TYPE_STRING, # committer
499
                                  GObject.TYPE_STRING, # summary
278.1.14 by John Arbash Meinel
Tests that we fill out the pending list correctly.
500
                                 )
278.1.15 by John Arbash Meinel
Hook up the list of modified files.
501
        self._pending_store = liststore
278.1.14 by John Arbash Meinel
Tests that we fill out the pending list correctly.
502
        self._treeview_pending.set_model(liststore)
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
503
        self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Date'),
504
                                             Gtk.CellRendererText(), text=1))
505
        self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Committer'),
506
                                             Gtk.CellRendererText(), text=2))
507
        self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Summary'),
508
                                             Gtk.CellRendererText(), text=3))
278.1.14 by John Arbash Meinel
Tests that we fill out the pending list correctly.
509
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
510
    def _construct_diff_view(self):
729.1.1 by Jelmer Vernooij
Move i18n support to a separate file, so gettext files aren't loaded unless bzr-gtk is used.
511
        from bzrlib.plugins.gtk.diff import DiffView
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
512
278.1.41 by John Arbash Meinel
For the moment, just hide the section headings Files and Diff for *.
513
        # TODO: jam 2007-10-30 The diff label is currently disabled. If we
514
        #       decide that we really don't ever want to display it, we should
515
        #       actually remove it, and other references to it, along with the
516
        #       tests that it is set properly.
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
517
        self._diff_label = Gtk.Label(label=_i18n('Diff for whole tree'))
278.1.11 by John Arbash Meinel
Worked out the rest of the spacing.
518
        self._diff_label.set_alignment(0, 0)
519
        self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
278.1.10 by John Arbash Meinel
To get the space weighting I wanted, I turned to a Table.
520
        self._add_to_right_table(self._diff_label, 1, False)
278.1.41 by John Arbash Meinel
For the moment, just hide the section headings Files and Diff for *.
521
        # self._diff_label.show()
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
522
278.1.12 by John Arbash Meinel
Delay computing the delta, and clean up some of the diff view names.
523
        self._diff_view = DiffView()
278.1.10 by John Arbash Meinel
To get the space weighting I wanted, I turned to a Table.
524
        self._add_to_right_table(self._diff_view, 4, True)
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
525
        self._diff_view.show()
526
527
    def _construct_file_message(self):
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
528
        scroller = Gtk.ScrolledWindow()
529
        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
278.1.9 by John Arbash Meinel
Move all text entry boxes into a ScrolledWindow, so that they don't change size constantly.
530
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
531
        self._file_message_text_view = Gtk.TextView()
278.1.9 by John Arbash Meinel
Move all text entry boxes into a ScrolledWindow, so that they don't change size constantly.
532
        scroller.add(self._file_message_text_view)
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
533
        scroller.set_shadow_type(Gtk.ShadowType.IN)
278.1.9 by John Arbash Meinel
Move all text entry boxes into a ScrolledWindow, so that they don't change size constantly.
534
        scroller.show()
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
535
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
536
        self._file_message_text_view.modify_font(Pango.FontDescription("Monospace"))
537
        self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
538
        self._file_message_text_view.set_accepts_tab(False)
539
        self._file_message_text_view.show()
540
734.1.4 by Curtis Hovey
Updated commit to gtk3.
541
        self._file_message_expander = Gtk.Expander(
542
            label=_i18n('File commit message'))
278.1.32 by John Arbash Meinel
Add the Ctrl+n accelerator to jump through the commit messages.
543
        self._file_message_expander.set_expanded(True)
544
        self._file_message_expander.add(scroller)
278.1.10 by John Arbash Meinel
To get the space weighting I wanted, I turned to a Table.
545
        self._add_to_right_table(self._file_message_expander, 1, False)
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
546
        self._file_message_expander.show()
547
548
    def _construct_global_message(self):
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
549
        self._global_message_label = Gtk.Label(label=_i18n('Global Commit Message'))
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
550
        self._global_message_label.set_markup(
551
            _i18n('<b>Global Commit Message</b>'))
278.1.11 by John Arbash Meinel
Worked out the rest of the spacing.
552
        self._global_message_label.set_alignment(0, 0)
553
        self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
278.1.10 by John Arbash Meinel
To get the space weighting I wanted, I turned to a Table.
554
        self._add_to_right_table(self._global_message_label, 1, False)
278.1.11 by John Arbash Meinel
Worked out the rest of the spacing.
555
        # Can we remove the spacing between the label and the box?
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
556
        self._global_message_label.show()
557
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
558
        scroller = Gtk.ScrolledWindow()
559
        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
278.1.9 by John Arbash Meinel
Move all text entry boxes into a ScrolledWindow, so that they don't change size constantly.
560
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
561
        self._global_message_text_view = Gtk.TextView()
635.2.12 by Vincent Ladeuil
Implement commit message saving without modifying bzrlib.
562
        self._set_global_commit_message(self._saved_commit_messages_manager.get()[0])
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
563
        self._global_message_text_view.modify_font(Pango.FontDescription("Monospace"))
278.1.9 by John Arbash Meinel
Move all text entry boxes into a ScrolledWindow, so that they don't change size constantly.
564
        scroller.add(self._global_message_text_view)
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
565
        scroller.set_shadow_type(Gtk.ShadowType.IN)
278.1.9 by John Arbash Meinel
Move all text entry boxes into a ScrolledWindow, so that they don't change size constantly.
566
        scroller.show()
278.1.10 by John Arbash Meinel
To get the space weighting I wanted, I turned to a Table.
567
        self._add_to_right_table(scroller, 2, True)
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
568
        self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
569
        self._file_message_text_view.set_accepts_tab(False)
570
        self._global_message_text_view.show()
571
278.1.17 by John Arbash Meinel
Add a * reference for why you can't change the commit selection.
572
    def _on_treeview_files_cursor_changed(self, treeview):
278.1.18 by John Arbash Meinel
Start checking the diff view is correct.
573
        treeselection = treeview.get_selection()
278.1.21 by John Arbash Meinel
Start tracking the per-file commit messages.
574
        (model, selection) = treeselection.get_selected()
278.1.17 by John Arbash Meinel
Add a * reference for why you can't change the commit selection.
575
278.1.21 by John Arbash Meinel
Start tracking the per-file commit messages.
576
        if selection is not None:
577
            path, display_path = model.get(selection, 1, 3)
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
578
            self._diff_label.set_text(_i18n('Diff for ') + display_path)
278.1.20 by John Arbash Meinel
We always select the All Files record in the files view,
579
            if path is None:
580
                self._diff_view.show_diff(None)
581
            else:
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
582
                self._diff_view.show_diff([path.decode('UTF-8')])
278.1.21 by John Arbash Meinel
Start tracking the per-file commit messages.
583
            self._update_per_file_info(selection)
584
278.1.32 by John Arbash Meinel
Add the Ctrl+n accelerator to jump through the commit messages.
585
    def _on_accel_next(self, accel_group, window, keyval, modifier):
586
        # We don't really care about any of the parameters, because we know
587
        # where this message came from
588
        tree_selection = self._treeview_files.get_selection()
589
        (model, selection) = tree_selection.get_selected()
590
        if selection is None:
591
            next = None
592
        else:
593
            next = model.iter_next(selection)
594
595
        if next is None:
596
            # We have either made it to the end of the list, or nothing was
597
            # selected. Either way, select All Files, and jump to the global
598
            # commit message.
734.1.23 by Curtis Hovey
Always pass a Gtk.TreePath instead of an int or tuple.
599
            self._treeview_files.set_cursor(
600
                Gtk.TreePath(path=0), None, False)
278.1.32 by John Arbash Meinel
Add the Ctrl+n accelerator to jump through the commit messages.
601
            self._global_message_text_view.grab_focus()
602
        else:
603
            # Set the cursor to this entry, and jump to the per-file commit
604
            # message
734.1.13 by Curtis Hovey
Fixed search in diff.
605
            self._treeview_files.set_cursor(model.get_path(next), None, False)
278.1.32 by John Arbash Meinel
Add the Ctrl+n accelerator to jump through the commit messages.
606
            self._file_message_text_view.grab_focus()
607
278.1.21 by John Arbash Meinel
Start tracking the per-file commit messages.
608
    def _save_current_file_message(self):
609
        if self._last_selected_file is None:
610
            return # Nothing to save
611
        text_buffer = self._file_message_text_view.get_buffer()
612
        cur_text = text_buffer.get_text(text_buffer.get_start_iter(),
734.1.4 by Curtis Hovey
Updated commit to gtk3.
613
                                        text_buffer.get_end_iter(), True)
278.1.21 by John Arbash Meinel
Start tracking the per-file commit messages.
614
        last_selected = self._files_store.get_iter(self._last_selected_file)
615
        self._files_store.set_value(last_selected, 5, cur_text)
616
617
    def _update_per_file_info(self, selection):
618
        # The node is changing, so cache the current message
278.1.33 by John Arbash Meinel
Only enable the per-file dialog if 'per_file_commits' is enabled in the config.
619
        if not self._enable_per_file_commits:
620
            return
621
278.1.21 by John Arbash Meinel
Start tracking the per-file commit messages.
622
        self._save_current_file_message()
623
        text_buffer = self._file_message_text_view.get_buffer()
624
        file_id, display_path, message = self._files_store.get(selection, 0, 3, 5)
625
        if file_id is None: # Whole tree
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
626
            self._file_message_expander.set_label(_i18n('File commit message'))
278.1.21 by John Arbash Meinel
Start tracking the per-file commit messages.
627
            self._file_message_expander.set_expanded(False)
628
            self._file_message_expander.set_sensitive(False)
629
            text_buffer.set_text('')
630
            self._last_selected_file = None
631
        else:
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
632
            self._file_message_expander.set_label(_i18n('Commit message for ')
278.1.21 by John Arbash Meinel
Start tracking the per-file commit messages.
633
                                                  + display_path)
634
            self._file_message_expander.set_expanded(True)
635
            self._file_message_expander.set_sensitive(True)
636
            text_buffer.set_text(message)
637
            self._last_selected_file = self._files_store.get_path(selection)
278.1.17 by John Arbash Meinel
Add a * reference for why you can't change the commit selection.
638
278.1.27 by John Arbash Meinel
Add the ability to commit just specific files.
639
    def _get_specific_files(self):
278.1.31 by John Arbash Meinel
We can make bencode work again by a simple decode/encode step.
640
        """Return the list of selected paths, and file info.
641
642
        :return: ([unicode paths], [{utf-8 file info}]
643
        """
278.1.27 by John Arbash Meinel
Add the ability to commit just specific files.
644
        self._save_current_file_message()
645
        files = []
646
        records = iter(self._files_store)
647
        rec = records.next() # Skip the All Files record
648
        assert rec[0] is None, "Are we skipping the wrong record?"
649
650
        file_info = []
651
        for record in records:
278.1.43 by John Arbash Meinel
Finish connecting the 'Commit all changes' radio buttons.
652
            if self._commit_all_changes or record[2]:# [2] checkbox
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
653
                file_id = record[0] # [0] file_id
278.1.31 by John Arbash Meinel
We can make bencode work again by a simple decode/encode step.
654
                path = record[1]    # [1] real path
622.1.1 by John Arbash Meinel
Ensure that per-file commit messages and global commit messages get sanitized.
655
                # [5] commit message
656
                file_message = _sanitize_and_decode_message(record[5])
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
657
                files.append(path.decode('UTF-8'))
278.1.33 by John Arbash Meinel
Only enable the per-file dialog if 'per_file_commits' is enabled in the config.
658
                if self._enable_per_file_commits and file_message:
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
659
                    # All of this needs to be utf-8 information
622.1.1 by John Arbash Meinel
Ensure that per-file commit messages and global commit messages get sanitized.
660
                    file_message = file_message.encode('UTF-8')
278.1.27 by John Arbash Meinel
Add the ability to commit just specific files.
661
                    file_info.append({'path':path, 'file_id':file_id,
662
                                     'message':file_message})
663
        file_info.sort(key=lambda x:(x['path'], x['file_id']))
278.1.33 by John Arbash Meinel
Only enable the per-file dialog if 'per_file_commits' is enabled in the config.
664
        if self._enable_per_file_commits:
665
            return files, file_info
666
        else:
667
            return files, []
278.1.27 by John Arbash Meinel
Add the ability to commit just specific files.
668
278.1.23 by John Arbash Meinel
Beginning to support actual commit.
669
    @show_bzr_error
635.2.7 by Vincent Ladeuil
Land Anne Mohsen's patch for bug 215674.
670
    def _on_cancel_clicked(self, button):
671
        """ Cancel button clicked handler. """
672
        self._do_cancel()
673
674
    @show_bzr_error
675
    def _on_delete_window(self, source, event):
676
        """ Delete window handler. """
677
        self._do_cancel()
678
679
    def _do_cancel(self):
680
        """If requested, saves commit messages when cancelling gcommit; they are re-used by a next gcommit"""
635.2.12 by Vincent Ladeuil
Implement commit message saving without modifying bzrlib.
681
        mgr = SavedCommitMessagesManager()
682
        self._saved_commit_messages_manager = mgr
683
        mgr.insert(self._get_global_commit_message(),
684
                   self._get_specific_files()[1])
685
        if mgr.is_not_empty(): # maybe worth saving
686
            response = self._question_dialog(
687
                _i18n('Commit cancelled'),
688
                _i18n('Do you want to save your commit messages ?'),
689
                parent=self)
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
690
            if response == Gtk.ResponseType.NO:
635.2.12 by Vincent Ladeuil
Implement commit message saving without modifying bzrlib.
691
                 # save nothing and destroy old comments if any
692
                mgr = SavedCommitMessagesManager()
693
        mgr.save(self._wt, self._wt.branch)
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
694
        self.response(Gtk.ResponseType.CANCEL) # close window
635.2.7 by Vincent Ladeuil
Land Anne Mohsen's patch for bug 215674.
695
696
    @show_bzr_error
278.1.23 by John Arbash Meinel
Beginning to support actual commit.
697
    def _on_commit_clicked(self, button):
698
        """ Commit button clicked handler. """
699
        self._do_commit()
700
701
    def _do_commit(self):
278.1.25 by John Arbash Meinel
Add the 'Only Commit Locally' checkbox, we may want to put it elsewhere, though.
702
        message = self._get_global_commit_message()
278.1.23 by John Arbash Meinel
Beginning to support actual commit.
703
704
        if message == '':
606 by Vincent Ladeuil
Fix gtk dialogs popping up and asking for input during selftest.
705
            response = self._question_dialog(
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
706
                _i18n('Commit with an empty message?'),
576.1.1 by Jasper Groenewegen
Add parent setting to dialogs and implement in gcommit
707
                _i18n('You can describe your commit intent in the message.'),
708
                parent=self)
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
709
            if response == Gtk.ResponseType.NO:
278.1.23 by John Arbash Meinel
Beginning to support actual commit.
710
                # Kindly give focus to message area
711
                self._global_message_text_view.grab_focus()
712
                return
713
278.1.27 by John Arbash Meinel
Add the ability to commit just specific files.
714
        specific_files, file_info = self._get_specific_files()
278.1.28 by John Arbash Meinel
Ensure that we can set per-file messages even during a merge.
715
        if self._pending:
716
            specific_files = None
278.1.23 by John Arbash Meinel
Beginning to support actual commit.
717
278.1.25 by John Arbash Meinel
Add the 'Only Commit Locally' checkbox, we may want to put it elsewhere, though.
718
        local = self._check_local.get_active()
278.1.23 by John Arbash Meinel
Beginning to support actual commit.
719
278.1.26 by John Arbash Meinel
Handle pointless commits and trees with unknown files.
720
        # All we care about is if there is a single unknown, so if this loop is
721
        # entered, then there are unknown files.
722
        # TODO: jam 20071002 It seems like this should cancel the dialog
723
        #       entirely, since there isn't a way for them to add the unknown
724
        #       files at this point.
725
        for path in self._wt.unknowns():
606 by Vincent Ladeuil
Fix gtk dialogs popping up and asking for input during selftest.
726
            response = self._question_dialog(
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
727
                _i18n("Commit with unknowns?"),
576.1.1 by Jasper Groenewegen
Add parent setting to dialogs and implement in gcommit
728
                _i18n("Unknown files exist in the working tree. Commit anyway?"),
729
                parent=self)
730
                # Doesn't set a parent for the dialog..
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
731
            if response == Gtk.ResponseType.NO:
278.1.26 by John Arbash Meinel
Handle pointless commits and trees with unknown files.
732
                return
733
            break
278.1.23 by John Arbash Meinel
Beginning to support actual commit.
734
278.1.25 by John Arbash Meinel
Add the 'Only Commit Locally' checkbox, we may want to put it elsewhere, though.
735
        rev_id = None
278.1.27 by John Arbash Meinel
Add the ability to commit just specific files.
736
        revprops = {}
737
        if file_info:
278.1.31 by John Arbash Meinel
We can make bencode work again by a simple decode/encode step.
738
            revprops['file-info'] = bencode.bencode(file_info).decode('UTF-8')
278.1.23 by John Arbash Meinel
Beginning to support actual commit.
739
        try:
740
            rev_id = self._wt.commit(message,
741
                       allow_pointless=False,
742
                       strict=False,
743
                       local=local,
278.1.27 by John Arbash Meinel
Add the ability to commit just specific files.
744
                       specific_files=specific_files,
745
                       revprops=revprops)
278.1.23 by John Arbash Meinel
Beginning to support actual commit.
746
        except errors.PointlessCommit:
606 by Vincent Ladeuil
Fix gtk dialogs popping up and asking for input during selftest.
747
            response = self._question_dialog(
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
748
                _i18n('Commit with no changes?'),
749
                _i18n('There are no changes in the working tree.'
576.1.1 by Jasper Groenewegen
Add parent setting to dialogs and implement in gcommit
750
                      ' Do you want to commit anyway?'),
751
                parent=self)
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
752
            if response == Gtk.ResponseType.YES:
278.1.23 by John Arbash Meinel
Beginning to support actual commit.
753
                rev_id = self._wt.commit(message,
754
                               allow_pointless=True,
755
                               strict=False,
756
                               local=local,
278.1.27 by John Arbash Meinel
Add the ability to commit just specific files.
757
                               specific_files=specific_files,
758
                               revprops=revprops)
278.1.23 by John Arbash Meinel
Beginning to support actual commit.
759
        self.committed_revision_id = rev_id
635.2.7 by Vincent Ladeuil
Land Anne Mohsen's patch for bug 215674.
760
        # destroy old comments if any
635.2.12 by Vincent Ladeuil
Implement commit message saving without modifying bzrlib.
761
        SavedCommitMessagesManager().save(self._wt, self._wt.branch)
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
762
        self.response(Gtk.ResponseType.OK)
278.1.23 by John Arbash Meinel
Beginning to support actual commit.
763
278.1.25 by John Arbash Meinel
Add the 'Only Commit Locally' checkbox, we may want to put it elsewhere, though.
764
    def _get_global_commit_message(self):
765
        buf = self._global_message_text_view.get_buffer()
766
        start, end = buf.get_bounds()
734.1.4 by Curtis Hovey
Updated commit to gtk3.
767
        text = buf.get_text(start, end, True)
622.1.1 by John Arbash Meinel
Ensure that per-file commit messages and global commit messages get sanitized.
768
        return _sanitize_and_decode_message(text)
278.1.25 by John Arbash Meinel
Add the 'Only Commit Locally' checkbox, we may want to put it elsewhere, though.
769
770
    def _set_global_commit_message(self, message):
771
        """Just a helper for the test suite."""
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
772
        if isinstance(message, unicode):
773
            message = message.encode('UTF-8')
278.1.25 by John Arbash Meinel
Add the 'Only Commit Locally' checkbox, we may want to put it elsewhere, though.
774
        self._global_message_text_view.get_buffer().set_text(message)
775
278.1.27 by John Arbash Meinel
Add the ability to commit just specific files.
776
    def _set_file_commit_message(self, message):
777
        """Helper for the test suite."""
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
778
        if isinstance(message, unicode):
779
            message = message.encode('UTF-8')
278.1.27 by John Arbash Meinel
Add the ability to commit just specific files.
780
        self._file_message_text_view.get_buffer().set_text(message)
781
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
782
    @staticmethod
783
    def _rev_to_pending_info(rev):
784
        """Get the information from a pending merge."""
126.1.1 by Szilveszter Farkas (Phanatic)
New Commit dialog implementation (no more Glade).
785
        from bzrlib.osutils import format_date
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
786
        rev_dict = {}
787
        rev_dict['committer'] = re.sub('<.*@.*>', '', rev.committer).strip(' ')
788
        rev_dict['summary'] = rev.get_summary()
789
        rev_dict['date'] = format_date(rev.timestamp,
790
                                       rev.timezone or 0,
791
                                       'original', date_fmt="%Y-%m-%d",
792
                                       show_offset=False)
793
        rev_dict['revision_id'] = rev.revision_id
794
        return rev_dict
635.2.12 by Vincent Ladeuil
Implement commit message saving without modifying bzrlib.
795
796
797
class SavedCommitMessagesManager:
635.2.13 by Vincent Ladeuil
Add NEWS entry and do some cleanup.
798
    """Save glogal and per-file commit messages.
799
800
    Saves global commit message and utf-8 file_id->message dictionary
801
    of per-file commit messages on disk. Re-reads them later for re-using.
802
    """
803
635.2.12 by Vincent Ladeuil
Implement commit message saving without modifying bzrlib.
804
    def __init__(self, tree=None, branch=None):
805
        """If branch is None, builds empty messages, otherwise reads them
806
        from branch's disk storage. 'tree' argument is for the future."""
807
        if branch is None:
808
            self.global_message = u''
809
            self.file_messages = {}
810
        else:
694 by Jelmer Vernooij
Avoid using private functions to get branch config.
811
            config = branch.get_config()
635.2.13 by Vincent Ladeuil
Add NEWS entry and do some cleanup.
812
            self.global_message = config.get_user_option(
813
                'gtk_global_commit_message')
635.2.12 by Vincent Ladeuil
Implement commit message saving without modifying bzrlib.
814
            if self.global_message is None:
815
                self.global_message = u''
816
            file_messages = config.get_user_option('gtk_file_commit_messages')
817
            if file_messages: # unicode and B-encoded:
635.2.13 by Vincent Ladeuil
Add NEWS entry and do some cleanup.
818
                self.file_messages = bencode.bdecode(
819
                    file_messages.encode('UTF-8'))
635.2.12 by Vincent Ladeuil
Implement commit message saving without modifying bzrlib.
820
            else:
821
                self.file_messages = {}
635.2.13 by Vincent Ladeuil
Add NEWS entry and do some cleanup.
822
635.2.12 by Vincent Ladeuil
Implement commit message saving without modifying bzrlib.
823
    def get(self):
824
        return self.global_message, self.file_messages
635.2.13 by Vincent Ladeuil
Add NEWS entry and do some cleanup.
825
635.2.12 by Vincent Ladeuil
Implement commit message saving without modifying bzrlib.
826
    def is_not_empty(self):
827
        return bool(self.global_message or self.file_messages)
635.2.13 by Vincent Ladeuil
Add NEWS entry and do some cleanup.
828
635.2.12 by Vincent Ladeuil
Implement commit message saving without modifying bzrlib.
829
    def insert(self, global_message, file_info):
830
        """Formats per-file commit messages (list of dictionaries, one per file)
831
        into one utf-8 file_id->message dictionary and merges this with
832
        previously existing dictionary. Merges global commit message too."""
833
        file_messages = {}
834
        for fi in file_info:
835
            file_message = fi['message']
836
            if file_message:
837
                file_messages[fi['file_id']] = file_message # utf-8 strings
838
        for k,v in file_messages.iteritems():
839
            try:
840
                self.file_messages[k] = v + '\n******\n' + self.file_messages[k]
841
            except KeyError:
842
                self.file_messages[k] = v
843
        if self.global_message:
635.2.13 by Vincent Ladeuil
Add NEWS entry and do some cleanup.
844
            self.global_message = global_message + '\n******\n' \
845
                + self.global_message
635.2.12 by Vincent Ladeuil
Implement commit message saving without modifying bzrlib.
846
        else:
847
            self.global_message = global_message
635.2.13 by Vincent Ladeuil
Add NEWS entry and do some cleanup.
848
635.2.12 by Vincent Ladeuil
Implement commit message saving without modifying bzrlib.
849
    def save(self, tree, branch):
850
        # We store in branch's config, which can be a problem if two gcommit
851
        # are done in two checkouts of one single branch (comments overwrite
852
        # each other). Ideally should be in working tree. But uncommit does
853
        # not always have a working tree, though it always has a branch.
854
        # 'tree' argument is for the future
855
        config = branch.get_config()
856
        # should it be named "gtk_" or some more neutral name ("gui_" ?) to
857
        # be compatible with qbzr in the future?
858
        config.set_user_option('gtk_global_commit_message', self.global_message)
635.2.13 by Vincent Ladeuil
Add NEWS entry and do some cleanup.
859
        # bencode() does not know unicode objects but set_user_option()
860
        # requires one:
861
        config.set_user_option(
862
            'gtk_file_commit_messages',
863
            bencode.bencode(self.file_messages).decode('UTF-8'))
635.2.12 by Vincent Ladeuil
Implement commit message saving without modifying bzrlib.
864
865
866
def save_commit_messages(local, master, old_revno, old_revid,
867
                         new_revno, new_revid):
868
    b = local
869
    if b is None:
870
        b = master
871
    mgr = SavedCommitMessagesManager(None, b)
872
    revid_iterator = b.repository.iter_reverse_revision_history(old_revid)
873
    cur_revno = old_revno
874
    new_revision_id = old_revid
875
    graph = b.repository.get_graph()
876
    for rev_id in revid_iterator:
877
        if cur_revno == new_revno:
878
            break
879
        cur_revno -= 1
880
        rev = b.repository.get_revision(rev_id)
881
        file_info = rev.properties.get('file-info', None)
882
        if file_info is None:
883
            file_info = {}
884
        else:
885
            file_info = bencode.bdecode(file_info.encode('UTF-8'))
886
        global_message = osutils.safe_unicode(rev.message)
887
        # Concatenate comment of the uncommitted revision
888
        mgr.insert(global_message, file_info)
889
890
        parents = graph.get_parent_map([rev_id]).get(rev_id, None)
891
        if not parents:
892
            continue
893
    mgr.save(None, b)