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