/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to olive/commit.py

  • Committer: Jelmer Vernooij
  • Date: 2007-02-01 15:50:40 UTC
  • Revision ID: jelmer@samba.org-20070201155040-3hq4mfbxs99kzazy
add framework for tests.

Show diffs side-by-side

added added

removed removed

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