/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: John Arbash Meinel
  • Date: 2007-10-01 18:22:16 UTC
  • mto: (322.1.1 trunk) (330.3.3 trunk)
  • mto: This revision was merged to the branch mainline in revision 368.
  • Revision ID: john@arbash-meinel.com-20071001182216-z6p6s38u9ela7s9s
Worked out the rest of the spacing.
Also left aligning the labels on the right side, to make them consistent.
I might consider doing the same for the left side.

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
33
32
 
34
 
from bzrlib.plugins.gtk import _i18n
35
33
from dialog import error_dialog, question_dialog
36
34
from errors import show_bzr_error
37
35
 
101
99
    """Implementation of Commit."""
102
100
 
103
101
    def __init__(self, wt, selected=None, parent=None):
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()
 
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)
121
112
 
122
113
    def setup_params(self):
123
114
        """Setup the member variables for state."""
124
115
        self._basis_tree = self._wt.basis_tree()
125
 
        self._delta = None
 
116
        self._delta = self._wt.changes_from(self._basis_tree)
 
117
 
126
118
        self._pending = pending_revisions(self._wt)
127
119
 
128
120
        self._is_checkout = (self._wt.branch.get_bound_location() is not None)
129
121
 
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
 
 
266
122
    def construct(self):
267
123
        """Build up the dialog widgets."""
268
124
        # The primary pane which splits it into left and right (adjustable)
271
127
 
272
128
        self._construct_left_pane()
273
129
        self._construct_right_pane()
274
 
        self._construct_action_pane()
275
130
 
276
131
        self.vbox.pack_start(self._hpane)
277
132
        self._hpane.show()
278
133
        self.set_focus(self._global_message_text_view)
279
134
 
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
 
 
309
135
    def _construct_left_pane(self):
310
136
        self._left_pane_box = gtk.VBox(homogeneous=False, spacing=5)
311
137
        self._construct_file_list()
312
138
        self._construct_pending_list()
313
139
 
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)
 
140
        self._pending_box.show()
 
141
        self._hpane.pack1(self._left_pane_box, resize=False, shrink=True)
320
142
        self._left_pane_box.show()
321
143
 
322
144
    def _construct_right_pane(self):
337
159
        self._right_pane_table.show()
338
160
        self._hpane.pack2(self._right_pane_table, resize=True, shrink=True)
339
161
 
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
162
    def _add_to_right_table(self, widget, weight, expanding=False):
