/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-02 23:08:12 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-20071002230812-h8i6pq8fwvodute4
Start testing with Unicode data.
It seems there is some brokenness with serializing Unicode messages.
But otherwise everything seems to be working.

Show diffs side-by-side

added added

removed removed

Lines of Context:
commit.py
31
31
from bzrlib.trace import mutter
32
32
from bzrlib.util import bencode
33
33
 
34
 
from bzrlib.plugins.gtk import _i18n
35
34
from dialog import error_dialog, question_dialog
36
35
from errors import show_bzr_error
37
36
 
108
107
        self._question_dialog = question_dialog
109
108
 
110
109
        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
110
        self._selected = selected
114
 
        self._enable_per_file_commits = True
115
 
        self._commit_all_changes = True
116
111
        self.committed_revision_id = None # Nothing has been committed yet
117
112
 
118
113
        self.setup_params()
133
128
        self._fill_in_diff()
134
129
        self._fill_in_files()
135
130
        self._fill_in_checkout()
136
 
        self._fill_in_per_file_info()
137
131
 
138
132
    def _fill_in_pending(self):
139
133
        if not self._pending:
165
159
        store = self._files_store
166
160
        self._treeview_files.set_model(None)
167
161
 
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')
 
162
        added = _('added')
 
163
        removed = _('removed')
 
164
        renamed = _('renamed')
 
165
        renamed_and_modified = _('renamed and modified')
 
166
        modified = _('modified')
 
167
        kind_changed = _('kind changed')
174
168
 
175
169
        # The store holds:
176
170
        # [file_id, real path, checkbox, display path, changes type, message]
177
 
        # iter_changes returns:
 
171
        # _iter_changes returns:
178
172
        # (file_id, (path_in_source, path_in_target),
179
173
        #  changed_content, versioned, parent, name, kind,
180
174
        #  executable)
181
175
 
182
 
        all_enabled = (self._selected is None)
183
176
        # 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)
 
177
        store.append([None, None, True, 'All Files', '', ''])
186
178
        # should we pass specific_files?
187
179
        self._wt.lock_read()
188
180
        self._basis_tree.lock_read()
189
181
        try:
190
 
            from diff import iter_changes_to_status
 
182
            from diff import _iter_changes_to_status
191
183
            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)
 
184
                ) in _iter_changes_to_status(self._basis_tree, self._wt):
 
185
                store.append([file_id, real_path.encode('UTF-8'),
 
186
                              True, display_path.encode('UTF-8'),
 
187
                              change_type, ''])
207
188
        finally:
208
189
            self._basis_tree.unlock()
209
190
            self._wt.unlock()
210
191
 
211
192
        self._treeview_files.set_model(store)
212
193
        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)
 
194
        self._treeview_files.set_cursor(0)
221
195
 
222
196
    def _fill_in_diff(self):
223
197
        self._diff_view.set_trees(self._wt, self._basis_tree)
228
202
            return
229
203
        if have_dbus:
230
204
            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
 
            
 
205
            proxy_obj = bus.get_object('org.freedesktop.NetworkManager',
 
206
                                       '/org/freedesktop/NetworkManager')
239
207
            dbus_iface = dbus.Interface(proxy_obj,
240
208
                                        'org.freedesktop.NetworkManager')
241
209
            try:
247
215
                mutter("unable to get networkmanager state: %r" % e)
248
216
        self._check_local.show()
249
217
 
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
218
    def _compute_delta(self):
264
219
        self._delta = self._wt.changes_from(self._basis_tree)
265
220
 
277
232
        self._hpane.show()
278
233
        self.set_focus(self._global_message_text_view)
279
234
 
280
 
        self._construct_accelerators()
281
 
        self._set_sizes()
282
 
 
283
 
    def _set_sizes(self):
284
235
        # This seems like a reasonable default, we might like it to
285
236
        # be a bit wider, so that by default we can fit an 80-line diff in the
286
237
        # diff window.
297
248
        self.set_default_size(width, height)
298
249
        self._hpane.set_position(300)
299
250
 
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
251
    def _construct_left_pane(self):
310
252
        self._left_pane_box = gtk.VBox(homogeneous=False, spacing=5)
311
253
        self._construct_file_list()
312
254
        self._construct_pending_list()
313
255
 
