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