[Pkg-bazaar-commits] ./bzr-gtk/unstable r35: [merge conflict] merge in 0.8pre API fix from Jelmer

[Jamie Wilkinson]

------------------------------------------------------------
revno: 35
committer: Jamie Wilkinson <jaq at spacepants.org>
branch nick: bzrk.jaq
timestamp: Mon 2006-03-06 17:07:18 +1100
message:
  [merge conflict] merge in 0.8pre API fix from Jelmer
modified:
  diffwin.py
  graph.py
    ------------------------------------------------------------
    revno: 19.2.1
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: bzrk
    timestamp: Tue 2006-02-21 05:44:46 +0800
    message:
      Update to use post-repository API
    modified:
      diffwin.py
      graph.py
-------------- next part --------------
=== modified file 'diffwin.py'
--- a/diffwin.py	2005-10-17 08:07:18 +0000
+++ b/diffwin.py	2006-02-20 21:44:46 +0000
@@ -109,8 +109,8 @@
         Compares the two trees and populates the window with the
         differences.
         """
-        self.rev_tree = branch.revision_tree(revid)
-        self.parent_tree = branch.revision_tree(parentid)
+        self.rev_tree = branch.repository.revision_tree(revid)
+        self.parent_tree = branch.repository.revision_tree(parentid)
 
         self.model.clear()
         delta = compare_trees(self.parent_tree, self.rev_tree)

=== modified file 'graph.py'
--- a/graph.py	2005-12-03 13:13:08 +0000
+++ b/graph.py	2006-03-06 06:07:18 +0000
@@ -50,7 +50,7 @@
         while todo:
             revid = todo.pop()
             try:
-                revision = branch.get_revision(revid)
+                revision = branch.repository.get_revision(revid)
             except NoSuchRevision:
                 revision = DummyRevision(revid)
             self.cache_revision(revid, revision)