/b-gtk/fix-viz

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