/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 missing.py

  • Committer: Vincent Ladeuil
  • Date: 2008-06-10 15:25:47 UTC
  • mto: This revision was merged to the branch mainline in revision 504.
  • Revision ID: v.ladeuil+lp@free.fr-20080610152547-dwmil1p8pd0mfpnl
Fix third failing test (thanks to jam).

* tests/test_commit.py:
(TestPendingRevisions.test_pending_revisions_multi_merge): Fix
provided by jam: bzr we now filter the pending merges so that only
the 'heads()' are included. We just ensure that the pending merges
contain the unique tips for the ancestries.

Show diffs side-by-side

added added

removed removed

Lines of Context:
missing.py
25
25
from bzrlib.config import GlobalConfig
26
26
from bzrlib.missing import find_unmerged
27
27
 
28
 
from logview import LogView
 
28
from revisionview import RevisionView
29
29
 
30
30
class MissingWindow(gtk.Dialog):
31
31
    """Displays revisions present in one branch but missing in 
44
44
        extra_revs = gtk.ScrolledWindow()
45
45
        vbox = gtk.VBox()
46
46
        for rev in revisions:
47
 
            vbox.pack_start(LogView(rev, scroll=False), True, True)
 
47
            rv = RevisionView()
 
48
            rv.set_revision(rev)
 
49
            vbox.pack_start(rv, True, True)
48
50
        extra_revs.add_with_viewport(vbox)
49
51
        extra_revs.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
50
52
        return extra_revs
72
74
 
73
75
        self.vbox.pack_start(paned, True, True)
74
76
        self.vbox.show_all()
75
 
 
76
 
    def display(self):
77
 
        self.window.show_all()
78
 
 
79
 
    def close(self, widget=None):
80
 
        self.window.destroy()