314
 
        self._check_local = gtk.CheckButton(_i18n("_Only commit locally"),
 
256
        self._check_local = gtk.CheckButton(_("_Only commit locally"),
315
257
                                            use_underline=True)
316
258
        self._left_pane_box.pack_end(self._check_local, False, False)
317
259
        self._check_local.set_active(False)
338
280
        self._hpane.pack2(self._right_pane_table, resize=True, shrink=True)
339
281
 
340
282
    def _construct_action_pane(self):
341
 
        self._button_commit = gtk.Button(_i18n("Comm_it"), use_underline=True)
 
283
        self._button_commit = gtk.Button(_("Comm_it"), use_underline=True)
342
284
        self._button_commit.connect('clicked', self._on_commit_clicked)
343
285
        self._button_commit.set_flags(gtk.CAN_DEFAULT)
344
286
        self._button_commit.show()
364
306
 
365
307
    def _construct_file_list(self):
366
308
        self._files_box = gtk.VBox(homogeneous=False, spacing=0)
367
 
        file_label = gtk.Label(_i18n('Files'))
368
 
        # file_label.show()
 
309
        file_label = gtk.Label(_('Files'))
 
310
        file_label.show()
369
311
        self._files_box.pack_start(file_label, expand=False)
370
312
 
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
313
        scroller = gtk.ScrolledWindow()
389
314
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
390
315
        self._treeview_files = gtk.TreeView()
391
316
        self._treeview_files.show()
392
317
        scroller.add(self._treeview_files)
 
318
        scroller.show()
393
319
        scroller.set_shadow_type(gtk.SHADOW_IN)
394
 
        scroller.show()
395
320
        self._files_box.pack_start(scroller,
396
321
                                   expand=True, fill=True)
397
322
        self._files_box.show()
398
323
        self._left_pane_box.pack_start(self._files_box)
399
324
 
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
325
        liststore = gtk.ListStore(
404
326
            gobject.TYPE_STRING,  # [0] file_id
405
327
            gobject.TYPE_STRING,  # [1] real path
411
333
        self._files_store = liststore
412
334
        self._treeview_files.set_model(liststore)
413
335
        crt = gtk.CellRendererToggle()
414
 
        crt.set_property('activatable', not bool(self._pending))
 
336
        crt.set_active(not bool(self._pending))
415
337
        crt.connect("toggled", self._toggle_commit, self._files_store)
416
338
        if self._pending:
417
 
            name = _i18n('Commit*')
 
339
            name = _('Commit*')
418
340
        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'),
 
341
            name = _('Commit')
 
342
        self._treeview_files.append_column(gtk.TreeViewColumn(name,
 
343
                                           crt, active=2))
 
344
        self._treeview_files.append_column(gtk.TreeViewColumn(_('Path'),
424
345
                                           gtk.CellRendererText(), text=3))
425
 
        self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Type'),
 
346
        self._treeview_files.append_column(gtk.TreeViewColumn(_('Type'),
426
347
                                           gtk.CellRendererText(), text=4))
427
348
        self._treeview_files.connect('cursor-changed',
428
349
                                     self._on_treeview_files_cursor_changed)
435
356
        else:
436
357
            model[path][2] = not model[path][2]
437
358
 
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
359
    def _construct_pending_list(self):
451
360
        # Pending information defaults to hidden, we put it all in 1 box, so
452
361
        # that we can show/hide all of them at once
455
364
 
456
365
        pending_message = gtk.Label()
457
366
        pending_message.set_markup(
458
 
            _i18n('<i>* Cannot select specific files when merging</i>'))
 
367
            _('<i>* Cannot select specific files when merging</i>'))
459
368
        self._pending_box.pack_start(pending_message, expand=False, padding=5)
460
369
        pending_message.show()
461
370
 
462
 
        pending_label = gtk.Label(_i18n('Pending Revisions'))
 
371
        pending_label = gtk.Label(_('Pending Revisions'))
463
372
        self._pending_box.pack_start(pending_label, expand=False, padding=0)
464
373
        pending_label.show()
465
374
 
467
376
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
468
377
        self._treeview_pending = gtk.TreeView()
469
378
        scroller.add(self._treeview_pending)
 
379
        scroller.show()
470
380
        scroller.set_shadow_type(gtk.SHADOW_IN)
471
 
        scroller.show()
472
381
        self._pending_box.pack_start(scroller,
473
382
                                     expand=True, fill=True, padding=5)
474
383
        self._treeview_pending.show()
481
390
                                 )
482
391
        self._pending_store = liststore
483
392
        self._treeview_pending.set_model(liststore)
484
 
        self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Date'),
 
393
        self._treeview_pending.append_column(gtk.TreeViewColumn(_('Date'),
485
394
                                             gtk.CellRendererText(), text=1))
