At file:///data/jelmer/bzr-svn/trunk/
------------------------------------------------------------
revno: 1888
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: trunk
timestamp: Tue 2008-09-09 15:45:01 +0200
message:
Fix order of arguments to mapping.revision_id_foreign_to_bzr
modified:
tests/mapping_implementations/test_base.py
test_base.py-20080904055908-3t0g1y0qnmr6aeiq-1
tests/test_blackbox.py
test_blackbox.py-20070325150839-d10llf8arptpcfl6-1
tests/test_commit.py
test_commit.py-20060624213521-l5kcufywkh9mnilk-1
=== modified file 'tests/mapping_implementations/test_base.py'
--- a/tests/mapping_implementations/test_base.py 2008-09-09 13:36:52
+0000
+++ b/tests/mapping_implementations/test_base.py 2008-09-09 13:45:01
+0000
@@ -26,7 +26,7 @@
self.mapping =
mapping_registry.get(self.mapping_name).get_test_instance()
def test_roundtrip_revision(self):
- revid = self.mapping.revision_id_foreign_to_bzr(("myuuid", 42, "path"))
+ revid = self.mapping.revision_id_foreign_to_bzr(("myuuid", "path", 42))
(uuid, path, revnum), mapping =
self.mapping.revision_id_bzr_to_foreign(revid)
self.assertEquals(uuid, "myuuid")
self.assertEquals(revnum, 42)
@@ -116,7 +116,7 @@
def test_parse_revision_id(self):
self.assertEquals((("myuuid", "bla", 5), self.mapping),
self.mapping.revision_id_bzr_to_foreign(
- self.mapping.revision_id_foreign_to_bzr(("myuuid", 5, "bla"))))
+ self.mapping.revision_id_foreign_to_bzr(("myuuid", "bla", 5))))
def test_import_revision_svnprops(self):
=== modified file 'tests/test_blackbox.py'
--- a/tests/test_blackbox.py 2008-09-05 12:38:20 +0000
+++ b/tests/test_blackbox.py 2008-09-09 13:45:01 +0000
@@ -301,13 +301,13 @@
mapping = svnrepo.get_mapping()
newrepos = Repository.open("dc")
self.assertTrue(newrepos.has_revision(
- mapping.revision_id_foreign_to_bzr((uuid, 5, ""))))
+ mapping.revision_id_foreign_to_bzr((uuid, "", 5))))
self.assertTrue(newrepos.has_revision(
- mapping.revision_id_foreign_to_bzr((uuid, 1, ""))))
+ mapping.revision_id_foreign_to_bzr((uuid, "", 1))))
inv1 = newrepos.get_inventory(
- mapping.revision_id_foreign_to_bzr((uuid, 1, "")))
+ mapping.revision_id_foreign_to_bzr((uuid, "", 1)))
inv2 = newrepos.get_inventory(
- mapping.revision_id_foreign_to_bzr((uuid, 5, "")))
+ mapping.revision_id_foreign_to_bzr((uuid, "", 5)))
self.assertNotEqual(inv1.path2id("y"), inv2.path2id("y"))
=== modified file 'tests/test_commit.py'
--- a/tests/test_commit.py 2008-09-09 12:25:50 +0000
+++ b/tests/test_commit.py 2008-09-09 13:45:01 +0000
@@ -561,7 +561,7 @@
mapping = master_branch.repository.get_mapping()
self.assertEquals({"dir": dirid,
"dir/file": fileid},
- rm_provider.get_revision(1,
"").get_fileid_map(mapping))
+ rm_provider.get_revision("",
1).get_fileid_map(mapping))
class RevpropTests(SubversionTestCase):
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
