/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 viz/branchwin.py

  • Committer: matkor
  • Date: 2007-08-23 10:17:40 UTC
  • mto: This revision was merged to the branch mainline in revision 265.
  • Revision ID: matkor@laptop-hp-20070823101740-s17kf9qa383wiuje
Code for "branch update" menuitem and toolbox. Typo fix

Show diffs side-by-side

added added

removed removed

Lines of Context:
viz/branchwin.py
75
75
        self.treeview.set_search_column(4)
76
76
        self.treeview.connect("cursor-changed", self._treeview_cursor_cb)
77
77
        self.treeview.connect("row-activated", self._treeview_row_activated_cb)
 
78
        self.treeview.connect("button-release-event", 
 
79
                self._treeview_row_mouseclick)
78
80
        scrollwin.add(self.treeview)
79
81
        self.treeview.show()
80
82
 
174
176
 
175
177
        last_lines = []
176
178
        (self.revisions, colours, self.children, self.parent_ids,
177
 
         merge_sorted) = distances(branch, start)
 
179
            merge_sorted) = distances(branch.repository, start)
178
180
        for (index, (revision, node, lines)) in enumerate(graph(
179
181
                self.revisions, colours, merge_sorted)):
180
182
            # FIXME: at this point we should be able to show the graph order
202
204
 
203
205
        self.back_button.set_sensitive(len(self.parent_ids[revision]) > 0)
204
206
        self.fwd_button.set_sensitive(len(self.children[revision]) > 0)
205
 
        self.logview.set_revision(revision)
 
207
        tags = []
 
208
        if self.branch.supports_tags():
 
209
            tagdict = self.branch.tags.get_reverse_tag_dict()
 
210
            if tagdict.has_key(revision.revision_id):
 
211
                tags = tagdict[revision.revision_id]
 
212
        self.logview.set_revision(revision, tags)
206
213
 
207
214
    def _back_clicked_cb(self, *args):
208
215
        """Callback for when the back button is clicked."""
246
253
        """Open a new window to show a diff between the given revisions."""
247
254
        from bzrlib.plugins.gtk.diff import DiffWindow
248
255
        window = DiffWindow()
249
 
        rev_tree = branch.repository.revision_tree(revid)
250
 
        parent_tree = branch.repository.revision_tree(parentid)
 
256
        (parent_tree, rev_tree) = branch.repository.revision_trees([parentid, 
 
257
                                                                   revid])
251
258
        description = revid + " - " + branch.nick
252
259
        window.set_diff(description, rev_tree, parent_tree)
253
260
        window.show()
257
264
        self.show_diff(self.branch, revid, parentid)
258
265
        self.treeview.grab_focus()
259
266
 
 
267
    def _treeview_row_mouseclick(self, widget, event):
 
268
        from bzrlib.plugins.gtk.revisionmenu import RevisionPopupMenu
 
269
        if event.button == 3:
 
270
            menu = RevisionPopupMenu(self.branch.repository, 
 
271
                [x.revision_id for x in self.selected_revisions()],
 
272
                self.branch)
 
273
            menu.popup(None, None, None, event.button, event.get_time())
 
274
 
 
275
    def selected_revision(self, path):
 
276
        return self.model[path][0]
 
277
 
 
278
    def selected_revisions(self):
 
279
        return [self.selected_revision(path) for path in \
 
280
                self.treeview.get_selection().get_selected_rows()[1]]
 
281
 
260
282
    def _treeview_row_activated_cb(self, widget, path, col):
261
283
        # TODO: more than one parent
262
284
        """Callback for when a treeview row gets activated."""
263
 
        revision = self.model[path][0]
 
285
        revision = self.selected_revision(path)
264
286
        if len(self.parent_ids[revision]) == 0:
265
287
            # Ignore revisions without parent
266
288
            return