/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
625.7.1 by Szilveszter Farkas
Added a GTK type hint to allow the Commit window to maximize.
117
        
118
        self.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_NORMAL)
278.1.24 by John Arbash Meinel
Actually show the commit button.
119
278.1.16 by John Arbash Meinel
Implement the file changes list on top of _iter_changes rather than
120
        self._wt = wt
278.1.34 by John Arbash Meinel
Cleanup, we are still ignoring the 'selected' property, and the 'wtpath'
121
        # TODO: Do something with this value, it is used by Olive
122
        #       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
123
        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.
124
        self._enable_per_file_commits = True
278.1.43 by John Arbash Meinel
Finish connecting the 'Commit all changes' radio buttons.
125
        self._commit_all_changes = True
278.1.23 by John Arbash Meinel
Beginning to support actual commit.
126
        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.
127
278.1.16 by John Arbash Meinel
Implement the file changes list on top of _iter_changes rather than
128
        self.setup_params()
129
        self.construct()
130
        self.fill_in_data()
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
131
132
    def setup_params(self):
133
        """Setup the member variables for state."""
134
        self._basis_tree = self._wt.basis_tree()
278.1.12 by John Arbash Meinel
Delay computing the delta, and clean up some of the diff view names.
135
        self._delta = None
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
136
        self._pending = pending_revisions(self._wt)
137
138
        self._is_checkout = (self._wt.branch.get_bound_location() is not None)
139
278.1.14 by John Arbash Meinel
Tests that we fill out the pending list correctly.
140
    def fill_in_data(self):
141
        # Now that we are built, handle changes to the view based on the state
142
        self._fill_in_pending()
278.1.20 by John Arbash Meinel
We always select the All Files record in the files view,
143
        self._fill_in_diff()
278.1.15 by John Arbash Meinel
Hook up the list of modified files.
144
        self._fill_in_files()
278.1.25 by John Arbash Meinel
Add the 'Only Commit Locally' checkbox, we may want to put it elsewhere, though.
145
        self._fill_in_checkout()
278.1.33 by John Arbash Meinel
Only enable the per-file dialog if 'per_file_commits' is enabled in the config.
146
        self._fill_in_per_file_info()
278.1.14 by John Arbash Meinel
Tests that we fill out the pending list correctly.
147
148
    def _fill_in_pending(self):
149
        if not self._pending:
150
            self._pending_box.hide()
151
            return
152
153
        # TODO: We'd really prefer this to be a nested list
154
        for rev, children in self._pending:
155
            rev_info = self._rev_to_pending_info(rev)
278.1.15 by John Arbash Meinel
Hook up the list of modified files.
156
            self._pending_store.append([
278.1.14 by John Arbash Meinel
Tests that we fill out the pending list correctly.
157
                rev_info['revision_id'],
158
                rev_info['date'],
159
                rev_info['committer'],
160
                rev_info['summary'],
161
                ])
162
            for child in children:
163
                rev_info = self._rev_to_pending_info(child)
278.1.15 by John Arbash Meinel
Hook up the list of modified files.
164
                self._pending_store.append([
278.1.14 by John Arbash Meinel
Tests that we fill out the pending list correctly.
165
                    rev_info['revision_id'],
166
                    rev_info['date'],
167
                    rev_info['committer'],
168
                    rev_info['summary'],
169
                    ])
170
        self._pending_box.show()
171
278.1.15 by John Arbash Meinel
Hook up the list of modified files.
172
    def _fill_in_files(self):
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
173
        # We should really use add a progress bar of some kind.
278.1.15 by John Arbash Meinel
Hook up the list of modified files.
174
        # While we fill in the view, hide the store
175
        store = self._files_store
176
        self._treeview_files.set_model(None)
177
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
178
        added = _i18n('added')
179
        removed = _i18n('removed')
180
        renamed = _i18n('renamed')
181
        renamed_and_modified = _i18n('renamed and modified')
182
        modified = _i18n('modified')
183
        kind_changed = _i18n('kind changed')
278.1.15 by John Arbash Meinel
Hook up the list of modified files.
184
278.1.16 by John Arbash Meinel
Implement the file changes list on top of _iter_changes rather than
185
        # The store holds:
278.1.21 by John Arbash Meinel
Start tracking the per-file commit messages.
186
        # [file_id, real path, checkbox, display path, changes type, message]
