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