486
 
        self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Committer'),
 
395
        self._treeview_pending.append_column(gtk.TreeViewColumn(_('Committer'),
487
396
                                             gtk.CellRendererText(), text=2))
488
 
        self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Summary'),
 
397
        self._treeview_pending.append_column(gtk.TreeViewColumn(_('Summary'),
489
398
                                             gtk.CellRendererText(), text=3))
490
399
 
491
400
    def _construct_diff_view(self):
492
401
        from diff import DiffView
493
402
 
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'))
 
403
        self._diff_label = gtk.Label(_('Diff for whole tree'))
499
404
        self._diff_label.set_alignment(0, 0)
500
405
        self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
501
406
        self._add_to_right_table(self._diff_label, 1, False)
502
 
        # self._diff_label.show()
 
407
        self._diff_label.show()
503
408
 
504
409
        self._diff_view = DiffView()
505
410
        self._add_to_right_table(self._diff_view, 4, True)
506
411
        self._diff_view.show()
507
412
 
508
413
    def _construct_file_message(self):
 
414
        file_message_box = gtk.VBox()
509
415
        scroller = gtk.ScrolledWindow()
510
416
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
511
417
 
512
418
        self._file_message_text_view = gtk.TextView()
513
419
        scroller.add(self._file_message_text_view)
 
420
        scroller.show()
514
421
        scroller.set_shadow_type(gtk.SHADOW_IN)
515
 
        scroller.show()
 
422
        file_message_box.pack_start(scroller, expand=True, fill=True)
516
423
 
517
424
        self._file_message_text_view.modify_font(pango.FontDescription("Monospace"))
518
425
        self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
519
426
        self._file_message_text_view.set_accepts_tab(False)
520
427
        self._file_message_text_view.show()
521
428
 
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)
 
429
        self._file_message_expander = gtk.Expander(_('File commit message'))
 
430
        self._file_message_expander.add(file_message_box)
 
431
        file_message_box.show()
525
432
        self._add_to_right_table(self._file_message_expander, 1, False)
526
433
        self._file_message_expander.show()
527
434
 
528
435
    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>'))
 
436
        self._global_message_label = gtk.Label(_('Global Commit Message'))
532
437
        self._global_message_label.set_alignment(0, 0)
533
438
        self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
534
439
        self._add_to_right_table(self._global_message_label, 1, False)
541
446
        self._global_message_text_view = gtk.TextView()
542
447
        self._global_message_text_view.modify_font(pango.FontDescription("Monospace"))
543
448
        scroller.add(self._global_message_text_view)
 
449
        scroller.show()
544
450
        scroller.set_shadow_type(gtk.SHADOW_IN)
545
 
        scroller.show()
546
451
        self._add_to_right_table(scroller, 2, True)
547
452
        self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
548
453
        self._file_message_text_view.set_accepts_tab(False)
554
459
 
555
460
        if selection is not None:
556
461
            path, display_path = model.get(selection, 1, 3)
557
 
            self._diff_label.set_text(_i18n('Diff for ') + display_path)
 
462
            self._diff_label.set_text(_('Diff for ') + display_path)
558
463
            if path is None:
559
464
                self._diff_view.show_diff(None)
560
465
            else:
561
466
                self._diff_view.show_diff([path.decode('UTF-8')])
562
467
            self._update_per_file_info(selection)
563
468
 
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
469
    def _save_current_file_message(self):
587
470
        if self._last_selected_file is None:
588
471
            return # Nothing to save
594
477
 
595
478
    def _update_per_file_info(self, selection):
596
479
        # The node is changing, so cache the current message
597
 
        if not self._enable_per_file_commits:
598
 
            return
599
 
 
600
480
        self._save_current_file_message()
601
481
        text_buffer = self._file_message_text_view.get_buffer()
602
482
        file_id, display_path, message = self._files_store.get(selection, 0, 3, 5)
603
483
        if file_id is None: # Whole tree
604
 
            self._file_message_expander.set_label(_i18n('File commit message'))
 
484
            self._file_message_expander.set_label(_('File commit message'))
605
485
            self._file_message_expander.set_expanded(False)
606
486
            self._file_message_expander.set_sensitive(False)
607
487
            text_buffer.set_text('')
608
488
            self._last_selected_file = None
609
489
        else:
610
 
            self._file_message_expander.set_label(_i18n('Commit message for ')
 
490
            self._file_message_expander.set_label(_('Commit message for ')
611
491
                                                  + display_path)
612
492
            self._file_message_expander.set_expanded(True)
613
493
            self._file_message_expander.set_sensitive(True)
615
495
            self._last_selected_file = self._files_store.get_path(selection)
616
496
 
617
497
    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
498
        self._save_current_file_message()
623
499
        files = []
624
500
        records = iter(self._files_store)
627
503
 
628
504
        file_info = []
629
505
        for record in records:
630
 
            if self._commit_all_changes or record[2]:# [2] checkbox
 
506
            if record[2]: # [2] checkbox
631
507
                file_id = record[0] # [0] file_id
632
 
                path = record[1]    # [1] real path
 
508
                path = record[1] # [1] real path
633
509
                file_message = record[5] # [5] commit message
634
510
                files.append(path.decode('UTF-8'))
635
 
                if self._enable_per_file_commits and file_message:
 
511
                if file_message:
636
512
                    # All of this needs to be utf-8 information
637
513
                    file_info.append({'path':path, 'file_id':file_id,
638
514
                                     'message':file_message})
639
515
        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, []
 
516
        return files, file_info
644
517
 
645
518
    @show_bzr_error
646
519
    def _on_commit_clicked(self, button):
652
525
 
653
526
        if message == '':
654
527
            response = self._question_dialog(
655
 
                _i18n('Commit with an empty message?'),
656
 
                _i18n('You can describe your commit intent in the message.'))
 
528
                            _('Commit with an empty message?'),
 
529
                            _('You can describe your commit intent in the message.'))
657
530
            if response == gtk.RESPONSE_NO:
658
531
                # Kindly give focus to message area
659
532
                self._global_message_text_view.grab_focus()
672
545
        #       files at this point.
673
546
        for path in self._wt.unknowns():
674
547
            response = self._question_dialog(
675
 
                _i18n("Commit with unknowns?"),
676
 
                _i18n("Unknown files exist in the working tree. Commit anyway?"))
 
548
                _("Commit with unknowns?"),
 
549
                _("Unknown files exist in the working tree. Commit anyway?"))
677
550
            if response == gtk.RESPONSE_NO:
678
551
                return
679
552
            break
681
554
        rev_id = None
682
555
        revprops = {}
683
556
        if file_info:
684
 
            revprops['file-info'] = bencode.bencode(file_info).decode('UTF-8')
 
557
            revprops['file-info'] = bencode.bencode(file_info)
685
558
        try:
686
559
            rev_id = self._wt.commit(message,
687
560
                       allow_pointless=False,
691
564
                       revprops=revprops)
692
565
        except errors.PointlessCommit:
693
566
            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?'))
 
567
                                _('Commit with no changes?'),
 
568
                                _('There are no changes in the working tree.'
 
569
                                  ' Do you want to commit anyway?'))
697
570
            if response == gtk.RESPONSE_YES:
698
571
                rev_id = self._wt.commit(message,
699
572
                               allow_pointless=True,
725
598
    def _rev_to_pending_info(rev):
726
599
        """Get the information from a pending merge."""
727
600
        from bzrlib.osutils import format_date
 
601
 
728
602
        rev_dict = {}
729
603
        rev_dict['committer'] = re.sub('<.*@.*>', '', rev.committer).strip(' ')
730
604
        rev_dict['summary'] = rev.get_summary()
734
608
                                       show_offset=False)
735
609
        rev_dict['revision_id'] = rev.revision_id
736
610
        return rev_dict
 
611
 
 
612
 
 
613
# class CommitDialog(gtk.Dialog):
 
614
#     """ New implementation of the Commit dialog. """
 
615
#     def __init__(self, wt, wtpath, notbranch, selected=None, parent=None):
 
616
#         """ Initialize the Commit Dialog. """
 
617
#         gtk.Dialog.__init__(self, title="Commit - Olive",
 
618
#                                   parent=parent,
 
619
#                                   flags=0,
 
620
#                                   buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
 
621
#         
 
622
#         # Get arguments
 
623
#         self.wt = wt
 
624
#         self.wtpath = wtpath
 
625
#         self.notbranch = notbranch
 
626
#         self.selected = selected
 
627
#         
 
628
#         # Set the delta
 
629
#         self.old_tree = self.wt.branch.repository.revision_tree(self.wt.branch.last_revision())
 
630
#         self.delta = self.wt.changes_from(self.old_tree)
 
631
#         
 
632
#         # Get pending merges
 
633
#         self.pending = self._pending_merges(self.wt)
 
634
#         
 
635
#         # Do some preliminary checks
 
636
#         self._is_checkout = False
 