450 by Aaron Bentley
Update to use new Tree.iter_changes
187
        # iter_changes returns:
278.1.16 by John Arbash Meinel
Implement the file changes list on top of _iter_changes rather than
188
        # (file_id, (path_in_source, path_in_target),
189
        #  changed_content, versioned, parent, name, kind,
190
        #  executable)
191
278.1.35 by John Arbash Meinel
Make use of the 'selected' parameter to CommitDialog.
192
        all_enabled = (self._selected is None)
278.1.20 by John Arbash Meinel
We always select the All Files record in the files view,
193
        # The first entry is always the 'whole tree'
278.1.35 by John Arbash Meinel
Make use of the 'selected' parameter to CommitDialog.
194
        all_iter = store.append([None, None, all_enabled, 'All Files', '', ''])
195
        initial_cursor = store.get_path(all_iter)
278.1.16 by John Arbash Meinel
Implement the file changes list on top of _iter_changes rather than
196
        # should we pass specific_files?
197
        self._wt.lock_read()
198
        self._basis_tree.lock_read()
199
        try:
450 by Aaron Bentley
Update to use new Tree.iter_changes
200
            from diff import iter_changes_to_status
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
201
            for (file_id, real_path, change_type, display_path
450 by Aaron Bentley
Update to use new Tree.iter_changes
202
                ) 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.
203
                if self._selected and real_path != self._selected:
204
                    enabled = False
205
                else:
206
                    enabled = True
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,
213
                    '', # Initial comment
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
278.1.35 by John Arbash Meinel
Make use of the 'selected' parameter to CommitDialog.
226
        self._treeview_files.set_cursor(initial_cursor)
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:
445 by Szilveszter Farkas (Phanatic)
Fix a traceback if NetworkManager is not available (#199513).
245
                mutter("networkmanager not available.")
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
257
                mutter("unable to get networkmanager state: %r" % e)
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.
278.1.4 by John Arbash Meinel
Just playing around.
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
286
        self.vbox.pack_start(self._hpane)
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):
311
        group = gtk.AccelGroup()
312
        group.connect_group(gtk.gdk.keyval_from_name('N'),
313
                            gtk.gdk.CONTROL_MASK, 0, self._on_accel_next)
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):
278.1.11 by John Arbash Meinel
Worked out the rest of the spacing.
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
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
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)
326
        self._left_pane_box.pack_end(self._check_local, False, False)
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...)
278.1.10 by John Arbash Meinel
To get the space weighting I wanted, I turned to a Table.
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):
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
351
        self._button_commit = gtk.Button(_i18n("Comm_it"), use_underline=True)
278.1.23 by John Arbash Meinel
Beginning to support actual commit.
352
        self._button_commit.connect('clicked', self._on_commit_clicked)
353
        self._button_commit.set_flags(gtk.CAN_DEFAULT)
278.1.24 by John Arbash Meinel
Actually show the commit button.
354
        self._button_commit.show()
278.1.23 by John Arbash Meinel
Beginning to support actual commit.
355
        self.action_area.pack_end(self._button_commit)
278.1.24 by John Arbash Meinel
Actually show the commit button.
356
        self._button_commit.grab_default()
278.1.23 by John Arbash Meinel
Beginning to support actual commit.
357
278.1.10 by John Arbash Meinel
To get the space weighting I wanted, I turned to a Table.
358
    def _add_to_right_table(self, widget, weight, expanding=False):
359
        """Add another widget to the table
360
361
        :param widget: The object to add
362
        :param weight: How many rows does this widget get to request
363
        :param expanding: Should expand|fill|shrink be set?
364
        """
365
        end_row = self._right_pane_table_row + weight
366
        options = 0
367
        expand_opts = gtk.EXPAND | gtk.FILL | gtk.SHRINK
368
        if expanding:
369
            options = expand_opts
370
        self._right_pane_table.attach(widget, 0, 1,
371
                                      self._right_pane_table_row, end_row,
372
                                      xoptions=expand_opts, yoptions=options)
373
        self._right_pane_table_row = end_row
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
374
375
    def _construct_file_list(self):
278.1.11 by John Arbash Meinel
Worked out the rest of the spacing.
376
        self._files_box = gtk.VBox(homogeneous=False, spacing=0)
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
377
        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 *.
