/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: Jelmer Vernooij
  • Date: 2012-07-09 15:23:26 UTC
  • mto: This revision was merged to the branch mainline in revision 794.
  • Revision ID: jelmer@samba.org-20120709152326-dzxb8zoz0btull7n
https://launchpad.net/bugs/714767
https://launchpad.net/bugs/949798
https://launchpad.net/bugs/998994
https://launchpad.net/bugs/342135
https://launchpad.net/bugs/342136
https://launchpad.net/bugs/394536
Remove bzr-notify.

Show diffs side-by-side

added added

removed removed

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