637
#         self._is_pending = False
 
638
#         if self.wt is None and not self.notbranch:
 
639
#             error_dialog(_('Directory does not have a working tree'),
 
640
#                          _('Operation aborted.'))
 
641
#             self.close()
 
642
#             return
 
643
# 
 
644
#         if self.notbranch:
 
645
#             error_dialog(_('Directory is not a branch'),
 
646
#                          _('You can perform this action only in a branch.'))
 
647
#             self.close()
 
648
#             return
 
649
#         else:
 
650
#             if self.wt.branch.get_bound_location() is not None:
 
651
#                 # we have a checkout, so the local commit checkbox must appear
 
652
#                 self._is_checkout = True
 
653
#             
 
654
#             if self.pending:
 
655
#                 # There are pending merges, file selection not supported
 
656
#                 self._is_pending = True
 
657
#         
 
658
#         # Create the widgets
 
659
#         # This is the main horizontal box, which is used to separate the commit
 
660
#         # info from the diff window.
 
661
#         self._hpane = gtk.HPaned()
 
662
#         self._button_commit = gtk.Button(_("Comm_it"), use_underline=True)
 
663
#         self._expander_files = gtk.Expander(_("File(s) to commit"))
 
664
#         self._vpaned_main = gtk.VPaned()
 
665
#         self._scrolledwindow_files = gtk.ScrolledWindow()
 
666
#         self._scrolledwindow_message = gtk.ScrolledWindow()
 
667
#         self._treeview_files = gtk.TreeView()
 
668
#         self._vbox_message = gtk.VBox()
 
669
#         self._label_message = gtk.Label(_("Commit message:"))
 
670
#         self._textview_message = gtk.TextView()
 
671
#         
 
672
#         if self._is_pending:
 
673
#             self._expander_merges = gtk.Expander(_("Pending merges"))
 
674
#             self._vpaned_list = gtk.VPaned()
 
675
#             self._scrolledwindow_merges = gtk.ScrolledWindow()
 
676
#             self._treeview_merges = gtk.TreeView()
 
677
# 
 
678
#         # Set callbacks
 
679
#         self._button_commit.connect('clicked', self._on_commit_clicked)
 
680
#         self._treeview_files.connect('cursor-changed', self._on_treeview_files_cursor_changed)
 
681
#         self._treeview_files.connect('row-activated', self._on_treeview_files_row_activated)
 
682
#         
 
683
#         # Set properties
 
684
#         self._scrolledwindow_files.set_policy(gtk.POLICY_AUTOMATIC,
 
685
#                                               gtk.POLICY_AUTOMATIC)
 
686
#         self._scrolledwindow_message.set_policy(gtk.POLICY_AUTOMATIC,
 
687
#                                                 gtk.POLICY_AUTOMATIC)
 
688
#         self._textview_message.modify_font(pango.FontDescription("Monospace"))
 
689
#         self.set_default_size(500, 500)
 
690
#         self._vpaned_main.set_position(200)
 
691
#         self._button_commit.set_flags(gtk.CAN_DEFAULT)
 
692
# 
 
693
#         if self._is_pending:
 
694
#             self._scrolledwindow_merges.set_policy(gtk.POLICY_AUTOMATIC,
 
695
#                                                    gtk.POLICY_AUTOMATIC)
 
696
#             self._treeview_files.set_sensitive(False)
 
697
#         
 
698
#         # Construct the dialog
 
699
#         self.action_area.pack_end(self._button_commit)
 
700
#         
 
701
#         self._scrolledwindow_files.add(self._treeview_files)
 
702
#         self._scrolledwindow_message.add(self._textview_message)
 
703
#         
 
704
#         self._expander_files.add(self._scrolledwindow_files)
 
705
#         
 
706
#         self._vbox_message.pack_start(self._label_message, False, False)
 
707
#         self._vbox_message.pack_start(self._scrolledwindow_message, True, True)
 
708
#         
 
709
#         if self._is_pending:        
 
710
#             self._expander_merges.add(self._scrolledwindow_merges)
 
711
#             self._scrolledwindow_merges.add(self._treeview_merges)
 
712
#             self._vpaned_list.add1(self._expander_files)
 
713
#             self._vpaned_list.add2(self._expander_merges)
 
714
#             self._vpaned_main.add1(self._vpaned_list)
 
715
#         else:
 
716
#             self._vpaned_main.add1(self._expander_files)
 
717
# 
 
718
#         self._vpaned_main.add2(self._vbox_message)
 
719
#         
 
