/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: Daniel Schierbeck
  • Date: 2008-01-13 14:12:49 UTC
  • mto: (423.1.2 trunk)
  • mto: This revision was merged to the branch mainline in revision 429.
  • Revision ID: daniel.schierbeck@gmail.com-20080113141249-gd0i2lknr3yik55r
Moved branch view to its own package.

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