Rev 1734: Fix tests. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/trunk

------------------------------------------------------------
revno: 1734
revision-id: jelmer at samba.org-20081103031851-rl7k1fq4zt7tl4p6
parent: jelmer at samba.org-20081103023151-uq0avcijru3yv1ys
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Mon 2008-11-03 04:18:51 +0100
message:
  Fix tests.
modified:
  logwalker.py                   logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
  tree.py                        tree.py-20060624222557-dudlwqcmkf22lt2s-1
=== modified file 'logwalker.py'
--- a/logwalker.py	2008-10-10 18:04:16 +0000
+++ b/logwalker.py	2008-11-03 03:18:51 +0000
@@ -354,6 +354,8 @@
         self.mutter("get previous %r:%r", path, revnum)
         row = self.cache.get_previous(path, revnum)
         if row is None:
+            if revnum == 0:
+                return (None, -1)
             return (path, revnum-1)
         (branch_path, action, copyfrom_path, copyfrom_rev) = row
         branch_path = branch_path.encode('utf-8')

=== modified file 'tree.py'
--- a/tree.py	2008-11-03 02:12:28 +0000
+++ b/tree.py	2008-11-03 03:18:51 +0000
@@ -88,7 +88,7 @@
         finally:
             repository.transport.add_connection(conn)
 
-    def get_file_text(self, file_id):
+    def get_file_text(self, file_id, path=None):
         return self.file_data[file_id]
 
 
@@ -312,8 +312,10 @@
     def get_file_byname(self, name):
         return open(self.abspath(name))
 
-    def get_file_text(self, file_id):
-        return self.get_file_byname(self.id2path(file_id)).read()
+    def get_file_text(self, file_id, path=None):
+        if path is None:
+            path = self.id2path(file_id)
+        return self.get_file_byname(path).read()
 
     def annotate_iter(self, file_id,
                       default_revision=CURRENT_REVISION):