378
        # file_label.show()
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
379
        self._files_box.pack_start(file_label, expand=False)
380
278.1.42 by John Arbash Meinel
start playing with using a radial box, rather than an entry in the list
381
        self._commit_all_files_radio = gtk.RadioButton(
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
382
            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
383
        self._files_box.pack_start(self._commit_all_files_radio, expand=False)
384
        self._commit_all_files_radio.show()
278.1.43 by John Arbash Meinel
Finish connecting the 'Commit all changes' radio buttons.
385
        self._commit_all_files_radio.connect('toggled',
386
            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
387
        self._commit_selected_radio = gtk.RadioButton(
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
388
            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
389
        self._files_box.pack_start(self._commit_selected_radio, expand=False)
390
        self._commit_selected_radio.show()
278.1.43 by John Arbash Meinel
Finish connecting the 'Commit all changes' radio buttons.
391
        self._commit_selected_radio.connect('toggled',
392
            self._toggle_commit_selection)
393
        if self._pending:
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
394
            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.
395
            self._commit_all_files_radio.set_sensitive(False)
396
            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
397
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
398
        scroller = gtk.ScrolledWindow()
399
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
126.1.1 by Szilveszter Farkas (Phanatic)
New Commit dialog implementation (no more Glade).
400
        self._treeview_files = gtk.TreeView()
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
401
        self._treeview_files.show()
402
        scroller.add(self._treeview_files)
278.1.32 by John Arbash Meinel
Add the Ctrl+n accelerator to jump through the commit messages.
403
        scroller.set_shadow_type(gtk.SHADOW_IN)
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
404
        scroller.show()
405
        self._files_box.pack_start(scroller,
406
                                   expand=True, fill=True)
407
        self._files_box.show()
408
        self._left_pane_box.pack_start(self._files_box)
409
278.1.31 by John Arbash Meinel
We can make bencode work again by a simple decode/encode step.
410
        # Keep note that all strings stored in a ListStore must be UTF-8
411
        # strings. GTK does not support directly setting and restoring Unicode
412
        # objects.
278.1.15 by John Arbash Meinel
Hook up the list of modified files.
413
        liststore = gtk.ListStore(
414
            gobject.TYPE_STRING,  # [0] file_id
415
            gobject.TYPE_STRING,  # [1] real path
416
            gobject.TYPE_BOOLEAN, # [2] checkbox
417
            gobject.TYPE_STRING,  # [3] display path
418
            gobject.TYPE_STRING,  # [4] changes type
278.1.21 by John Arbash Meinel
Start tracking the per-file commit messages.
419
            gobject.TYPE_STRING,  # [5] commit message
278.1.15 by John Arbash Meinel
Hook up the list of modified files.
420
            )
421
        self._files_store = liststore
422
        self._treeview_files.set_model(liststore)
423
        crt = gtk.CellRendererToggle()
278.1.39 by John Arbash Meinel
To disable a checkbox it is set_property('activatable', False),
424
        crt.set_property('activatable', not bool(self._pending))
278.1.15 by John Arbash Meinel
Hook up the list of modified files.
425
        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.
426
        if self._pending:
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
427
            name = _i18n('Commit*')
278.1.17 by John Arbash Meinel
Add a * reference for why you can't change the commit selection.
428
        else:
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
429
            name = _i18n('Commit')
278.1.43 by John Arbash Meinel
Finish connecting the 'Commit all changes' radio buttons.
430
        commit_col = gtk.TreeViewColumn(name, crt, active=2)
431
        commit_col.set_visible(False)
432
        self._treeview_files.append_column(commit_col)
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
433
        self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Path'),
278.1.15 by John Arbash Meinel
Hook up the list of modified files.
434
                                           gtk.CellRendererText(), text=3))
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
435
        self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Type'),
278.1.15 by John Arbash Meinel
Hook up the list of modified files.
436
                                           gtk.CellRendererText(), text=4))
278.1.17 by John Arbash Meinel
Add a * reference for why you can't change the commit selection.
437
        self._treeview_files.connect('cursor-changed',
438
                                     self._on_treeview_files_cursor_changed)
278.1.15 by John Arbash Meinel
Hook up the list of modified files.
439
440
    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,
441
        if model[path][0] is None: # No file_id means 'All Files'