720
#         self._hpane.pack1(self._vpaned_main)
 
721
#         self.vbox.pack_start(self._hpane, expand=True, fill=True)
 
722
#         if self._is_checkout: 
 
723
#             self._check_local = gtk.CheckButton(_("_Only commit locally"),
 
724
#                                                 use_underline=True)
 
725
#             self.vbox.pack_start(self._check_local, False, False)
 
726
#             if have_dbus:
 
727
#                 bus = dbus.SystemBus()
 
728
#                 proxy_obj = bus.get_object('org.freedesktop.NetworkManager', 
 
729
#                               '/org/freedesktop/NetworkManager')
 
730
#                 dbus_iface = dbus.Interface(
 
731
#                         proxy_obj, 'org.freedesktop.NetworkManager')
 
732
#                 try:
 
733
#                     # 3 is the enum value for STATE_CONNECTED
 
734
#                     self._check_local.set_active(dbus_iface.state() != 3)
 
735
#                 except dbus.DBusException, e:
 
736
#                     # Silently drop errors. While DBus may be 
 
737
#                     # available, NetworkManager doesn't necessarily have to be
 
738
#                     mutter("unable to get networkmanager state: %r" % e)
 
739
#                 
 
740
#         # Create the file list
 
741
#         self._create_file_view()
 
742
#         # Create the pending merges
 
743
#         self._create_pending_merges()
 
744
#         self._create_diff_view()
 
745
#         
 
746
#         # Expand the corresponding expander
 
747
#         if self._is_pending:
 
748
#             self._expander_merges.set_expanded(True)
 
749
#         else:
 
750
#             self._expander_files.set_expanded(True)
 
751
#         
 
752
#         # Display dialog
 
753
#         self.vbox.show_all()
 
754
#         
 
755
#         # Default to Commit button
 
756
#         self._button_commit.grab_default()
 
757
#     
 
758
#     def _show_diff_view(self, treeview):
 
759
#         # FIXME: the diff window freezes for some reason
 
760
#         treeselection = treeview.get_selection()
 
761
#         (model, iter) = treeselection.get_selected()
 
762
# 
 
763
#         if iter is not None:
 
764
#             selected = model.get_value(iter, 3) # Get the real_path attribute
 
765
#             self._diff_display.show_diff([selected])
 
766
# 
 
767
#     def _on_treeview_files_cursor_changed(self, treeview):
 
768
#         self._show_diff_view(treeview)
 
769
#         
 
770
#     def _on_treeview_files_row_activated(self, treeview, path, view_column):
 
771
#         self._show_diff_view(treeview)
 
772
#     
 
773
#     @show_bzr_error
 
774
#     def _on_commit_clicked(self, button):
 
775
#         """ Commit button clicked handler. """
 
776
#         textbuffer = self._textview_message.get_buffer()
 
777
#         start, end = textbuffer.get_bounds()
 
778
#         message = textbuffer.get_text(start, end).decode('utf-8')
 
779
#         
 
780
#         if not self.pending:
 
781
#             specific_files = self._get_specific_files()
 
782
#         else:
 
783
#             specific_files = None
 
784
# 
 
785
#         if message == '':
 
786
#             response = question_dialog(_('Commit with an empty message?'),
 
787
#                                        _('You can describe your commit intent in the message.'))
 
788
#             if response == gtk.RESPONSE_NO:
 
789
#                 # Kindly give focus to message area
 
790
#                 self._textview_message.grab_focus()
 
791
#                 return
 
792
# 
 
793
#         if self._is_checkout:
 
794
#             local = self._check_local.get_active()
 
795
#         else:
 
796
#             local = False
 
797
# 
 
798
#         if list(self.wt.unknowns()) != []:
 
799
#             response = question_dialog(_("Commit with unknowns?"),
 
800
#                _("Unknown files exist in the working tree. Commit anyway?"))
 
801
#             if response == gtk.RESPONSE_NO:
 
802
#                 return
 
803
#         
 
804
#         try:
 
805
#             self.wt.commit(message,
 
806
#                        allow_pointless=False,
 
807
#                        strict=False,
 
808
#                        local=local,
 
809
#                        specific_files=specific_files)
 
810
#         except errors.PointlessCommit:
 
811
#             response = question_dialog(_('Commit with no changes?'),
 
812
#                                        _('There are no changes in the working tree.'))
 
813
#             if response == gtk.RESPONSE_YES:
 
814
#                 self.wt.commit(message,
 
815
#                                allow_pointless=True,
 
816
#                                strict=False,
 