349
163
        """Add another widget to the table
350
164
 
364
178
 
365
179
    def _construct_file_list(self):
366
180
        self._files_box = gtk.VBox(homogeneous=False, spacing=0)
367
 
        file_label = gtk.Label(_i18n('Files'))
368
 
        # file_label.show()
 
181
        file_label = gtk.Label()
 
182
        file_label.set_markup(_('<b>Files</b>'))
 
183
        file_label.show()
369
184
        self._files_box.pack_start(file_label, expand=False)
370
185
 
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
 
 
388
186
        scroller = gtk.ScrolledWindow()
389
187
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
390
188
        self._treeview_files = gtk.TreeView()
391
189
        self._treeview_files.show()
392
190
        scroller.add(self._treeview_files)
 
191
        scroller.show()
393
192
        scroller.set_shadow_type(gtk.SHADOW_IN)
394
 
        scroller.show()
395
193
        self._files_box.pack_start(scroller,
396
194
                                   expand=True, fill=True)
397
195
        self._files_box.show()
398
196
        self._left_pane_box.pack_start(self._files_box)
399
197
 
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
 
 
450
198
    def _construct_pending_list(self):
451
199
        # Pending information defaults to hidden, we put it all in 1 box, so
452
200
        # that we can show/hide all of them at once
453
201
        self._pending_box = gtk.VBox()
454
202
        self._pending_box.hide()
455
203
 
 
204
        # TODO: This message should be centered
456
205
        pending_message = gtk.Label()
457
206
        pending_message.set_markup(
458
 
            _i18n('<i>* Cannot select specific files when merging</i>'))
 
207
            _('<i>Cannot select specific files when merging</i>'))
459
208
        self._pending_box.pack_start(pending_message, expand=False, padding=5)
460
209
        pending_message.show()
461
210
 
462
 
        pending_label = gtk.Label(_i18n('Pending Revisions'))
 
211
        pending_label = gtk.Label()
 
212
        pending_label.set_markup(_('<b>Pending Revisions</b>'))
463
213
        self._pending_box.pack_start(pending_label, expand=False, padding=0)
464
214
        pending_label.show()
465
215
 
467
217
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
468
218
        self._treeview_pending = gtk.TreeView()
469
219
        scroller.add(self._treeview_pending)
 
220
        scroller.show()
470
221
        scroller.set_shadow_type(gtk.SHADOW_IN)
471
 
        scroller.show()
472
222
        self._pending_box.pack_start(scroller,
473
223
                                     expand=True, fill=True, padding=5)
474
224
        self._treeview_pending.show()
475
225
        self._left_pane_box.pack_start(self._pending_box)
476
226
 
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
 
 
491
227
    def _construct_diff_view(self):
492
 
        from diff import DiffView
 
228
        from diff import DiffDisplay
493
229
 
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'))
 
230
        self._diff_label = gtk.Label(_('Diff for whole tree'))
499
231
        self._diff_label.set_alignment(0, 0)
500
232
        self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
501
233
        self._add_to_right_table(self._diff_label, 1, False)
502
 
        # self._diff_label.show()
 
234
        self._diff_label.show()
503
235
 
504
 
        self._diff_view = DiffView()
 
236
        self._diff_view = DiffDisplay()
505
237
        self._add_to_right_table(self._diff_view, 4, True)
506
238
        self._diff_view.show()
507
239
 
508
240
    def _construct_file_message(self):
 
241
        file_message_box = gtk.VBox()
509
242
        scroller = gtk.ScrolledWindow()
510
243
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
511
244
 
512
245
        self._file_message_text_view = gtk.TextView()
513
246
        scroller.add(self._file_message_text_view)
 
247
        scroller.show()
514
248
        scroller.set_shadow_type(gtk.SHADOW_IN)
515
 
        scroller.show()
 
249
        file_message_box.pack_start(scroller, expand=True, fill=True)
516
250
 
517
251
        self._file_message_text_view.modify_font(pango.FontDescription("Monospace"))
518
252
        self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
519
253
        self._file_message_text_view.set_accepts_tab(False)
520
254
        self._file_message_text_view.show()
521
255
 
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)
 
256
        self._file_message_expander = gtk.Expander(_('Message for XXX'))
 
257
        self._file_message_expander.add(file_message_box)
 
258
        file_message_box.show()
525
259
        self._add_to_right_table(self._file_message_expander, 1, False)
526
260
        self._file_message_expander.show()
527
261
 
528
262
    def _construct_global_message(self):
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>'))
 
263
        self._global_message_label = gtk.Label(_('Global Commit Message'))
532
264
        self._global_message_label.set_alignment(0, 0)
533
265
        self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
534
266
        self._add_to_right_table(self._global_message_label, 1, False)
541
273
        self._global_message_text_view = gtk.TextView()
542
274
        self._global_message_text_view.modify_font(pango.FontDescription("Monospace"))
543
275
        scroller.add(self._global_message_text_view)
 
276
        scroller.show()
544
277
        scroller.set_shadow_type(gtk.SHADOW_IN)
545
 
        scroller.show()
546
278
        self._add_to_right_table(scroller, 2, True)
547
279
        self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
548
280
        self._file_message_text_view.set_accepts_tab(False)
549
281
        self._global_message_text_view.show()
550
282
 
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
 
 
724
283
    @staticmethod
725
284
    def _rev_to_pending_info(rev):
726
285
        """Get the information from a pending merge."""
727
286
        from bzrlib.osutils import format_date
 
287
 
728
288
        rev_dict = {}
729
289
        rev_dict['committer'] = re.sub('<.*@.*>', '', rev.committer).strip(' ')
730
290
        rev_dict['summary'] = rev.get_summary()
734
294
                                       show_offset=False)
735
295
        rev_dict['revision_id'] = rev.revision_id
736
296
        return rev_dict
 
297
 
 
298
 
 
299
# class CommitDialog(gtk.Dialog):
 
300
#     """ New implementation of the Commit dialog. """
 
301
#     def __init__(self, wt, wtpath, notbranch, selected=None, parent=None):
 
302
#         """ Initialize the Commit Dialog. """
 
303
#         gtk.Dialog.__init__(self, title="Commit - Olive",
 
304
#                                   parent=parent,
 
305
#                                   flags=0,
 
306
#                                   buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
 
307
#         
 
308
#         # Get arguments
 
309
#         self.wt = wt
 
310
#         self.wtpath = wtpath
 
311
#         self.notbranch = notbranch
 
312
#         self.selected = selected
 
313
#         
 
314
#         # Set the delta
 
315
#         self.old_tree = self.wt.branch.repository.revision_tree(self.wt.branch.last_revision())
 
316
#         self.delta = self.wt.changes_from(self.old_tree)
 
317
#         
 
318
#         # Get pending merges
 
319
#         self.pending = self._pending_merges(self.wt)
 
320
#         
 
321
#         # Do some preliminary checks
 
322
#         self._is_checkout = False
 
323
#         self._is_pending = False
 
324
#         if self.wt is None and not self.notbranch:
 
325
#             error_dialog(_('Directory does not have a working tree'),
 
326
#                          _('Operation aborted.'))
 
327
#             self.close()
 
328
#             return
 
329
# 
 
330
#         if self.notbranch:
 
331
#             error_dialog(_('Directory is not a branch'),
 
332
#                          _('You can perform this action only in a branch.'))
 
333
#             self.close()
 
334
#             return
 
335
#         else:
 
336
#             if self.wt.branch.get_bound_location() is not None:
 
337
#                 # we have a checkout, so the local commit checkbox must appear
 
338
#                 self._is_checkout = True
 
339
#             
 
340
#             if self.pending:
 
341
#                 # There are pending merges, file selection not supported
 
342
#                 self._is_pending = True
 
343
#         
 
344
#         # Create the widgets
 
345
#         # This is the main horizontal box, which is used to separate the commit
 
346
#         # info from the diff window.
 
347
#         self._hpane = gtk.HPaned()
 
348
#         self._button_commit = gtk.Button(_("Comm_it"), use_underline=True)
 
349
#         self._expander_files = gtk.Expander(_("File(s) to commit"))
 
350
#         self._vpaned_main = gtk.VPaned()
 
351
#         self._scrolledwindow_files = gtk.ScrolledWindow()
 
352
#         self._scrolledwindow_message = gtk.ScrolledWindow()
 
353
#         self._treeview_files = gtk.TreeView()
 
354
#         self._vbox_message = gtk.VBox()
 
355
#         self._label_message = gtk.Label(_("Commit message:"))
 
356
#         self._textview_message = gtk.TextView()
 
357
#         
 
358
#         if self._is_pending:
 
359
#             self._expander_merges = gtk.Expander(_("Pending merges"))
 
360
#             self._vpaned_list = gtk.VPaned()
 
361
#             self._scrolledwindow_merges = gtk.ScrolledWindow()
 
362
#             self._treeview_merges = gtk.TreeView()
 
363
# 
 
364
#         # Set callbacks
 
365
#         self._button_commit.connect('clicked', self._on_commit_clicked)
 
366
#         self._treeview_files.connect('cursor-changed', self._on_treeview_files_cursor_changed)
 
367
#         self._treeview_files.connect('row-activated', self._on_treeview_files_row_activated)
 
368
#         
 
369
#         # Set properties
 
370
#         self._scrolledwindow_files.set_policy(gtk.POLICY_AUTOMATIC,
 
371
#                                               gtk.POLICY_AUTOMATIC)
 
372
#         self._scrolledwindow_message.set_policy(gtk.POLICY_AUTOMATIC,
 
373
#                                                 gtk.POLICY_AUTOMATIC)
 
374
#         self._textview_message.modify_font(pango.FontDescription("Monospace"))
 
375
#         self.set_default_size(500, 500)
 
376
#         self._vpaned_main.set_position(200)
 
377
#         self._button_commit.set_flags(gtk.CAN_DEFAULT)
 
378
# 
 
379
#         if self._is_pending:
 
380
#             self._scrolledwindow_merges.set_policy(gtk.POLICY_AUTOMATIC,
 
381
#                                                    gtk.POLICY_AUTOMATIC)
 
382
#             self._treeview_files.set_sensitive(False)
 
383
#         
 
384
#         # Construct the dialog
 
385
#         self.action_area.pack_end(self._button_commit)
 
386
#         
 
387
#         self._scrolledwindow_files.add(self._treeview_files)
 
388
#         self._scrolledwindow_message.add(self._textview_message)
 
389
#         
 
390
#         self._expander_files.add(self._scrolledwindow_files)
 
391
#         
 
392
#         self._vbox_message.pack_start(self._label_message, False, False)
 
393
#         self._vbox_message.pack_start(self._scrolledwindow_message, True, True)
 
394
#         
 
395
#         if self._is_pending:        
 
396
#             self._expander_merges.add(self._scrolledwindow_merges)
 
397
#             self._scrolledwindow_merges.add(self._treeview_merges)
 
398
#             self._vpaned_list.add1(self._expander_files)
 
399
#             self._vpaned_list.add2(self._expander_merges)
 
400
#             self._vpaned_main.add1(self._vpaned_list)
 
401
#         else:
 
402
#             self._vpaned_main.add1(self._expander_files)
 
403
# 
 
404
#         self._vpaned_main.add2(self._vbox_message)
 
405
#         
 
406
#         self._hpane.pack1(self._vpaned_main)
 
407
#         self.vbox.pack_start(self._hpane, expand=True, fill=True)
 
408
#         if self._is_checkout: 
 
409
#             self._check_local = gtk.CheckButton(_("_Only commit locally"),
 
410
#                                                 use_underline=True)
 
411
#             self.vbox.pack_start(self._check_local, False, False)
 
412
#             if have_dbus:
 
413
#                 bus = dbus.SystemBus()
 
414
#                 proxy_obj = bus.get_object('org.freedesktop.NetworkManager', 
 
415
#                               '/org/freedesktop/NetworkManager')
 
416
#                 dbus_iface = dbus.Interface(
 
417
#                         proxy_obj, 'org.freedesktop.NetworkManager')
 
418
#                 try:
 
419
#                     # 3 is the enum value for STATE_CONNECTED
 
420
#                     self._check_local.set_active(dbus_iface.state() != 3)
 
421
#                 except dbus.DBusException, e:
 
422
#                     # Silently drop errors. While DBus may be 
 
423
#                     # available, NetworkManager doesn't necessarily have to be
 
424
#                     mutter("unable to get networkmanager state: %r" % e)
 
425
#                 
 
426
#         # Create the file list
 
427
#         self._create_file_view()
 
428
#         # Create the pending merges
 
429
#         self._create_pending_merges()
 
430
#         self._create_diff_view()
 
431
#         
 
432
#         # Expand the corresponding expander
 
433
#         if self._is_pending:
 
434
#             self._expander_merges.set_expanded(True)
 
435
#         else:
 
436
#             self._expander_files.set_expanded(True)
 
437
#         
 
438
#         # Display dialog
 
439
#         self.vbox.show_all()
 
440
#         
 
441
#         # Default to Commit button
 
442
#         self._button_commit.grab_default()
 
443
#     
 
444
#     def _show_diff_view(self, treeview):
 
445
#         # FIXME: the diff window freezes for some reason
 
446
#         treeselection = treeview.get_selection()
 
447
#         (model, iter) = treeselection.get_selected()
 
448
# 
 
449
#         if iter is not None:
 
450
#             selected = model.get_value(iter, 3) # Get the real_path attribute
 
451
#             self._diff_display.show_diff([selected])
 
452
# 
 
453
#     def _on_treeview_files_cursor_changed(self, treeview):
 
454
#         self._show_diff_view(treeview)
 
455
#         
 
456
#     def _on_treeview_files_row_activated(self, treeview, path, view_column):
 
457
#         self._show_diff_view(treeview)
 
458
#     
 
459
#     @show_bzr_error
 
460
#     def _on_commit_clicked(self, button):
 
461
#         """ Commit button clicked handler. """
 
462
#         textbuffer = self._textview_message.get_buffer()
 
463
#         start, end = textbuffer.get_bounds()
 
464
#         message = textbuffer.get_text(start, end).decode('utf-8')
 
465
#         
 
466
#         if not self.pending:
 
467
#             specific_files = self._get_specific_files()
 
468
#         else:
 
469
#             specific_files = None
 
470
# 
 
471
#         if message == '':
 
472
#             response = question_dialog(_('Commit with an empty message?'),
 
473
#                                        _('You can describe your commit intent in the message.'))
 
474
#             if response == gtk.RESPONSE_NO:
 
475
#                 # Kindly give focus to message area
 
476
#                 self._textview_message.grab_focus()
 
477
#                 return
 
478
# 
 
479
#         if self._is_checkout:
 
480
#             local = self._check_local.get_active()
 
481
#         else:
 
482
#             local = False
 
483
# 
 
484
#         if list(self.wt.unknowns()) != []:
 
485
#             response = question_dialog(_("Commit with unknowns?"),
 
486
#                _("Unknown files exist in the working tree. Commit anyway?"))
 
487
#             if response == gtk.RESPONSE_NO:
 
488
#                 return
 
489
#         
 
490
#         try:
 
491
#             self.wt.commit(message,
 
492
#                        allow_pointless=False,
 
493
#                        strict=False,
 
494
#                        local=local,
 
495
#                        specific_files=specific_files)
 
496
#         except errors.PointlessCommit:
 
497
#             response = question_dialog(_('Commit with no changes?'),
 
498
#                                        _('There are no changes in the working tree.'))
 
499
#             if response == gtk.RESPONSE_YES:
 
500
#                 self.wt.commit(message,
 
501
#                                allow_pointless=True,
 
502
#                                strict=False,
 
503
#                                local=local,
 
504
#                                specific_files=specific_files)
 
505
#         self.response(gtk.RESPONSE_OK)
 
506
# 
 
507
#     def _pending_merges(self, wt):
 
508
#         """ Return a list of pending merges or None if there are none of them. """
 
509
#         parents = wt.get_parent_ids()
 
510
#         if len(parents) < 2:
 
511
#             return None
 
512
#         
 
513
#         import re
 
514
#         from bzrlib.osutils import format_date
 
515
#         
 
516
#         pending = parents[1:]
 
517
#         branch = wt.branch
 
518
#         last_revision = parents[0]
 
519
#         
 
520
#         if last_revision is not None:
 
521
#             try:
 
522
#                 ignore = set(branch.repository.get_ancestry(last_revision))
 
523
#             except errors.NoSuchRevision:
 
524
#                 # the last revision is a ghost : assume everything is new 
 
525
#                 # except for it
 
526
#                 ignore = set([None, last_revision])
 
527
#         else:
 
528
#             ignore = set([None])
 
529
#         
 
530
#         pm = []
 
531
#         for merge in pending:
 
532
#             ignore.add(merge)
 
533
#             try:
 
534
#                 m_revision = branch.repository.get_revision(merge)
 
535
#                 
 
536
#                 rev = {}
 
537
#                 rev['committer'] = re.sub('<.*@.*>', '', m_revision.committer).strip(' ')
 
538
#                 rev['summary'] = m_revision.get_summary()
 
539
#                 rev['date'] = format_date(m_revision.timestamp,
 
540
#                                           m_revision.timezone or 0, 
 
541
#                                           'original', date_fmt="%Y-%m-%d",
 
542
#                                           show_offset=False)
 
543
#                 
 
544
#                 pm.append(rev)
 
545
#                 
 
546
#                 inner_merges = branch.repository.get_ancestry(merge)
 
547
#                 assert inner_merges[0] is None
 
548
#                 inner_merges.pop(0)
 
549
#                 inner_merges.reverse()
 
550
#                 for mmerge in inner_merges:
 
551
#                     if mmerge in ignore:
 
552
#                         continue
 
553
#                     mm_revision = branch.repository.get_revision(mmerge)
 
554
#                     
 
555
#                     rev = {}
 
556
#                     rev['committer'] = re.sub('<.*@.*>', '', mm_revision.committer).strip(' ')
 
557
#                     rev['summary'] = mm_revision.get_summary()
 
558
#                     rev['date'] = format_date(mm_revision.timestamp,
 
559
#                                               mm_revision.timezone or 0, 
 
560
#                                               'original', date_fmt="%Y-%m-%d",
 
561
#                                               show_offset=False)
 
562
#                 
 
563
#                     pm.append(rev)
 
564
#                     
 
565
#                     ignore.add(mmerge)
 
566
#             except errors.NoSuchRevision:
 
567
#                 print "DEBUG: NoSuchRevision:", merge
 
568
#         
 
569
#         return pm
 
570
# 
 
571
#     def _create_file_view(self):
 
572
#         self._file_store = gtk.ListStore(gobject.TYPE_BOOLEAN,   # [0] checkbox
 
573
#                                          gobject.TYPE_STRING,    # [1] path to display
 
574
#                                          gobject.TYPE_STRING,    # [2] changes type
 
575
#                                          gobject.TYPE_STRING)    # [3] real path
 
576
#         self._treeview_files.set_model(self._file_store)
 
577
#         crt = gtk.CellRendererToggle()
 
578
#         crt.set_property("activatable", True)
 
579
#         crt.connect("toggled", self._toggle_commit, self._file_store)
 
580
#         self._treeview_files.append_column(gtk.TreeViewColumn(_('Commit'),
 
581
#                                      crt, active=0))
 
582
#         self._treeview_files.append_column(gtk.TreeViewColumn(_('Path'),
 
583
#                                      gtk.CellRendererText(), text=1))
 
584
#         self._treeview_files.append_column(gtk.TreeViewColumn(_('Type'),
 
585
#                                      gtk.CellRendererText(), text=2))
 
586
# 
 
587
#         for path, id, kind in self.delta.added:
 
588
#             marker = osutils.kind_marker(kind)
 
589
#             if self.selected is not None:
 
590
#                 if path == os.path.join(self.wtpath, self.selected):
 
591
#                     self._file_store.append([ True, path+marker, _('added'), path ])
 
592
#                 else:
 
593
#                     self._file_store.append([ False, path+marker, _('added'), path ])
 
594
#             else:
 
595
#                 self._file_store.append([ True, path+marker, _('added'), path ])
 
596
# 
 
597
#         for path, id, kind in self.delta.removed:
 
598
#             marker = osutils.kind_marker(kind)
 
599
#             if self.selected is not None:
 
600
#                 if path == os.path.join(self.wtpath, self.selected):
 
601
#                     self._file_store.append([ True, path+marker, _('removed'), path ])
 
602
#                 else:
 
603
#                     self._file_store.append([ False, path+marker, _('removed'), path ])
 
604
#             else:
 
605
#                 self._file_store.append([ True, path+marker, _('removed'), path ])
 
606
# 
 
607
#         for oldpath, newpath, id, kind, text_modified, meta_modified in self.delta.renamed:
 
608
#             marker = osutils.kind_marker(kind)
 
609
#             if text_modified or meta_modified:
 
610
#                 changes = _('renamed and modified')
 
611
#             else:
 
612
#                 changes = _('renamed')
 
613
#             if self.selected is not None:
 
614
#                 if newpath == os.path.join(self.wtpath, self.selected):
 
615
#                     self._file_store.append([ True,
 
616
#                                               oldpath+marker + '  =>  ' + newpath+marker,
 
617
#                                               changes,
 
618
#                                               newpath
 
619
#                                             ])
 
620
#                 else:
 
621
#                     self._file_store.append([ False,
 
622
#                                               oldpath+marker + '  =>  ' + newpath+marker,
 
623
#                                               changes,
 
624
#                                               newpath
 
625
#                                             ])
 
626
#             else:
 
627
#                 self._file_store.append([ True,
 
628
#                                           oldpath+marker + '  =>  ' + newpath+marker,
 
629
#                                           changes,
 
630
#                                           newpath
 
631
#                                         ])
 
632
# 
 
633
#         for path, id, kind, text_modified, meta_modified in self.delta.modified:
 
634
#             marker = osutils.kind_marker(kind)
 
635
#             if self.selected is not None:
 
636
#                 if path == os.path.join(self.wtpath, self.selected):
 
637
#                     self._file_store.append([ True, path+marker, _('modified'), path ])
 
638
#                 else:
 
639
#                     self._file_store.append([ False, path+marker, _('modified'), path ])
 
640
#             else:
 
641
#                 self._file_store.append([ True, path+marker, _('modified'), path ])
 
642
#     
 
643
#     def _create_pending_merges(self):
 
644
#         if not self.pending:
 
645
#             return
 
646
#         
 
647
#         liststore = gtk.ListStore(gobject.TYPE_STRING,
 
648
#                                   gobject.TYPE_STRING,
 
649
#                                   gobject.TYPE_STRING)
 
650
#         self._treeview_merges.set_model(liststore)
 
651
#         
 
652
#         self._treeview_merges.append_column(gtk.TreeViewColumn(_('Date'),
 
653
#                                             gtk.CellRendererText(), text=0))
 
654
#         self._treeview_merges.append_column(gtk.TreeViewColumn(_('Committer'),
 
655
#                                             gtk.CellRendererText(), text=1))
 
656
#         self._treeview_merges.append_column(gtk.TreeViewColumn(_('Summary'),
 
657
#                                             gtk.CellRendererText(), text=2))
 
658
#         
 
659
#         for item in self.pending:
 
660
#             liststore.append([ item['date'],
 
661
#                                item['committer'],
 
662
#                                item['summary'] ])
 
663
#     
 
664
# 
 
665
#     def _create_diff_view(self):
 
666
#         from diff import DiffDisplay
 
667
# 
 
668
#         self._diff_display = DiffDisplay()
 
669
#         self._diff_display.set_trees(self.wt, self.wt.basis_tree())
 
670
#         self._diff_display.show_diff(None)
 
671
#         self._diff_display.show()
 
672
#         self._hpane.pack2(self._diff_display)
 
673
# 
 
674
#     def _get_specific_files(self):
 
675
#         ret = []
 
676
#         it = self._file_store.get_iter_first()
 
677
#         while it:
 
678
#             if self._file_store.get_value(it, 0):
 
679
#                 # get real path from hidden column 3
 
680
#                 ret.append(self._file_store.get_value(it, 3))
 
681
#             it = self._file_store.iter_next(it)
 
682
# 
 
683
#         return ret
 
684
#     
 
685
#     def _toggle_commit(self, cell, path, model):
 
686
#         model[path][0] = not model[path][0]
 
687
#         return