Rev 476: Merge Andrews' fix for gannotate. in file:///data/jelmer/bzr-gtk/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-gtk/trunk/

------------------------------------------------------------
revno: 476
revision-id: jelmer at samba.org-20080430130830-i1y4ytmi5ov6km4f
parent: jelmer at samba.org-20080425213841-4569rcvea3yx09q5
parent: andrew at puzzling.org-20080429081701-2pu9uteic8o88nre
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Wed 2008-04-30 14:08:30 +0100
message:
  Merge Andrews' fix for gannotate.
modified:
  __init__.py                    __init__.py-20060519165329-a1fd52c8a829fcd5
  annotate/gannotate.py          xannotate.py-20051024072750-fe35acd6bb909bd3
    ------------------------------------------------------------
    revno: 473.1.1
    revision-id: andrew at puzzling.org-20080429081701-2pu9uteic8o88nre
    parent: aaron at aaronbentley.com-20080428222406-sd3i9mjfwjzap5gr
    committer: Andrew Bennetts <andrew at puzzling.org>
    branch nick: bzr-gtk
    timestamp: Tue 2008-04-29 18:17:01 +1000
    message:
      Simple hack to fix gannotate.
    modified:
      __init__.py                    __init__.py-20060519165329-a1fd52c8a829fcd5
      annotate/gannotate.py          xannotate.py-20051024072750-fe35acd6bb909bd3
=== modified file '__init__.py'
--- a/__init__.py	2008-04-25 21:38:41 +0000
+++ b/__init__.py	2008-04-30 13:08:30 +0000
@@ -317,7 +317,7 @@
         else:
             revision_id = getattr(tree, 'get_revision_id', lambda: None)()
 
-        window = GAnnotateWindow(all, plain)
+        window = GAnnotateWindow(all, plain, branch=br)
         window.connect("destroy", lambda w: gtk.main_quit())
         config = GAnnotateConfig(window)
         window.show()

=== modified file 'annotate/gannotate.py'
--- a/annotate/gannotate.py	2008-04-24 15:26:14 +0000
+++ b/annotate/gannotate.py	2008-04-29 08:17:01 +0000
@@ -45,9 +45,10 @@
 class GAnnotateWindow(Window):
     """Annotate window."""
 
-    def __init__(self, all=False, plain=False, parent=None):
+    def __init__(self, all=False, plain=False, parent=None, branch=None):
         self.all = all
         self.plain = plain
+        self._branch = branch
         
         Window.__init__(self, parent)
         
@@ -320,7 +321,7 @@
         return tv
 
     def _create_log_view(self):
-        lv = RevisionView()
+        lv = RevisionView(self._branch)
         lv.show()
         return lv