/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: Jelmer Vernooij
  • Date: 2008-06-29 19:34:29 UTC
  • mto: This revision was merged to the branch mainline in revision 520.
  • Revision ID: jelmer@samba.org-20080629193429-ir2ilmbko6qkubg5
Add Branch/Index option if bzr-search is available.

Show diffs side-by-side

added added

removed removed

Lines of Context:
viz/branchwin.py
14
14
import pango
15
15
 
16
16
from bzrlib.plugins.gtk.window import Window
 
17
from bzrlib.plugins.gtk import icon_path
17
18
from bzrlib.plugins.gtk.tags import AddTagDialog
18
19
from bzrlib.plugins.gtk.preferences import PreferencesWindow
19
 
from bzrlib.plugins.gtk.branchview import TreeView
20
 
from bzrlib.revision import Revision
21
 
from bzrlib.config import BranchConfig
22
 
from bzrlib.config import GlobalConfig
 
20
from bzrlib.plugins.gtk.branchview import TreeView, treemodel
 
21
 
 
22
from bzrlib.config import BranchConfig, GlobalConfig
 
23
from bzrlib.revision import Revision, NULL_REVISION
 
24
from bzrlib.trace import mutter
23
25
 
24
26
class BranchWindow(Window):
25
27
    """Branch window.
28
30
    for a particular branch.
29
31
    """
30
32
 
31
 
    def __init__(self, branch, start, maxnum, parent=None):
 
33
    def __init__(self, branch, start_revs, maxnum, parent=None):
32
34
        """Create a new BranchWindow.
33
35
 
34
36
        :param branch: Branch object for branch to show.
35
 
        :param start: Revision id of top revision.
 
37
        :param start_revs: Revision ids of top revisions.
36
38
        :param maxnum: Maximum number of revisions to display, 
37
39
                       None for no limit.
38
40
        """
41
43
        self.set_border_width(0)
42
44
 
43
45
        self.branch      = branch
44
 
        self.start       = start
 
46
        self.start_revs  = start_revs
45
47
        self.maxnum      = maxnum
46
48
        self.config      = GlobalConfig()
47
49
 
65
67
 
66
68
        gtk.accel_map_add_entry("<viz>/Go/Next Revision", gtk.keysyms.Up, gtk.gdk.MOD1_MASK)
67
69
        gtk.accel_map_add_entry("<viz>/Go/Previous Revision", gtk.keysyms.Down, gtk.gdk.MOD1_MASK)
 
70
        gtk.accel_map_add_entry("<viz>/View/Refresh", gtk.keysyms.F5, 0)
68
71
 
69
72
        self.accel_group = gtk.AccelGroup()
70
73
        self.add_accel_group(self.accel_group)
83
86
        self.next_rev_action.connect("activate", self._fwd_clicked_cb)
84
87
        self.next_rev_action.connect_accelerator()
85
88
 
 
89
        self.refresh_action = gtk.Action("refresh", "_Refresh", "Refresh view", gtk.STOCK_REFRESH)
 
90
        self.refresh_action.set_accel_path("<viz>/View/Refresh")
 
91
        self.refresh_action.set_accel_group(self.accel_group)
 
92
        self.refresh_action.connect("activate", self._refresh_clicked)
 
93
        self.refresh_action.connect_accelerator()
 
94
 
86
95
        self.construct()
87
96
 
88
97
    def set_revision(self, revid):
143
152
        view_menuitem = gtk.MenuItem("_View")
144
153
        view_menuitem.set_submenu(view_menu)
145
154
 
 
155
        view_menu_refresh = self.refresh_action.create_menu_item()
 
156
        view_menu_refresh.connect('activate', self._refresh_clicked)
 
157
 
 
158
        view_menu.add(view_menu_refresh)
 
159
        view_menu.add(gtk.SeparatorMenuItem())
 
160
 
146
161
        view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
147
162
        view_menu_toolbar.set_active(True)
148
163
        view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
155
170
        view_menu.add(view_menu_compact)
156
171
        view_menu.add(gtk.SeparatorMenuItem())
157
172
 
158
 
        for (label, name) in [("Revision _Number", "revno"), ("_Date", "date")]:
159
 
            col = gtk.CheckMenuItem("Show " + label + " Column")
 
173
        self.mnu_show_revno_column = gtk.CheckMenuItem("Show Revision _Number Column")
 
174
        self.mnu_show_date_column = gtk.CheckMenuItem("Show _Date Column")
 
175
 
 
176
        # Revision numbers are pointless if there are multiple branches
 
177
        if len(self.start_revs) > 1:
 
178
            self.mnu_show_revno_column.set_sensitive(False)
 
