/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 branchview/treeview.py

  • Committer: Vincent Ladeuil
  • Date: 2009-12-02 11:12:51 UTC
  • Revision ID: v.ladeuil+lp@free.fr-20091202111251-sh0xqyqtuvitonne
Fix regressions in tests about merge being more strict by default.

* tests/test_commit.py:
(TestPendingRevisions.test_pending_revisions_multi_merge)
(TestCommitDialog.test_pending_multiple): Since there are pending
merges, we should force the merge to avoid the UncommittedChanges
exception.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branchview/treeview.py
16
16
from bzrlib import ui
17
17
 
18
18
from bzrlib.plugins.gtk import _i18n
 
19
from bzrlib.plugins.gtk.ui import GtkProgressBar, ProgressPanel
19
20
from linegraph import linegraph, same_branch
20
21
from graphcell import CellRendererGraph
21
22
from treemodel import TreeModel
22
23
from bzrlib.revision import NULL_REVISION
23
24
 
 
25
 
24
26
class TreeView(gtk.VBox):
25
27
 
26
28
    __gproperties__ = {
91
93
                              (gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT)),
92
94
        'tag-added': (gobject.SIGNAL_RUN_FIRST,
93
95
                              gobject.TYPE_NONE,
94
 
                              (gobject.TYPE_STRING, gobject.TYPE_STRING))
 
96
                              (gobject.TYPE_STRING, gobject.TYPE_STRING)),
 
97
        'refreshed': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
 
98
                              ())
95
99
    }
96
100
 
97
101
    def __init__(self, branch, start, maxnum, compact=True):
106
110
        """
107
111
        gtk.VBox.__init__(self, spacing=0)
108
112
 
 
113
        self.progress_widget = ProgressPanel()
 
114
        self.pack_start(self.progress_widget, expand=False, fill=True)
 
115
        if getattr(ui.ui_factory, "set_progress_bar_widget", None) is not None:
 
116
            # We'are using our own ui, let's tell it to use our widget.
 
117
            ui.ui_factory.set_progress_bar_widget(self.progress_widget)
 
118
 
109
119
        self.scrolled_window = gtk.ScrolledWindow()
110
120
        self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,
111
121
                                        gtk.POLICY_AUTOMATIC)
115
125
 
116
126
        self.scrolled_window.add(self.construct_treeview())
117
127
 
118
 
        self.iter = None
 
128
        self.path = None
119
129
        self.branch = branch
120
130
        self.revision = None
 
131
        self.index = {}
121
132
 
122
133
        self.start = start
123
134
        self.maxnum = maxnum
125
136
 
126
137
        gobject.idle_add(self.populate)
127
138
 
128
 
        self.connect("destroy", lambda x: self.branch.unlock())
 
139
        self.connect("destroy", self._on_destroy)
 
140
 
 
141
    def _on_destroy(self, *ignored):
 
142
        self.branch.unlock()
 
143
        if getattr(ui.ui_factory, "set_progress_bar_widget", None) is not None:
 
144
            # We'are using our own ui, let's tell it to stop using our widget.
 
145
            ui.ui_factory.set_progress_bar_widget(None)
129
146
 
130
147
    def do_get_property(self, property):
131
148
        if property.name == 'revno-column-visible':
141
158
        elif property.name == 'branch':
142
159
            return self.branch
143
160
        elif property.name == 'revision':
144
 
            return self.model.get_value(self.iter, treemodel.REVISION)
 
161
            return self.model.get_value(self.model.get_iter(self.path),
 
162
                                        treemodel.REVISION)
145
163
        elif property.name == 'revision-number':
146
 
            return self.model.get_value(self.iter, treemodel.REVNO)
 
164
            return self.model.get_value(self.model.get_iter(self.path),
 
165
                                        treemodel.REVNO)
147
166
        elif property.name == 'children':
148
 
            return self.model.get_value(self.iter, treemodel.CHILDREN)
 
167
            return self.model.get_value(self.model.get_iter(self.path),
 
168
                                        treemodel.CHILDREN)
149
169
        elif property.name == 'parents':
150
 
            return self.model.get_value(self.iter, treemodel.PARENTS)
 
170
            return self.model.get_value(self.model.get_iter(self.path),
 
171
                                        treemodel.PARENTS)
151
172
        else:
152
173
            raise AttributeError, 'unknown property %s' % property.name
153
174
 
173
194
        """Return revision id of currently selected revision, or None."""
174
195
        return self.get_property('revision')
175
196
 
 
197
    def has_revision_id(self, revision_id):
 
198
        return (revision_id in self.index)
 
199
 
176
200
    def set_revision(self, revision):
177
201
        self.set_property('revision', revision)
178
202
 
269
293
                       should be broken.
270
294
        """
271
295
 
272
 
        loading_progress = ui.ui_factory.nested_progress_bar()
273
 
        loading_progress.update(msg="Loading ancestry graph", total=5)
 
296
        if getattr(ui.ui_factory, "set_progress_bar_widget", None) is not None:
 
297
            # We'are using our own ui, let's tell it to use our widget.
 
298
            ui.ui_factory.set_progress_bar_widget(self.progress_widget)
 
299
        self.progress_bar = ui.ui_factory.nested_progress_bar()
 
300
        self.progress_bar.update("Loading ancestry graph", 0, 5)
274
301
 
275
302
        try:
276
303
            if self.compact:
287
314
                                                            broken_line_length,
288
315
                                                            show_graph,
289
316
                                                            self.mainline_only,
290
 
                                                            loading_progress)
 
317
                                                            self.progress_bar)
291
318
 
292
319
            self.model = TreeModel(self.branch, linegraphdata)
293
320
            self.graph_cell.columns_len = columns_len
304
331
            else:
305
332
                self.set_revision(revision)
306
333
 
 
334
            self.emit('refreshed')
307
335
            return False
308
336
        finally:
309
 
            loading_progress.finished()
 
337
            self.progress_bar.finished()
310
338
 
311
339
    def construct_treeview(self):
312
340
        self.treeview = gtk.TreeView()
319
347
        if set_tooltip is not None:
320
348
            set_tooltip(treemodel.MESSAGE)
321
349
 
 
350
        self._prev_cursor_path = None
322
351
        self.treeview.connect("cursor-changed",
323
352
                self._on_selection_changed)
324
353
 
390
419
        self.treeview.append_column(self.date_column)
391
420
        
392
421
        return self.treeview
393
 
 
 
422
    
394
423
    def _on_selection_changed(self, treeview):
395
424
        """callback for when the treeview changes."""
396
425
        (path, focus) = treeview.get_cursor()
397
 
        if path is not None:
398
 
            self.iter = self.model.get_iter(path)
 
426
        if (path is not None) and (path != self._prev_cursor_path):
 
427
            self._prev_cursor_path = path # avoid emitting twice per click
 
428
            self.path = path
399
429
            self.emit('revision-selected')
400
430
 
401
431
    def _on_revision_selected(self, widget, event):
402
 
        from bzrlib.plugins.gtk.revisionmenu import RevisionPopupMenu
 
432
        from bzrlib.plugins.gtk.revisionmenu import RevisionMenu
403
433
        if event.button == 3:
404
 
            menu = RevisionPopupMenu(self.branch.repository, 
 
434
            menu = RevisionMenu(self.branch.repository, 
405
435
                [self.get_revision().revision_id],
406
436
                self.branch)
407
437
            menu.connect('tag-added', lambda w, t, r: self.add_tag(t, r))