/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
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
import os.path
18
 
import re
19
 
 
20
17
try:
21
18
    import pygtk
22
19
    pygtk.require("2.0")
27
24
import gobject
28
25
import pango
29
26
 
 
27
import os.path
 
28
import re
 
29
 
30
30
from bzrlib import errors, osutils
31
31
from bzrlib.trace import mutter
32
32
from bzrlib.util import bencode
33
33
 
34
 
from bzrlib.plugins.gtk import _i18n
35
 
from bzrlib.plugins.gtk.dialog import question_dialog
36
 
from bzrlib.plugins.gtk.errors import show_bzr_error
 
34
from dialog import error_dialog, question_dialog
 
35
from errors import show_bzr_error
37
36
 
38
37
try:
39
38
    import dbus
105
104
                                  parent=parent,
106
105
                                  flags=0,
107
106
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
 
107
        self._question_dialog = question_dialog
108
108
 
109
109
        self._wt = wt
110
 
        # TODO: Do something with this value, it is used by Olive
111
 
        #       It used to set all changes but this one to False
112
110
        self._selected = selected
113
 
        self._enable_per_file_commits = True
114
 
        self._commit_all_changes = True
115
111
        self.committed_revision_id = None # Nothing has been committed yet
116
112
 
117
113
        self.setup_params()
132
128
        self._fill_in_diff()
133
129
        self._fill_in_files()
134
130
        self._fill_in_checkout()
135
 
        self._fill_in_per_file_info()
136
131
 
137
132
    def _fill_in_pending(self):
138
133
        if not self._pending:
164
159
        store = self._files_store
165
160
        self._treeview_files.set_model(None)
166
161
 
167
 
        added = _i18n('added')
168
 
        removed = _i18n('removed')
169
 
        renamed = _i18n('renamed')
170
 
        renamed_and_modified = _i18n('renamed and modified')
171
 
        modified = _i18n('modified')
172
 
        kind_changed = _i18n('kind changed')
 
162
        added = _('added')
 
163
        removed = _('removed')
 
164
        renamed = _('renamed')
 
165
        renamed_and_modified = _('renamed and modified')
 
166
        modified = _('modified')
 
167
        kind_changed = _('kind changed')
173
168
 
174
169
        # The store holds:
175
170
        # [file_id, real path, checkbox, display path, changes type, message]
176
 
        # iter_changes returns:
 
171
        # _iter_changes returns:
177
172
        # (file_id, (path_in_source, path_in_target),
178
173
        #  changed_content, versioned, parent, name, kind,
179
174
        #  executable)
180
175
 
181
 
        all_enabled = (self._selected is None)
182
176
        # The first entry is always the 'whole tree'
183
 
        all_iter = store.append([None, None, all_enabled, 'All Files', '', ''])
184
 
        initial_cursor = store.get_path(all_iter)
 
177
        store.append([None, None, True, 'All Files', '', ''])
185
178
        # should we pass specific_files?
186
179
        self._wt.lock_read()
187
180
        self._basis_tree.lock_read()
188
181
        try:
189
 
            from diff import iter_changes_to_status
 
182
            from diff import _iter_changes_to_status
190
183
            for (file_id, real_path, change_type, display_path
191
 
                ) in iter_changes_to_status(self._basis_tree, self._wt):
192
 
                if self._selected and real_path != self._selected:
193
 
                    enabled = False
194
 
                else:
195
 
                    enabled = True
196
 
                item_iter = store.append([
197
 
                    file_id,
198
 
                    real_path.encode('UTF-8'),
199
 
                    enabled,
200
 
                    display_path.encode('UTF-8'),
201
 
                    change_type,
202
 
                    '', # Initial comment
203
 
                    ])
204
 
                if self._selected and enabled:
205
 
                    initial_cursor = store.get_path(item_iter)
 
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, ''])
206
188
        finally:
207
189
            self._basis_tree.unlock()
208
190
            self._wt.unlock()
209
191
 
210
192
        self._treeview_files.set_model(store)
211
193
        self._last_selected_file = None
212
 
        # This sets the cursor, which causes the expander to close, which