442
            new_val = not model[path][2]
443
            for node in model:
444
                node[2] = new_val
445
        else:
446
            model[path][2] = not model[path][2]
278.1.15 by John Arbash Meinel
Hook up the list of modified files.
447
278.1.43 by John Arbash Meinel
Finish connecting the 'Commit all changes' radio buttons.
448
    def _toggle_commit_selection(self, button):
449
        all_files = self._commit_all_files_radio.get_active()
450
        if self._commit_all_changes != all_files:
451
            checked_col = self._treeview_files.get_column(0)
452
            self._commit_all_changes = all_files
453
            if all_files:
454
                checked_col.set_visible(False)
455
            else:
456
                checked_col.set_visible(True)
457
            renderer = checked_col.get_cell_renderers()[0]
458
            renderer.set_property('activatable', not all_files)
459
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
460
    def _construct_pending_list(self):
461
        # Pending information defaults to hidden, we put it all in 1 box, so
462
        # that we can show/hide all of them at once
463
        self._pending_box = gtk.VBox()
464
        self._pending_box.hide()
465
466
        pending_message = gtk.Label()
467
        pending_message.set_markup(
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
468
            _i18n('<i>* Cannot select specific files when merging</i>'))
278.1.11 by John Arbash Meinel
Worked out the rest of the spacing.
469
        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.
470
        pending_message.show()
471
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
472
        pending_label = gtk.Label(_i18n('Pending Revisions'))
278.1.11 by John Arbash Meinel
Worked out the rest of the spacing.
473
        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.
474
        pending_label.show()
475
476
        scroller = gtk.ScrolledWindow()
477
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
478
        self._treeview_pending = gtk.TreeView()
479
        scroller.add(self._treeview_pending)
278.1.32 by John Arbash Meinel
Add the Ctrl+n accelerator to jump through the commit messages.
480
        scroller.set_shadow_type(gtk.SHADOW_IN)
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
481
        scroller.show()
482
        self._pending_box.pack_start(scroller,
278.1.11 by John Arbash Meinel
Worked out the rest of the spacing.
483
                                     expand=True, fill=True, padding=5)
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
484
        self._treeview_pending.show()
485
        self._left_pane_box.pack_start(self._pending_box)
486
278.1.15 by John Arbash Meinel
Hook up the list of modified files.
487
        liststore = gtk.ListStore(gobject.TYPE_STRING, # revision_id
488
                                  gobject.TYPE_STRING, # date
489
                                  gobject.TYPE_STRING, # committer
490
                                  gobject.TYPE_STRING, # summary
278.1.14 by John Arbash Meinel
Tests that we fill out the pending list correctly.
491
                                 )
278.1.15 by John Arbash Meinel
Hook up the list of modified files.
492
        self._pending_store = liststore
278.1.14 by John Arbash Meinel
Tests that we fill out the pending list correctly.
493
        self._treeview_pending.set_model(liststore)
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
494
        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.
495
                                             gtk.CellRendererText(), text=1))
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
496
        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.
497
                                             gtk.CellRendererText(), text=2))
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
498
        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.
499
                                             gtk.CellRendererText(), text=3))
500
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
501
    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.
502
        from diff import DiffView
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
503
278.1.41 by John Arbash Meinel
For the moment, just hide the section headings Files and Diff for *.
504
        # TODO: jam 2007-10-30 The diff label is currently disabled. If we
505
        #       decide that we really don't ever want to display it, we should
506
        #       actually remove it, and other references to it, along with the
507
        #       tests that it is set properly.
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
508
        self._diff_label = gtk.Label(_i18n('Diff for whole tree'))
278.1.11 by John Arbash Meinel
Worked out the rest of the spacing.
509
        self._diff_label.set_alignment(0, 0)
510
        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.
511
        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 *.
512
        # self._diff_label.show()
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
513
278.1.12 by John Arbash Meinel
Delay computing the delta, and clean up some of the diff view names.
514
        self._diff_view = DiffView()
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_view, 4, True)
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
516
        self._diff_view.show()
517
518
    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.
519
        scroller = gtk.ScrolledWindow()
520
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
521
522
        self._file_message_text_view = gtk.TextView()
523
        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.
524
        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.
525
        scroller.show()
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
526
527
        self._file_message_text_view.modify_font(pango.FontDescription("Monospace"))