179
            self.treeview.set_property('revno-column-visible', False)
 
180
 
 
181
        for (col, name) in [(self.mnu_show_revno_column, "revno"), 
 
182
                            (self.mnu_show_date_column, "date")]:
160
183
            col.set_active(self.treeview.get_property(name + "-column-visible"))
161
184
            col.connect('toggled', self._col_visibility_changed, name)
162
185
            view_menu.add(col)
169
192
        go_menu_next = self.next_rev_action.create_menu_item()
170
193
        go_menu_prev = self.prev_rev_action.create_menu_item()
171
194
 
172
 
        self.go_menu_tags = gtk.MenuItem("_Tags")
 
195
        tag_image = gtk.Image()
 
196
        tag_image.set_from_file(icon_path("tag-16.png"))
 
197
        self.go_menu_tags = gtk.ImageMenuItem("_Tags")
 
198
        self.go_menu_tags.set_image(tag_image)
173
199
        self._update_tags()
174
200
 
175
201
        go_menu.add(go_menu_next)
183
209
 
184
210
        revision_menu_diff = gtk.MenuItem("View Changes")
185
211
        revision_menu_diff.connect('activate', 
186
 
                lambda w: self.treeview.show_diff())
 
212
                self._menu_diff_cb)
 
213
        
 
214
        revision_menu_compare = gtk.MenuItem("Compare with...")
 
215
        revision_menu_compare.connect('activate',
 
216
                self._compare_with_cb)
187
217
 
188
218
        revision_menu_tag = gtk.MenuItem("Tag Revision")
189
219
        revision_menu_tag.connect('activate', self._tag_revision_cb)
190
220
 
191
221
        revision_menu.add(revision_menu_tag)
192
222
        revision_menu.add(revision_menu_diff)
 
223
        revision_menu.add(revision_menu_compare)
193
224
 
194
225
        branch_menu = gtk.Menu()
195
226
        branch_menuitem = gtk.MenuItem("_Branch")
198
229
        branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
199
230
        branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
200
231
 
 
232
        try:
 
233
            from bzrlib.plugins import search
 
234
        except ImportError:
 
235
            mutter("Didn't find search plugin")
 
236
        else:
 
237
            branch_index_menuitem = gtk.MenuItem("_Index")
 
238
            branch_index_menuitem.connect('activate', self._branch_index_cb)
 
239
            branch_menu.add(branch_index_menuitem)
 
240
 
201
241
        help_menu = gtk.Menu()
202
242
        help_menuitem = gtk.MenuItem("_Help")
203
243
        help_menuitem.set_submenu(help_menu)
222
262
        """Construct the top-half of the window."""
223
263
        # FIXME: Make broken_line_length configurable
224
264
 
225
 
        self.treeview = TreeView(self.branch, self.start, self.maxnum, self.compact_view)
 
265
        self.treeview = TreeView(self.branch, self.start_revs, self.maxnum, self.compact_view)
226
266
 
227
267
        self.treeview.connect('revision-selected',
228
268
                self._treeselection_changed_cb)
 
269
        self.treeview.connect('revision-activated',
 
270
                self._tree_revision_activated)
229
271
 
230
272
        self.treeview.connect('tag-added', lambda w, t, r: self._update_tags())
231
273
 
233
275
            option = self.config.get_user_option(col + '-column-visible')
234
276
            if option is not None:
235
277
                self.treeview.set_property(col + '-column-visible', option == 'True')
 
278
            else:
 
279
                self.treeview.set_property(col + '-column-visible', False)
236
280
 
237
281
        self.treeview.show()
238
282
 
285
329
        parents  = self.treeview.get_parents()
286
330
        children = self.treeview.get_children()
287
331
 
288
 
        if revision is not None:
 
332
        if revision and revision != NULL_REVISION:
289
333
            prev_menu = gtk.Menu()
290
334
            if len(parents) > 0:
291
335
                self.prev_rev_action.set_sensitive(True)
292
336
                for parent_id in parents:
293
 
                    parent = self.branch.repository.get_revision(parent_id)
294
 
                    try:
295
 
                        str = ' (' + parent.properties['branch-nick'] + ')'
296
 
                    except KeyError:
297
 
                        str = ""
 
337
                    if parent_id and parent_id != NULL_REVISION:
 
338
                        parent = self.branch.repository.get_revision(parent_id)
 
339
                        try:
 
340
                            str = ' (' + parent.properties['branch-nick'] + ')'
 
341
                        except KeyError:
 
342
                            str = ""
298
343
 
299
 
                    item = gtk.MenuItem(parent.message.split("\n")[0] + str)
300
 
                    item.connect('activate', self._set_revision_cb, parent_id)
301
 
                    prev_menu.add(item)
 