213
 
        # causes the _file_message_text_view to never get realized. So we have
214
 
        # to give it a little kick, or it warns when we try to grab the focus
215
 
        self._treeview_files.set_cursor(initial_cursor)
216
 
 
217
 
        def _realize_file_message_tree_view(*args):
218
 
            self._file_message_text_view.realize()
219
 
        self.connect_after('realize', _realize_file_message_tree_view)
 
194
        self._treeview_files.set_cursor(0)
220
195
 
221
196
    def _fill_in_diff(self):
222
197
        self._diff_view.set_trees(self._wt, self._basis_tree)
227
202
            return
228
203
        if have_dbus:
229
204
            bus = dbus.SystemBus()
230
 
            try:
231
 
                proxy_obj = bus.get_object('org.freedesktop.NetworkManager',
232
 
                                           '/org/freedesktop/NetworkManager')
233
 
            except dbus.DBusException:
234
 
                mutter("networkmanager not available.")
235
 
                self._check_local.show()
236
 
                return
237
 
            
 
205
            proxy_obj = bus.get_object('org.freedesktop.NetworkManager',
 
206
                                       '/org/freedesktop/NetworkManager')
238
207
            dbus_iface = dbus.Interface(proxy_obj,
239
208
                                        'org.freedesktop.NetworkManager')
240
209
            try:
246
215
                mutter("unable to get networkmanager state: %r" % e)
247
216
        self._check_local.show()
248
217
 
249
 
    def _fill_in_per_file_info(self):
250
 
        config = self._wt.branch.get_config()
251
 
        enable_per_file_commits = config.get_user_option('per_file_commits')
252
 
        if (enable_per_file_commits is None
253
 
            or enable_per_file_commits.lower()
254
 
                not in ('y', 'yes', 'on', 'enable', '1', 't', 'true')):
255
 
            self._enable_per_file_commits = False
256
 
        else:
257
 
            self._enable_per_file_commits = True
258
 
        if not self._enable_per_file_commits:
259
 
            self._file_message_expander.hide()
260
 
            self._global_message_label.set_markup(_i18n('<b>Commit Message</b>'))
261
 
 
262
218
    def _compute_delta(self):
263
219
        self._delta = self._wt.changes_from(self._basis_tree)
264
220
 
276
232
        self._hpane.show()
277
233
        self.set_focus(self._global_message_text_view)
278
234
 
279
 
        self._construct_accelerators()
280
 
        self._set_sizes()
281
 
 
282
 
    def _set_sizes(self):
283
235
        # This seems like a reasonable default, we might like it to
284
236
        # be a bit wider, so that by default we can fit an 80-line diff in the
285
237
        # diff window.
296
248
        self.set_default_size(width, height)
297
249
        self._hpane.set_position(300)
298
250
 
299
 
    def _construct_accelerators(self):
300
 
        group = gtk.AccelGroup()
301
 
        group.connect_group(gtk.gdk.keyval_from_name('N'),
302
 
                            gtk.gdk.CONTROL_MASK, 0, self._on_accel_next)
303
 
        self.add_accel_group(group)
304
 
 
305
 
        # ignore the escape key (avoid closing the window)
306
 
        self.connect_object('close', self.emit_stop_by_name, 'close')
307
 
 
308
251
    def _construct_left_pane(self):
309
252
        self._left_pane_box = gtk.VBox(homogeneous=False, spacing=5)
310
253
        self._construct_file_list()
311
254
        self._construct_pending_list()
312
255
 