817
#                                local=local,
 
818
#                                specific_files=specific_files)
 
819
#         self.response(gtk.RESPONSE_OK)
 
820
# 
 
821
#     def _pending_merges(self, wt):
 
822
#         """ Return a list of pending merges or None if there are none of them. """
 
823
#         parents = wt.get_parent_ids()
 
824
#         if len(parents) < 2:
 
825
#             return None
 
826
#         
 
827
#         import re
 
828
#         from bzrlib.osutils import format_date
 
829
#         
 
830
#         pending = parents[1:]
 
831
#         branch = wt.branch
 
832
#         last_revision = parents[0]
 
833
#         
 
834
#         if last_revision is not None:
 
835
#             try:
 
836
#                 ignore = set(branch.repository.get_ancestry(last_revision))
 
837
#             except errors.NoSuchRevision:
 
838
#                 # the last revision is a ghost : assume everything is new 
 
839
#                 # except for it
 
840
#                 ignore = set([None, last_revision])
 
841
#         else:
 
842
#             ignore = set([None])
 
843
#         
 
844
#         pm = []
 
845
#         for merge in pending:
 
846
#             ignore.add(merge)
 
847
#             try:
 
848
#                 m_revision = branch.repository.get_revision(merge)
 
849
#                 
 
850
#                 rev = {}
 
851
#                 rev['committer'] = re.sub('<.*@.*>', '', m_revision.committer).strip(' ')
 
852
#                 rev['summary'] = m_revision.get_summary()
 
853
#                 rev['date'] = format_date(m_revision.timestamp,
 
854
#                                           m_revision.timezone or 0, 
 
855
#                                           'original', date_fmt="%Y-%m-%d",
 
856
#                                           show_offset=False)
 
857
#                 
 
858
#                 pm.append(rev)
 
859
#                 
 
860
#                 inner_merges = branch.repository.get_ancestry(merge)
 
861
#                 assert inner_merges[0] is None
 
862
#                 inner_merges.pop(0)
 
863
#                 inner_merges.reverse()
 
864
#                 for mmerge in inner_merges:
 
865
#                     if mmerge in ignore:
 
866
#                         continue
 
867
#                     mm_revision = branch.repository.get_revision(mmerge)
 
868
#                     
 
869
#                     rev = {}
 
870
#                     rev['committer'] = re.sub('<.*@.*>', '', mm_revision.committer).strip(' ')
 
871
#                     rev['summary'] = mm_revision.get_summary()
 
872
#                     rev['date'] = format_date(mm_revision.timestamp,
 
873
#                                               mm_revision.timezone or 0, 
 
874
#                                               'original', date_fmt="%Y-%m-%d",
 
875
#                                               show_offset=False)
 
876
#                 
 
877
#                     pm.append(rev)
 
878
#                     
 
879
#                     ignore.add(mmerge)
 
880
#             except errors.NoSuchRevision:
 
881
#                 print "DEBUG: NoSuchRevision:", merge
 
882
#         
 
883
#         return pm
 
884
# 
 
885
#     def _create_file_view(self):
 
886
#         self._file_store = gtk.ListStore(gobject.TYPE_BOOLEAN,   # [0] checkbox
 
887
#                                          gobject.TYPE_STRING,    # [1] path to display
 
888
#                                          gobject.TYPE_STRING,    # [2] changes type
 
889
#                                          gobject.TYPE_STRING)    # [3] real path
 
890
#         self._treeview_files.set_model(self._file_store)
 
891
#         crt = gtk.CellRendererToggle()
 
892
#         crt.set_property("activatable", True)
 
893
#         crt.connect("toggled", self._toggle_commit, self._file_store)
 
894
#         self._treeview_files.append_column(gtk.TreeViewColumn(_('Commit'),
 
895
#                                      crt, active=0))
 
896
#         self._treeview_files.append_column(gtk.TreeViewColumn(_('Path'),
 
897
#                                      gtk.CellRendererText(), text=1))
 
898
#         self._treeview_files.append_column(gtk.TreeViewColumn(_('Type'),
 
899
#                                      gtk.CellRendererText(), text=2))
 
900
# 
 
901
#         for path, id, kind in self.delta.added:
 
902
#             marker = osutils.kind_marker(kind)
 
903
#             if self.selected is not None:
 
904
#                 if path == os.path.join(self.wtpath, self.selected):
 
905
#                     self._file_store.append([ True, path+marker, _('added'), path ])
 
906
#                 else:
 
907
#                     self._file_store.append([ False, path+marker, _('added'), path ])
 