528
        self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
529
        self._file_message_text_view.set_accepts_tab(False)
530
        self._file_message_text_view.show()
531
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
532
        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.
533
        self._file_message_expander.set_expanded(True)
534
        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.
535
        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.
536
        self._file_message_expander.show()
537
538
    def _construct_global_message(self):
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
539
        self._global_message_label = gtk.Label(_i18n('Global Commit Message'))
540
        self._global_message_label.set_markup(
541
            _i18n('<b>Global Commit Message</b>'))
278.1.11 by John Arbash Meinel
Worked out the rest of the spacing.
542
        self._global_message_label.set_alignment(0, 0)
543
        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.
544
        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.
545
        # 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.
546
        self._global_message_label.show()
547
278.1.9 by John Arbash Meinel
Move all text entry boxes into a ScrolledWindow, so that they don't change size constantly.
548
        scroller = gtk.ScrolledWindow()
549
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
550
551
        self._global_message_text_view = gtk.TextView()
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
552
        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.
553
        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.
554
        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.
555
        scroller.show()
278.1.10 by John Arbash Meinel
To get the space weighting I wanted, I turned to a Table.
556
        self._add_to_right_table(scroller, 2, True)
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
557
        self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
558
        self._file_message_text_view.set_accepts_tab(False)
559
        self._global_message_text_view.show()
560
278.1.17 by John Arbash Meinel
Add a * reference for why you can't change the commit selection.
561
    def _on_treeview_files_cursor_changed(self, treeview):
278.1.18 by John Arbash Meinel
Start checking the diff view is correct.
562
        treeselection = treeview.get_selection()
278.1.21 by John Arbash Meinel
Start tracking the per-file commit messages.
563
        (model, selection) = treeselection.get_selected()
278.1.17 by John Arbash Meinel
Add a * reference for why you can't change the commit selection.
564
278.1.21 by John Arbash Meinel
Start tracking the per-file commit messages.
565
        if selection is not None:
566
            path, display_path = model.get(selection, 1, 3)
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
567
            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,
568
            if path is None:
569
                self._diff_view.show_diff(None)
570
            else:
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
571
                self._diff_view.show_diff([path.decode('UTF-8')])
278.1.21 by John Arbash Meinel
Start tracking the per-file commit messages.
572
            self._update_per_file_info(selection)
573
278.1.32 by John Arbash Meinel
Add the Ctrl+n accelerator to jump through the commit messages.
574
    def _on_accel_next(self, accel_group, window, keyval, modifier):
575
        # We don't really care about any of the parameters, because we know
576
        # where this message came from
577
        tree_selection = self._treeview_files.get_selection()
578
        (model, selection) = tree_selection.get_selected()
579
        if selection is None:
580
            next = None
581
        else:
582
            next = model.iter_next(selection)
583
584
        if next is None:
585
            # We have either made it to the end of the list, or nothing was
586
            # selected. Either way, select All Files, and jump to the global
587
            # commit message.
588
            self._treeview_files.set_cursor((0,))
589
            self._global_message_text_view.grab_focus()
590
        else:
591
            # Set the cursor to this entry, and jump to the per-file commit
592
            # message
593
            self._treeview_files.set_cursor(model.get_path(next))
594
            self._file_message_text_view.grab_focus()
595
278.1.21 by John Arbash Meinel
Start tracking the per-file commit messages.
596
    def _save_current_file_message(self):
597
        if self._last_selected_file is None:
598
            return # Nothing to save
599
        text_buffer = self._file_message_text_view.get_buffer()
600
        cur_text = text_buffer.get_text(text_buffer.get_start_iter(),
601
                                        text_buffer.get_end_iter())
602
        last_selected = self._files_store.get_iter(self._last_selected_file)
603
        self._files_store.set_value(last_selected, 5, cur_text)
604
605
    def _update_per_file_info(self, selection):
606
        # 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.
607
        if not self._enable_per_file_commits:
608
            return
609
278.1.21 by John Arbash Meinel
Start tracking the per-file commit messages.
610
        self._save_current_file_message()
611
        text_buffer = self._file_message_text_view.get_buffer()
612
        file_id, display_path, message = self._files_store.get(selection, 0, 3, 5)