313
 
        self._check_local = gtk.CheckButton(_i18n("_Only commit locally"),
 
256
        self._check_local = gtk.CheckButton(_("_Only commit locally"),
314
257
                                            use_underline=True)
315
258
        self._left_pane_box.pack_end(self._check_local, False, False)
316
259
        self._check_local.set_active(False)
337
280
        self._hpane.pack2(self._right_pane_table, resize=True, shrink=True)
338
281
 
339
282
    def _construct_action_pane(self):
340
 
        self._button_commit = gtk.Button(_i18n("Comm_it"), use_underline=True)
 
283
        self._button_commit = gtk.Button(_("Comm_it"), use_underline=True)
341
284
        self._button_commit.connect('clicked', self._on_commit_clicked)
342
285
        self._button_commit.set_flags(gtk.CAN_DEFAULT)
343
286
        self._button_commit.show()
363
306
 
364
307
    def _construct_file_list(self):
365
308
        self._files_box = gtk.VBox(homogeneous=False, spacing=0)
366
 
        file_label = gtk.Label(_i18n('Files'))
367
 
        # file_label.show()
 
309
        file_label = gtk.Label(_('Files'))
 
310
        file_label.show()
368
311
        self._files_box.pack_start(file_label, expand=False)
369
312
 
370
 
        self._commit_all_files_radio = gtk.RadioButton(
371
 
            None, _i18n("Commit all changes"))
372
 
        self._files_box.pack_start(self._commit_all_files_radio, expand=False)
373
 
        self._commit_all_files_radio.show()
374
 
        self._commit_all_files_radio.connect('toggled',
375
 
            self._toggle_commit_selection)
376
 
        self._commit_selected_radio = gtk.RadioButton(
377
 
            self._commit_all_files_radio, _i18n("Only commit selected changes"))
378
 
        self._files_box.pack_start(self._commit_selected_radio, expand=False)
379
 
        self._commit_selected_radio.show()
380
 
        self._commit_selected_radio.connect('toggled',
381
 
            self._toggle_commit_selection)
382
 
        if self._pending:
383
 
            self._commit_all_files_radio.set_label(_i18n('Commit all changes*'))
384
 
            self._commit_all_files_radio.set_sensitive(False)
385
 
            self._commit_selected_radio.set_sensitive(False)
386
 
 
387
313
        scroller = gtk.ScrolledWindow()
388
314
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
389
315
        self._treeview_files = gtk.TreeView()
390
316
        self._treeview_files.show()
391
317
        scroller.add(self._treeview_files)
 
318
        scroller.show()
392
319
        scroller.set_shadow_type(gtk.SHADOW_IN)
393
 
        scroller.show()
394
320
        self._files_box.pack_start(scroller,
395
321
                                   expand=True, fill=True)
396
322
        self._files_box.show()
397
323
        self._left_pane_box.pack_start(self._files_box)
398
324
 
399
 
        # Keep note that all strings stored in a ListStore must be UTF-8
400
 
        # strings. GTK does not support directly setting and restoring Unicode
401
 
        # objects.
402
325
        liststore = gtk.ListStore(
403
326
            gobject.TYPE_STRING,  # [0] file_id
404
327
            gobject.TYPE_STRING,  # [1] real path
410
333
        self._files_store = liststore
411
334
        self._treeview_files.set_model(liststore)
412
335
        crt = gtk.CellRendererToggle()
413
 
        crt.set_property('activatable', not bool(self._pending))
 
336
        crt.set_active(not bool(self._pending))
414
337
        crt.connect("toggled", self._toggle_commit, self._files_store)
415
338
        if self._pending:
416
 
            name = _i18n('Commit*')
 
339
            name = _('Commit*')
417
340
        else:
418
 
            name = _i18n('Commit')
419
 
        commit_col = gtk.TreeViewColumn(name, crt, active=2)
420
 
        commit_col.set_visible(False)
421
 
        self._treeview_files.append_column(commit_col)
422
 
        self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Path'),
 
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'),
423
345
                                           gtk.CellRendererText(), text=3))
424
 
        self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Type'),
 
346
        self._treeview_files.append_column(gtk.TreeViewColumn(_('Type'),
425
347
                                           gtk.CellRendererText(), text=4))
426
348
        self._treeview_files.connect('cursor-changed',
427
349
                                     self._on_treeview_files_cursor_changed)
434
356
        else:
435
357
            model[path][2] = not model[path][2]
436
358
 
437
 
    def _toggle_commit_selection(self, button):
438
 
        all_files = self._commit_all_files_radio.get_active()
439
 
        if self._commit_all_changes != all_files:
