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