/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: 2011-12-11 17:14:12 UTC
  • Revision ID: jelmer@samba.org-20111211171412-cgcn0yas3zlcahzg
Start on 0.104.0.

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