440
 
            checked_col = self._treeview_files.get_column(0)
441
 
            self._commit_all_changes = all_files
442
 
            if all_files:
443
 
                checked_col.set_visible(False)
444
 
            else:
445
 
                checked_col.set_visible(True)
446
 
            renderer = checked_col.get_cell_renderers()[0]
447
 
            renderer.set_property('activatable', not all_files)
448
 
 
449
359
    def _construct_pending_list(self):
450
360
        # Pending information defaults to hidden, we put it all in 1 box, so
451
361
        # that we can show/hide all of them at once
454
364
 
455
365
        pending_message = gtk.Label()
456
366
        pending_message.set_markup(
457
 
            _i18n('<i>* Cannot select specific files when merging</i>'))
 
367
            _('<i>* Cannot select specific files when merging</i>'))
458
368
        self._pending_box.pack_start(pending_message, expand=False, padding=5)
459
369
        pending_message.show()
460
370
 
461
 
        pending_label = gtk.Label(_i18n('Pending Revisions'))
 
371
        pending_label = gtk.Label(_('Pending Revisions'))
462
372
        self._pending_box.pack_start(pending_label, expand=False, padding=0)
463
373
        pending_label.show()
464
374
 
466
376
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
467
377
        self._treeview_pending = gtk.TreeView()
468
378
        scroller.add(self._treeview_pending)
 
379
        scroller.show()
469
380
        scroller.set_shadow_type(gtk.SHADOW_IN)
470
 
        scroller.show()
471
381
        self._pending_box.pack_start(scroller,
472
382
                                     expand=True, fill=True, padding=5)
473
383
        self._treeview_pending.show()
480
390
                                 )
481
391
        self._pending_store = liststore
482
392
        self._treeview_pending.set_model(liststore)
483
 
        self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Date'),
 
393
        self._treeview_pending.append_column(gtk.TreeViewColumn(_('Date'),
484
394
                                             gtk.CellRendererText(), text=1))
485
 
        self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Committer'),
 
395
        self._treeview_pending.append_column(gtk.TreeViewColumn(_('Committer'),
486
396
                                             gtk.CellRendererText(), text=2))
487
 
        self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Summary'),
 
397
        self._treeview_pending.append_column(gtk.TreeViewColumn(_('Summary'),
488
398
                                             gtk.CellRendererText(), text=3))
489
399
 
490
400
    def _construct_diff_view(self):
491
401
        from diff import DiffView
492
402
 
493
 
        # TODO: jam 2007-10-30 The diff label is currently disabled. If we
494
 
        #       decide that we really don't ever want to display it, we should
495
 
        #       actually remove it, and other references to it, along with the
496
 
        #       tests that it is set properly.
497
 
        self._diff_label = gtk.Label(_i18n('Diff for whole tree'))
 
403
        self._diff_label = gtk.Label(_('Diff for whole tree'))
498
404
        self._diff_label.set_alignment(0, 0)
499
405
        self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
500
406
        self._add_to_right_table(self._diff_label, 1, False)
501
 
        # self._diff_label.show()
 
407
        self._diff_label.show()
502
408
 
503
409
        self._diff_view = DiffView()
504
410
        self._add_to_right_table(self._diff_view, 4, True)
505
411
        self._diff_view.show()
506
412
 
507
413
    def _construct_file_message(self):
 
414
        file_message_box = gtk.VBox()
508
415
        scroller = gtk.ScrolledWindow()
509
416
        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
510
417
 
511
418
        self._file_message_text_view = gtk.TextView()
512
419
        scroller.add(self._file_message_text_view)
 
420
        scroller.show()
513
421
        scroller.set_shadow_type(gtk.SHADOW_IN)
514
 
        scroller.show()
 
422
        file_message_box.pack_start(scroller, expand=True, fill=True)
515
423
 
516
424
        self._file_message_text_view.modify_font(pango.FontDescription("Monospace"))
517
425
        self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
518
426
        self._file_message_text_view.set_accepts_tab(False)
519
427
        self._file_message_text_view.show()
520
428
 
