Rev 1699: Fix last tests. in file:///data/jelmer/bzr-svn/trunk/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1699
revision-id: jelmer at samba.org-20080829162715-ci9ryy6rqhgy4mk8
parent: jelmer at samba.org-20080829162010-lzvvxp462cy0fvro
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2008-08-29 18:27:15 +0200
message:
  Fix last tests.
modified:
  repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
  tests/test_mapping.py          test_mapping.py-20080201131338-0zd86eznn4bojtee-1
=== modified file 'repository.py'
--- a/repository.py	2008-08-29 15:39:07 +0000
+++ b/repository.py	2008-08-29 16:27:15 +0000
@@ -129,7 +129,7 @@
         return None
     if not mapping.is_branch(bp) and not mapping.is_tag(bp):
         return None
-    return mapping.generate_revision_id((uuid, revnum, bp))
+    return mapping.revision_id_foreign_to_bzr((uuid, revnum, bp))
 
 
 class SvnRepositoryFormat(RepositoryFormat):

=== modified file 'tests/test_mapping.py'
--- a/tests/test_mapping.py	2008-08-29 16:19:47 +0000
+++ b/tests/test_mapping.py	2008-08-29 16:27:15 +0000
@@ -143,7 +143,7 @@
 class MappingTestAdapter(object):
     def test_roundtrip_revision(self):
         revid = self.mapping.revision_id_foreign_to_bzr(("myuuid", 42, "path"))
-        (uuid, path, revnum, mapping) = self.mapping.revision_id_foreign_to_bzr(revid)
+        (uuid, path, revnum, mapping) = self.mapping.revision_id_bzr_to_foreign(revid)
         self.assertEquals(uuid, "myuuid")
         self.assertEquals(revnum, 42)
         self.assertEquals(path, "path")