613
        if file_id is None: # Whole tree
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
614
            self._file_message_expander.set_label(_i18n('File commit message'))
278.1.21 by John Arbash Meinel
Start tracking the per-file commit messages.
615
            self._file_message_expander.set_expanded(False)
616
            self._file_message_expander.set_sensitive(False)
617
            text_buffer.set_text('')
618
            self._last_selected_file = None
619
        else:
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
620
            self._file_message_expander.set_label(_i18n('Commit message for ')
278.1.21 by John Arbash Meinel
Start tracking the per-file commit messages.
621
                                                  + display_path)
622
            self._file_message_expander.set_expanded(True)
623
            self._file_message_expander.set_sensitive(True)
624
            text_buffer.set_text(message)
625
            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.
626
278.1.27 by John Arbash Meinel
Add the ability to commit just specific files.
627
    def _get_specific_files(self):
278.1.31 by John Arbash Meinel
We can make bencode work again by a simple decode/encode step.
628
        """Return the list of selected paths, and file info.
629
630
        :return: ([unicode paths], [{utf-8 file info}]
631
        """
278.1.27 by John Arbash Meinel
Add the ability to commit just specific files.
632
        self._save_current_file_message()
633
        files = []
634
        records = iter(self._files_store)
635
        rec = records.next() # Skip the All Files record
636
        assert rec[0] is None, "Are we skipping the wrong record?"
637
638
        file_info = []
639
        for record in records:
278.1.43 by John Arbash Meinel
Finish connecting the 'Commit all changes' radio buttons.
640
            if self._commit_all_changes or record[2]:# [2] checkbox
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
641
                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.
642
                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.
643
                # [5] commit message
644
                file_message = _sanitize_and_decode_message(record[5])
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
645
                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.
646
                if self._enable_per_file_commits and file_message:
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
647
                    # 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.
648
                    file_message = file_message.encode('UTF-8')
278.1.27 by John Arbash Meinel
Add the ability to commit just specific files.
649
                    file_info.append({'path':path, 'file_id':file_id,
650
                                     'message':file_message})
651
        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.
652
        if self._enable_per_file_commits:
653
            return files, file_info
654
        else:
655
            return files, []
278.1.27 by John Arbash Meinel
Add the ability to commit just specific files.
656
278.1.23 by John Arbash Meinel
Beginning to support actual commit.
657
    @show_bzr_error
658
    def _on_commit_clicked(self, button):
659
        """ Commit button clicked handler. """
660
        self._do_commit()
661
662
    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.
663
        message = self._get_global_commit_message()
278.1.23 by John Arbash Meinel
Beginning to support actual commit.
664
665
        if message == '':
606 by Vincent Ladeuil
Fix gtk dialogs popping up and asking for input during selftest.
666
            response = self._question_dialog(
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
667
                _i18n('Commit with an empty message?'),
576.1.1 by Jasper Groenewegen
Add parent setting to dialogs and implement in gcommit
668
                _i18n('You can describe your commit intent in the message.'),
669
                parent=self)
278.1.23 by John Arbash Meinel
Beginning to support actual commit.
670
            if response == gtk.RESPONSE_NO:
671
                # Kindly give focus to message area
672
                self._global_message_text_view.grab_focus()
673
                return
674
278.1.27 by John Arbash Meinel
Add the ability to commit just specific files.
675
        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.
676
        if self._pending:
677
            specific_files = None
278.1.23 by John Arbash Meinel
Beginning to support actual commit.
678
278.1.25 by John Arbash Meinel
Add the 'Only Commit Locally' checkbox, we may want to put it elsewhere, though.
679
        local = self._check_local.get_active()
278.1.23 by John Arbash Meinel
Beginning to support actual commit.
680
278.1.26 by John Arbash Meinel
Handle pointless commits and trees with unknown files.
681
        # All we care about is if there is a single unknown, so if this loop is
682
        # entered, then there are unknown files.
683
        # TODO: jam 20071002 It seems like this should cancel the dialog
684
        #       entirely, since there isn't a way for them to add the unknown
685
        #       files at this point.
686
        for path in self._wt.unknowns():
606 by Vincent Ladeuil
Fix gtk dialogs popping up and asking for input during selftest.
687
            response = self._question_dialog(
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
688
                _i18n("Commit with unknowns?"),
576.1.1 by Jasper Groenewegen
Add parent setting to dialogs and implement in gcommit
689
                _i18n("Unknown files exist in the working tree. Commit anyway?"),
690
                parent=self)