521
 
        self._file_message_expander = gtk.Expander(_i18n('File commit message'))
522
 
        self._file_message_expander.set_expanded(True)
523
 
        self._file_message_expander.add(scroller)
 
429
        self._file_message_expander = gtk.Expander(_('File commit message'))
 
430
        self._file_message_expander.add(file_message_box)
 
431
        file_message_box.show()
524
432
        self._add_to_right_table(self._file_message_expander, 1, False)
525
433
        self._file_message_expander.show()
526
434
 
527
435
    def _construct_global_message(self):
528
 
        self._global_message_label = gtk.Label(_i18n('Global Commit Message'))
529
 
        self._global_message_label.set_markup(
530
 
            _i18n('<b>Global Commit Message</b>'))
 
436
        self._global_message_label = gtk.Label(_('Global Commit Message'))
531
437
        self._global_message_label.set_alignment(0, 0)
532
438
        self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
533
439
        self._add_to_right_table(self._global_message_label, 1, False)
540
446
        self._global_message_text_view = gtk.TextView()
541
447
        self._global_message_text_view.modify_font(pango.FontDescription("Monospace"))
542
448
        scroller.add(self._global_message_text_view)
 
449
        scroller.show()
543
450
        scroller.set_shadow_type(gtk.SHADOW_IN)
544
 
        scroller.show()
545
451
        self._add_to_right_table(scroller, 2, True)
546
452
        self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
547
453
        self._file_message_text_view.set_accepts_tab(False)
553
459
 
554
460
        if selection is not None:
555
461
            path, display_path = model.get(selection, 1, 3)
556
 
            self._diff_label.set_text(_i18n('Diff for ') + display_path)
 
462
            self._diff_label.set_text(_('Diff for ') + display_path)
557
463
            if path is None:
558
464
                self._diff_view.show_diff(None)
559
465
            else:
560
466
                self._diff_view.show_diff([path.decode('UTF-8')])
561
467
            self._update_per_file_info(selection)
562
468
 
563
 
    def _on_accel_next(self, accel_group, window, keyval, modifier):
564
 
        # We don't really care about any of the parameters, because we know
565
 
        # where this message came from
566
 
        tree_selection = self._treeview_files.get_selection()
567
 
        (model, selection) = tree_selection.get_selected()
568
 
        if selection is None:
569
 
            next = None
570
 
        else:
571
 
            next = model.iter_next(selection)
572
 
 
573
 
        if next is None:
574
 
            # We have either made it to the end of the list, or nothing was
575
 
            # selected. Either way, select All Files, and jump to the global
576
 
            # commit message.
577
 
            self._treeview_files.set_cursor((0,))
578
 
            self._global_message_text_view.grab_focus()
579
 
        else:
580
 
            # Set the cursor to this entry, and jump to the per-file commit
581
 
            # message
582
 
            self._treeview_files.set_cursor(model.get_path(next))
583
 
            self._file_message_text_view.grab_focus()
584
 
 
585
469
    def _save_current_file_message(self):
586
470
        if self._last_selected_file is None:
587
471
            return # Nothing to save
593
477
 
594
478
    def _update_per_file_info(self, selection):
595
479
        # The node is changing, so cache the current message
596
 
        if not self._enable_per_file_commits:
597
 
            return
598
 
 
599
480
        self._save_current_file_message()
600
481
        text_buffer = self._file_message_text_view.get_buffer()
601
482
        file_id, display_path, message = self._files_store.get(selection, 0, 3, 5)
602
483
        if file_id is None: # Whole tree
603
 
            self._file_message_expander.set_label(_i18n('File commit message'))
 
484
            self._file_message_expander.set_label(_('File commit message'))
604
485
            self._file_message_expander.set_expanded(False)
605
486
            self._file_message_expander.set_sensitive(False)
606
487
            text_buffer.set_text('')
607
488
            self._last_selected_file = None
608
489
        else:
609
 
            self._file_message_expander.set_label(_i18n('Commit message for ')
 
490
            self._file_message_expander.set_label(_('Commit message for ')
610
491
                                                  + display_path)
611
492
            self._file_message_expander.set_expanded(True)
612
493
            self._file_message_expander.set_sensitive(True)
614
495
            self._last_selected_file = self._files_store.get_path(selection)
615
496
 
616
497
    def _get_specific_files(self):
617
 
        """Return the list of selected paths, and file info.
618
 
 
619
 
        :return: ([unicode paths], [{utf-8 file info}]
620
 
        """
621
498
        self._save_current_file_message()
622
499
        files = []
623
500
        records = iter(self._files_store)
626
503
 
627
504
        file_info = []
628
505
        for record in records:
629
 
            if self._commit_all_changes or record[2]:# [2] checkbox
 
506
            if record[2]: # [2] checkbox
630
507
                file_id = record[0] # [0] file_id
631
 
                path = record[1]    # [1] real path
 
508
                path = record[1] # [1] real path
632
509
                file_message = record[5] # [5] commit message
633
510
                files.append(path.decode('UTF-8'))
634
 
                if self._enable_per_file_commits and file_message:
 
511
                if file_message:
635
512
                    # All of this needs to be utf-8 information
636
513
                    file_info.append({'path':path, 'file_id':file_id,
637
514
                                     'message':file_message})
638
515
        file_info.sort(key=lambda x:(x['path'], x['file_id']))
639
 
        if self._enable_per_file_commits:
640
 
            return files, file_info
641
 
        else:
642
 
            return files, []
 
516
        return files, file_info
643
517
 
644
518
    @show_bzr_error
645
519
    def _on_commit_clicked(self, button):
650
524
        message = self._get_global_commit_message()
651
525
 
652
526
        if message == '':
653
 
            response = question_dialog(
654
 
                _i18n('Commit with an empty message?'),
655
 
                _i18n('You can describe your commit intent in the message.'),
656
 
                parent=self)
 
527
            response = self._question_dialog(
 
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()
671
544
        #       entirely, since there isn't a way for them to add the unknown
672
545
        #       files at this point.
673
546
        for path in self._wt.unknowns():
674
 
            response = question_dialog(
675
 
                _i18n("Commit with unknowns?"),
676
 
                _i18n("Unknown files exist in the working tree. Commit anyway?"),
677
 
                parent=self)
678
 
                # Doesn't set a parent for the dialog..
 
547
            response = self._question_dialog(
 
548
                _("Commit with unknowns?"),
 
549
                _("Unknown files exist in the working tree. Commit anyway?"))
679
550
            if response == gtk.RESPONSE_NO:
680
551
                return
681
552
            break
683
554
        rev_id = None
684
555
        revprops = {}
685
556
        if file_info:
686
 
            revprops['file-info'] = bencode.bencode(file_info).decode('UTF-8')
 
557
            revprops['file-info'] = bencode.bencode(file_info)
687
558
        try:
688
559
            rev_id = self._wt.commit(message,
689
560
                       allow_pointless=False,
692
563
                       specific_files=specific_files,
693
564
                       revprops=revprops)
694
565
        except errors.PointlessCommit:
695
 
            response = question_dialog(
696
 
                _i18n('Commit with no changes?'),
697
 
                _i18n('There are no changes in the working tree.'
698
 
                      ' Do you want to commit anyway?'),
699
 
                parent=self)
 
566
            response = self._question_dialog(
 
567
                                _('Commit with no changes?'),
 
568
                                _('There are no changes in the working tree.'
 
569
                                  ' Do you want to commit anyway?'))
700
570
            if response == gtk.RESPONSE_YES:
701
571
                rev_id = self._wt.commit(message,
702
572
                               allow_pointless=True,
728
598
    def _rev_to_pending_info(rev):
729
599
        """Get the information from a pending merge."""
730
600
        from bzrlib.osutils import format_date
 
601
 
731
602
        rev_dict = {}
732
603
        rev_dict['committer'] = re.sub('<.*@.*>', '', rev.committer).strip(' ')
733
604
        rev_dict['summary'] = rev.get_summary()
737
608
                                       show_offset=False)
738
609
        rev_dict['revision_id'] = rev.revision_id
739
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