/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

Merged an approved request (single clicking bookmark).

Show diffs side-by-side

added added

removed removed

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