908
#             else:
 
909
#                 self._file_store.append([ True, path+marker, _('added'), path ])
 
910
# 
 
911
#         for path, id, kind in self.delta.removed:
 
912
#             marker = osutils.kind_marker(kind)
 
913
#             if self.selected is not None:
 
914
#                 if path == os.path.join(self.wtpath, self.selected):
 
915
#                     self._file_store.append([ True, path+marker, _('removed'), path ])
 
916
#                 else:
 
917
#                     self._file_store.append([ False, path+marker, _('removed'), path ])
 
918
#             else:
 
919
#                 self._file_store.append([ True, path+marker, _('removed'), path ])
 
920
# 
 
921
#         for oldpath, newpath, id, kind, text_modified, meta_modified in self.delta.renamed:
 
922
#             marker = osutils.kind_marker(kind)
 
923
#             if text_modified or meta_modified:
 
924
#                 changes = _('renamed and modified')
 
925
#             else:
 
926
#                 changes = _('renamed')
 
927
#             if self.selected is not None:
 
928
#                 if newpath == os.path.join(self.wtpath, self.selected):
 
929
#                     self._file_store.append([ True,
 
930
#                                               oldpath+marker + '  =>  ' + newpath+marker,
 
931
#                                               changes,
 
932
#                                               newpath
 
933
#                                             ])
 
934
#                 else:
 
935
#                     self._file_store.append([ False,
 
936
#                                               oldpath+marker + '  =>  ' + newpath+marker,
 
937
#                                               changes,
 
938
#                                               newpath
 
939
#                                             ])
 
940
#             else:
 
941
#                 self._file_store.append([ True,
 
942
#                                           oldpath+marker + '  =>  ' + newpath+marker,
 
943
#                                           changes,
 
944
#                                           newpath
 
945
#                                         ])
 
946
# 
 
947
#         for path, id, kind, text_modified, meta_modified in self.delta.modified:
 
948
#             marker = osutils.kind_marker(kind)
 
949
#             if self.selected is not None:
 
950
#                 if path == os.path.join(self.wtpath, self.selected):
 
951
#                     self._file_store.append([ True, path+marker, _('modified'), path ])
 
952
#                 else:
 
953
#                     self._file_store.append([ False, path+marker, _('modified'), path ])
 
954
#             else:
 
955
#                 self._file_store.append([ True, path+marker, _('modified'), path ])
 
956
#     
 
957
#     def _create_pending_merges(self):
 
958
#         if not self.pending:
 
959
#             return
 
960
#         
 
961
#         liststore = gtk.ListStore(gobject.TYPE_STRING,
 
962
#                                   gobject.TYPE_STRING,
 
963
#                                   gobject.TYPE_STRING)
 
964
#         self._treeview_merges.set_model(liststore)
 
965
#         
 
966
#         self._treeview_merges.append_column(gtk.TreeViewColumn(_('Date'),
 
967
#                                             gtk.CellRendererText(), text=0))
 
968
#         self._treeview_merges.append_column(gtk.TreeViewColumn(_('Committer'),
 
969
#                                             gtk.CellRendererText(), text=1))
 
970
#         self._treeview_merges.append_column(gtk.TreeViewColumn(_('Summary'),
 
971
#                                             gtk.CellRendererText(), text=2))
 
972
#         
 
973
#         for item in self.pending:
 
974
#             liststore.append([ item['date'],
 
975
#                                item['committer'],
 
976
#                                item['summary'] ])
 
977
#     
 
978
# 
 
979
#     def _create_diff_view(self):
 
980
#         from diff import DiffView
 
981
# 
 
982
#         self._diff_display = DiffView()
 
983
#         self._diff_display.set_trees(self.wt, self.wt.basis_tree())
 
984
#         self._diff_display.show_diff(None)
 
985
#         self._diff_display.show()
 
986
#         self._hpane.pack2(self._diff_display)
 
987
# 
 
988
#     def _get_specific_files(self):
 
989
#         ret = []
 
990
#         it = self._file_store.get_iter_first()
 
991
#         while it:
 
992
#             if self._file_store.get_value(it, 0):
 
993
#                 # get real path from hidden column 3
 
994
#                 ret.append(self._file_store.get_value(it, 3))
 
995
#             it = self._file_store.iter_next(it)
 
996
# 
 
997
#         return ret
 
998
#     
 
999
#     def _toggle_commit(self, cell, path, model):
 
1000
#         model[path][0] = not model[path][0]
 
1001
#         return