/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 commit.py

  • Committer: Jelmer Vernooij
  • Date: 2008-06-29 15:47:30 UTC
  • mto: This revision was merged to the branch mainline in revision 519.
  • Revision ID: jelmer@samba.org-20080629154730-xfsotoxwkiytf0ph
Pass graph object rather than full repository to linegraph.

Show diffs side-by-side

added added

removed removed

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