344
                        item = gtk.MenuItem(parent.message.split("\n")[0] + str)
 
345
                        item.connect('activate', self._set_revision_cb, parent_id)
 
346
                        prev_menu.add(item)
302
347
                prev_menu.show_all()
303
348
            else:
304
349
                self.prev_rev_action.set_sensitive(False)
328
373
 
329
374
            self.revisionview.set_revision(revision)
330
375
            self.revisionview.set_children(children)
 
376
    
 
377
    def _tree_revision_activated(self, widget, path, col):
 
378
        # TODO: more than one parent
 
379
        """Callback for when a treeview row gets activated."""
 
380
        revision = self.treeview.get_revision()
 
381
        parents  = self.treeview.get_parents()
 
382
 
 
383
        if len(parents) == 0:
 
384
            parent_id = None
 
385
        else:
 
386
            parent_id = parents[0]
 
387
 
 
388
        self.show_diff(revision.revision_id, parent_id)
 
389
        self.treeview.grab_focus()
 
390
        
 
391
    def _menu_diff_cb(self,w):
 
392
        (path, focus) = self.treeview.treeview.get_cursor()
 
393
        revid = self.treeview.model[path][treemodel.REVID]
 
394
        
 
395
        parentids = self.branch.repository.revision_parents(revid)
 
396
 
 
397
        if len(parentids) == 0:
 
398
            parentid = NULL_REVISION
 
399
        else:
 
400
            parentid = parentids[0]
 
401
        
 
402
        self.show_diff(revid,parentid)    
331
403
 
332
404
    def _back_clicked_cb(self, *args):
333
405
        """Callback for when the back button is clicked."""
344
416
 
345
417
    def _show_clicked_cb(self, revid, parentid):
346
418
        """Callback for when the show button for a parent is clicked."""
347
 
        self.treeview.show_diff(revid, parentid)
 
419
        self.show_diff(revid, parentid)
348
420
        self.treeview.grab_focus()
349
421
 
 
422
    def _compare_with_cb(self,w):
 
423
        """Callback for revision 'compare with' menu. Will show a small
 
424
            dialog with branch revisions to compare with selected revision in TreeView"""
 
425
        
 
426
        from bzrlib.plugins.gtk.revbrowser import RevisionBrowser
 
427
        
 
428
        rb = RevisionBrowser(self.branch,self)
 
429
        ret = rb.run()
 
430
        
 
431
        if ret == gtk.RESPONSE_OK:          
 
432
            (path, focus) = self.treeview.treeview.get_cursor()
 
433
            revid = self.treeview.model[path][treemodel.REVID]
 
434
            self.show_diff(revid, rb.selected_revid)
 
435
            
 
436
        rb.destroy()
 
437
            
350
438
    def _set_revision_cb(self, w, revision_id):
351
439
        self.treeview.set_revision_id(revision_id)
352
440
 
378
466
        finally:
379
467
            self.treeview.set_sensitive(True)
380
468
 
 
469
    def _branch_index_cb(self, w):
 
470
        from bzrlib.plugins.search import index as _mod_index
 
471
        _mod_index.index_url(self.branch.base)
 
472
 
381
473
    def _about_dialog_cb(self, w):
382
474
        from bzrlib.plugins.gtk.about import AboutDialog
383
475
 
409
501
            tags.sort()
410
502
            tags.reverse()
411
503
            for tag, revid in tags:
412
 
                tag_item = gtk.MenuItem(tag)
 
504
                tag_image = gtk.Image()
 
505
                tag_image.set_from_file(icon_path('tag-16.png'))
 
506
                tag_item = gtk.ImageMenuItem(tag.replace('_', '__'))
 
507
                tag_item.set_image(tag_image)
413
508
                tag_item.connect('activate', self._tag_selected_cb, revid)
414
509
                menu.add(tag_item)
415
510
            self.go_menu_tags.set_submenu(menu)
420
515
 
421
516
        self.go_menu_tags.show_all()
422
517
 
 
518
    def show_diff(self, revid=None, parentid=None):
 
519
        """Open a new window to show a diff between the given revisions."""
 
520
        from bzrlib.plugins.gtk.diff import DiffWindow
 
521
        window = DiffWindow(parent=self)
 
522
 
 
523
        if parentid is None:
 
524
            parentid = NULL_REVISION
 
525
 
 
526
        rev_tree    = self.branch.repository.revision_tree(revid)
 
527
        parent_tree = self.branch.repository.revision_tree(parentid)
 
528
 
 
529
        description = revid + " - " + self.branch.nick
 
530
        window.set_diff(description, rev_tree, parent_tree)
 
531
        window.show()
 
532
 
423
533