Rev 1083: Extend ra log test. in file:///data/jelmer/bzr-svn/cext/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/cext/

------------------------------------------------------------
revno: 1083
revision-id: jelmer at samba.org-20080605152431-ity0q1eh0mycedse
parent: jelmer at samba.org-20080605144823-yk82b00wxz0mc4tc
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: cext
timestamp: Thu 2008-06-05 17:24:31 +0200
message:
  Extend ra log test.
modified:
  logwalker.py                   logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
  repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
  tests/test_ra.py               test_ra.py-20080313141743-uzsm7ejitrlqone5-1
=== modified file 'logwalker.py'
--- a/logwalker.py	2008-06-05 14:48:23 +0000
+++ b/logwalker.py	2008-06-05 15:24:31 +0000
@@ -402,7 +402,7 @@
         try:
             while len(unchecked_dirs) > 0:
                 nextp = unchecked_dirs.pop()
-                (dirents, fetch_rev, props) = conn.get_dir(nextp, revnum, DIRENT_KIND)
+                dirents = conn.get_dir(nextp, revnum, DIRENT_KIND)[0]
                 for k,v in dirents.items():
                     childp = urlutils.join(nextp, k)
                     if v['kind'] == core.NODE_DIR:

=== modified file 'repository.py'
--- a/repository.py	2008-06-04 18:56:53 +0000
+++ b/repository.py	2008-06-05 15:24:31 +0000
@@ -458,7 +458,6 @@
             parent_ids = (mainline_parent,)
             
             if mainline_parent != NULL_REVISION:
-
                 svn_fileprops = logwalker.lazy_dict({}, self.branchprop_list.get_changed_properties, branch, revnum)
                 svn_revprops = logwalker.lazy_dict({}, self.transport.revprop_list, revnum)
                 revmeta = RevisionMetadata(self, branch, None, revnum, svn_revprops, svn_fileprops)

=== modified file 'tests/test_ra.py'
--- a/tests/test_ra.py	2008-06-04 22:09:09 +0000
+++ b/tests/test_ra.py	2008-06-05 15:24:31 +0000
@@ -73,22 +73,28 @@
         returned = []
         def cb(*args):
             returned.append(args)
+        def check_results(returned):
+            self.assertEquals(2, len(returned))
+            (paths, revnum, props) = returned[0]
+            self.assertEquals(None, paths)
+            self.assertEquals(revnum, 0)
+            self.assertEquals(["svn:date"], props.keys())
+            (paths, revnum, props) = returned[1]
+            self.assertEquals({'/foo': ('A', None, -1)}, paths)
+            self.assertEquals(revnum, 1)
+            self.assertEquals(set(["svn:date", "svn:author", "svn:log"]), 
+                              set(props.keys()))
         self.ra.get_log(cb, [""], 0, 0)
         self.assertEquals(1, len(returned))
         self.do_commit()
         returned = []
         self.ra.get_log(cb, ["/"], 0, 1, discover_changed_paths=True, 
                         strict_node_history=False)
-        self.assertEquals(2, len(returned))
-        (paths, revnum, props) = returned[0]
-        self.assertEquals(None, paths)
-        self.assertEquals(revnum, 0)
-        self.assertEquals(["svn:date"], props.keys())
-        (paths, revnum, props) = returned[1]
-        self.assertEquals({'/foo': ('A', None, -1)}, paths)
-        self.assertEquals(revnum, 1)
-        self.assertEquals(set(["svn:date", "svn:author", "svn:log"]), 
-                          set(props.keys()))
+        check_results(returned)
+        returned = []
+        self.ra.get_log(cb, None, 0, 1, discover_changed_paths=True, 
+                        strict_node_history=False)
+        check_results(returned)
 
     def test_get_commit_editor_busy(self):
         def mycb(rev):