/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: Vincent Ladeuil
  • Date: 2008-05-05 18:18:08 UTC
  • mfrom: (487 trunk)
  • mto: (487.1.1 gtk)
  • mto: This revision was merged to the branch mainline in revision 490.
  • Revision ID: v.ladeuil+lp@free.fr-20080505181808-ilh1cyl2v4crpc5i
merge bzr-gtk trunk

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