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