691
                # Doesn't set a parent for the dialog..
278.1.26 by John Arbash Meinel
Handle pointless commits and trees with unknown files.
692
            if response == gtk.RESPONSE_NO:
693
                return
694
            break
278.1.23 by John Arbash Meinel
Beginning to support actual commit.
695
278.1.25 by John Arbash Meinel
Add the 'Only Commit Locally' checkbox, we may want to put it elsewhere, though.
696
        rev_id = None
278.1.27 by John Arbash Meinel
Add the ability to commit just specific files.
697
        revprops = {}
698
        if file_info:
278.1.31 by John Arbash Meinel
We can make bencode work again by a simple decode/encode step.
699
            revprops['file-info'] = bencode.bencode(file_info).decode('UTF-8')
278.1.23 by John Arbash Meinel
Beginning to support actual commit.
700
        try:
701
            rev_id = self._wt.commit(message,
702
                       allow_pointless=False,
703
                       strict=False,
704
                       local=local,
278.1.27 by John Arbash Meinel
Add the ability to commit just specific files.
705
                       specific_files=specific_files,
706
                       revprops=revprops)
278.1.23 by John Arbash Meinel
Beginning to support actual commit.
707
        except errors.PointlessCommit:
606 by Vincent Ladeuil
Fix gtk dialogs popping up and asking for input during selftest.
708
            response = self._question_dialog(
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
709
                _i18n('Commit with no changes?'),
710
                _i18n('There are no changes in the working tree.'
576.1.1 by Jasper Groenewegen
Add parent setting to dialogs and implement in gcommit
711
                      ' Do you want to commit anyway?'),
712
                parent=self)
278.1.23 by John Arbash Meinel
Beginning to support actual commit.
713
            if response == gtk.RESPONSE_YES:
714
                rev_id = self._wt.commit(message,
715
                               allow_pointless=True,
716
                               strict=False,
717
                               local=local,
278.1.27 by John Arbash Meinel
Add the ability to commit just specific files.
718
                               specific_files=specific_files,
719
                               revprops=revprops)
278.1.23 by John Arbash Meinel
Beginning to support actual commit.
720
        self.committed_revision_id = rev_id
721
        self.response(gtk.RESPONSE_OK)
722
278.1.25 by John Arbash Meinel
Add the 'Only Commit Locally' checkbox, we may want to put it elsewhere, though.
723
    def _get_global_commit_message(self):
724
        buf = self._global_message_text_view.get_buffer()
725
        start, end = buf.get_bounds()
622.1.1 by John Arbash Meinel
Ensure that per-file commit messages and global commit messages get sanitized.
726
        text = buf.get_text(start, end)
727
        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.
728
729
    def _set_global_commit_message(self, message):
730
        """Just a helper for the test suite."""
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
731
        if isinstance(message, unicode):
732
            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.
733
        self._global_message_text_view.get_buffer().set_text(message)
734
278.1.27 by John Arbash Meinel
Add the ability to commit just specific files.
735
    def _set_file_commit_message(self, message):
736
        """Helper for the test suite."""
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
737
        if isinstance(message, unicode):
738
            message = message.encode('UTF-8')
278.1.27 by John Arbash Meinel
Add the ability to commit just specific files.
739
        self._file_message_text_view.get_buffer().set_text(message)
740
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
741
    @staticmethod
742
    def _rev_to_pending_info(rev):
743
        """Get the information from a pending merge."""
126.1.1 by Szilveszter Farkas (Phanatic)
New Commit dialog implementation (no more Glade).
744
        from bzrlib.osutils import format_date
278.1.5 by John Arbash Meinel
Starting to flesh out the dialog with actual windows.
745
        rev_dict = {}
746
        rev_dict['committer'] = re.sub('<.*@.*>', '', rev.committer).strip(' ')
747
        rev_dict['summary'] = rev.get_summary()
748
        rev_dict['date'] = format_date(rev.timestamp,
749
                                       rev.timezone or 0,
750
                                       'original', date_fmt="%Y-%m-%d",
751
                                       show_offset=False)
752
        rev_dict['revision_id'] = rev.revision_id
753
        return rev_dict