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