Rev 392: Use generate_revision_id() in more tests. in http://people.samba.org/bzr/jelmer/bzr-svn/bzr.dev
Jelmer Vernooij
jelmer at samba.org
Tue Jan 9 06:00:52 GMT 2007
------------------------------------------------------------
revno: 392
revision-id: jelmer at samba.org-20070109055935-s7gvlge0suagjkee
parent: jelmer at samba.org-20070109042501-mxmvqxudr3il7ym6
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Tue 2007-01-09 06:59:35 +0100
message:
Use generate_revision_id() in more tests.
modified:
tests/test_fileids.py test_fileids.py-20060622131341-19gyrlgqy8yl2od5-1
tests/test_repos.py test_repos.py-20060508151940-ddc49a59257ca712
tests/test_upgrade.py test_upgrade.py-20070106170128-64zt3eqggg4tng1c-1
tests/test_workingtree.py test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
=== modified file 'tests/test_fileids.py'
--- a/tests/test_fileids.py 2007-01-09 04:25:01 +0000
+++ b/tests/test_fileids.py 2007-01-09 05:59:35 +0000
@@ -288,7 +288,7 @@
self.client_commit("dc", "Msg")
self.build_tree({"dc/trunk/file": 'otherdata'})
self.client_commit("dc", "Msg")
- self.assertEqual({"": (ROOT_ID, "svn-v%d:3@%s-trunk" % (MAPPING_VERSION, self.repos.uuid)), "file": (generate_svn_file_id(self.repos.uuid, 2, "trunk", "file"), "svn-v%d:3@%s-trunk" % (MAPPING_VERSION, self.repos.uuid))}, self.repos.get_fileid_map(3, "trunk"))
+ self.assertEqual({"": (ROOT_ID, self.repos.generate_revision_id(3, "trunk")), "file": (generate_svn_file_id(self.repos.uuid, 2, "trunk", "file"), self.repos.generate_revision_id(3, "trunk"))}, self.repos.get_fileid_map(3, "trunk"))
def test_sibling_unrelated(self):
self.repos.set_branching_scheme(TrunkBranchingScheme())
@@ -301,7 +301,7 @@
self.client_commit("dc", "Msg")
self.build_tree({"dc/trunk/file": 'otherdata'})
self.client_commit("dc", "Msg")
- self.assertEqual({"": (ROOT_ID, "svn-v%d:3@%s-trunk" % (MAPPING_VERSION, self.repos.uuid)), "bar": (generate_svn_file_id(self.repos.uuid, 2, "trunk", "bar"), "svn-v%d:2@%s-trunk" % (MAPPING_VERSION, self.repos.uuid)), "file": (generate_svn_file_id(self.repos.uuid, 2, "trunk", "file"), "svn-v%d:3@%s-trunk" % (MAPPING_VERSION, self.repos.uuid))}, self.repos.get_fileid_map(3, "trunk"))
+ self.assertEqual({"": (ROOT_ID, self.repos.generate_revision_id(3, "trunk")), "bar": (generate_svn_file_id(self.repos.uuid, 2, "trunk", "bar"), "svn-v%d:2@%s-trunk" % (MAPPING_VERSION, self.repos.uuid)), "file": (generate_svn_file_id(self.repos.uuid, 2, "trunk", "file"), self.repos.generate_revision_id(3, "trunk"))}, self.repos.get_fileid_map(3, "trunk"))
def test_copy(self):
self.repos.set_branching_scheme(TrunkBranchingScheme())
@@ -313,7 +313,9 @@
self.client_commit("dc", "Msg")
self.client_copy("dc/trunk/file", "dc/trunk/bar")
self.client_commit("dc", "Msg")
- self.assertEqual({"": (ROOT_ID, "svn-v%d:3@%s-trunk" % (MAPPING_VERSION, self.repos.uuid)), "bar": (generate_svn_file_id(self.repos.uuid, 3, "trunk", "bar"), "svn-v%d:3@%s-trunk" % (MAPPING_VERSION, self.repos.uuid)), "file": (generate_svn_file_id(self.repos.uuid, 2, "trunk", "file"), "svn-v%d:2@%s-trunk" % (MAPPING_VERSION, self.repos.uuid))}, self.repos.get_fileid_map(3, "trunk"))
+ self.assertEqual({
+ "": (ROOT_ID, self.repos.generate_revision_id(3, "trunk")),
+ "bar": (generate_svn_file_id(self.repos.uuid, 3, "trunk", "bar"), self.repos.generate_revision_id(3, "trunk")), "file": (generate_svn_file_id(self.repos.uuid, 2, "trunk", "file"), self.repos.generate_revision_id(2, "trunk"))}, self.repos.get_fileid_map(3, "trunk"))
def test_copy_nested_modified(self):
self.repos.set_branching_scheme(TrunkBranchingScheme())
@@ -328,13 +330,13 @@
self.client_commit("dc", "Msg")
self.assertEqual({
"": (ROOT_ID,
- "svn-v%d:3@%s-trunk" % (MAPPING_VERSION, self.repos.uuid)),
+ self.repos.generate_revision_id(3, "trunk")),
"dir": (generate_svn_file_id(self.repos.uuid, 2, "trunk", "dir"),
- "svn-v%d:2@%s-trunk" % (MAPPING_VERSION, self.repos.uuid)),
+ self.repos.generate_revision_id(2, "trunk")),
"dir/file": (generate_svn_file_id(self.repos.uuid, 2, "trunk", "dir/file"),
- "svn-v%d:2@%s-trunk" % (MAPPING_VERSION, self.repos.uuid)),
+ self.repos.generate_revision_id(2, "trunk")),
"bar": (generate_svn_file_id(self.repos.uuid, 3, "trunk", "bar"),
- "svn-v%d:3@%s-trunk" % (MAPPING_VERSION, self.repos.uuid)),
+ self.repos.generate_revision_id(3, "trunk")),
"bar/file": (generate_svn_file_id(self.repos.uuid, 3, "trunk", "bar/file"),
- "svn-v%d:3@%s-trunk" % (MAPPING_VERSION, self.repos.uuid))},
+ self.repos.generate_revision_id(3, "trunk"))},
self.repos.get_fileid_map(3, "trunk"))
=== modified file 'tests/test_repos.py'
--- a/tests/test_repos.py 2007-01-09 02:16:31 +0000
+++ b/tests/test_repos.py 2007-01-09 05:59:35 +0000
@@ -131,9 +131,9 @@
repos = Repository.open(repos_url)
repos.set_branching_scheme(TrunkBranchingScheme())
self.assertEqual([
- "svn-v%d:2@%s-branches%%2fsomebranch" % (MAPPING_VERSION, repos.uuid),
- "svn-v%d:1@%s-trunk" % (MAPPING_VERSION, repos.uuid)
- ], list(repos.all_revision_ids()))
+ repos.generate_revision_id(2, "branches/somebranch"),
+ repos.generate_revision_id(1, "trunk")],
+ list(repos.all_revision_ids()))
def test_follow_history_follow(self):
repos_url = self.make_client("a", "dc")
@@ -306,7 +306,7 @@
self.client_add("dc/foo")
self.client_commit("dc", "My Message")
self.assertTrue(repository.has_revision(
- "svn-v%d:1@%s-" % (MAPPING_VERSION, repository.uuid)))
+ repository.generate_revision_id(1, "")))
self.assertFalse(repository.has_revision("some-other-revision"))
def test_has_revision_none(self):
@@ -324,11 +324,11 @@
repository = Repository.open("svn+%s" % repos_url)
self.assertEqual([],
repository.revision_parents(
- "svn-v%d:1@%s-" % (MAPPING_VERSION, repository.uuid)))
+ repository.generate_revision_id(1, "")))
self.assertEqual([
- "svn-v%d:1@%s-" % (MAPPING_VERSION, repository.uuid)],
+ repository.generate_revision_id(1, "")],
repository.revision_parents(
- "svn-v%d:2@%s-" % (MAPPING_VERSION, repository.uuid)))
+ repository.generate_revision_id(2, "")))
def test_revision_fileidmap(self):
repos_url = self.make_client('d', 'dc')
@@ -352,11 +352,11 @@
repository = Repository.open("svn+%s" % repos_url)
self.assertEqual([],
repository.revision_parents(
- "svn-v%d:1@%s-" % (MAPPING_VERSION, repository.uuid)))
- self.assertEqual(["svn-v%d:1@%s-" % (MAPPING_VERSION, repository.uuid),
+ repository.generate_revision_id(1, "")))
+ self.assertEqual([repository.generate_revision_id(1, ""),
"ghostparent"],
repository.revision_parents(
- "svn-v%d:2@%s-" % (MAPPING_VERSION, repository.uuid)))
+ repository.generate_revision_id(2, "")))
def test_get_revision(self):
@@ -370,11 +370,10 @@
(num, date, author) = self.client_commit("dc", "Second Message")
repository = Repository.open("svn+%s" % repos_url)
rev = repository.get_revision(
- "svn-v%d:2@%s-" % (MAPPING_VERSION, repository.uuid))
- self.assertEqual(["svn-v%d:1@%s-" % (MAPPING_VERSION, repository.uuid)],
+ repository.generate_revision_id(2, ""))
+ self.assertEqual([repository.generate_revision_id(1, "")],
rev.parent_ids)
- self.assertEqual(rev.revision_id,
- "svn-v%d:2@%s-" % (MAPPING_VERSION, repository.uuid))
+ self.assertEqual(rev.revision_id, repository.generate_revision_id(2, ""))
self.assertEqual(author, rev.committer)
self.assertIsInstance(rev.properties, dict)
@@ -391,17 +390,17 @@
self.client_commit("dc", "Third Message")
repository = Repository.open("svn+%s" % repos_url)
self.assertEqual([None,
- "svn-v%d:1@%s-" % (MAPPING_VERSION, repository.uuid),
- "svn-v%d:2@%s-" % (MAPPING_VERSION, repository.uuid)],
+ repository.generate_revision_id(1, ""),
+ repository.generate_revision_id(2, "")],
repository.get_ancestry(
- "svn-v%d:3@%s-" % (MAPPING_VERSION, repository.uuid)))
+ repository.generate_revision_id(3, "")))
self.assertEqual([None,
- "svn-v%d:1@%s-" % (MAPPING_VERSION, repository.uuid)],
+ repository.generate_revision_id(1, "")],
repository.get_ancestry(
- "svn-v%d:2@%s-" % (MAPPING_VERSION, repository.uuid)))
+ repository.generate_revision_id(2, "")))
self.assertEqual([None],
repository.get_ancestry(
- "svn-v%d:1@%s-" % (MAPPING_VERSION, repository.uuid)))
+ repository.generate_revision_id(1, "")))
self.assertEqual([None], repository.get_ancestry(None))
def test_get_revision_graph_empty(self):
@@ -427,23 +426,23 @@
self.client_commit("dc", "Third Message")
repository = Repository.open("svn+%s" % repos_url)
self.assertEqual({
- "svn-v%d:3@%s-" % (MAPPING_VERSION, repository.uuid): [
- "svn-v%d:2@%s-" % (MAPPING_VERSION, repository.uuid)],
- "svn-v%d:2@%s-" % (MAPPING_VERSION, repository.uuid): [
- "svn-v%d:1@%s-" % (MAPPING_VERSION, repository.uuid)],
- "svn-v%d:1@%s-" % (MAPPING_VERSION, repository.uuid): []},
- repository.get_revision_graph(
- "svn-v%d:3@%s-" % (MAPPING_VERSION, repository.uuid)))
- self.assertEqual({
- "svn-v%d:2@%s-" % (MAPPING_VERSION, repository.uuid): [
- "svn-v%d:1@%s-" % (MAPPING_VERSION, repository.uuid)],
- "svn-v%d:1@%s-" % (MAPPING_VERSION, repository.uuid): []},
- repository.get_revision_graph(
- "svn-v%d:2@%s-" % (MAPPING_VERSION, repository.uuid)))
- self.assertEqual({
- "svn-v%d:1@%s-" % (MAPPING_VERSION, repository.uuid): []},
- repository.get_revision_graph(
- "svn-v%d:1@%s-" % (MAPPING_VERSION, repository.uuid)))
+ repository.generate_revision_id(3, ""): [
+ repository.generate_revision_id(2, "")],
+ repository.generate_revision_id(2, ""): [
+ repository.generate_revision_id(1, "")],
+ repository.generate_revision_id(1, ""): []},
+ repository.get_revision_graph(
+ repository.generate_revision_id(3, "")))
+ self.assertEqual({
+ repository.generate_revision_id(2, ""): [
+ repository.generate_revision_id(1, "")],
+ repository.generate_revision_id(1, ""): []},
+ repository.get_revision_graph(
+ repository.generate_revision_id(2, "")))
+ self.assertEqual({
+ repository.generate_revision_id(1, ""): []},
+ repository.get_revision_graph(
+ repository.generate_revision_id(1, "")))
def test_get_ancestry2(self):
repos_url = self.make_client('d', 'dc')
@@ -455,11 +454,11 @@
repository = Repository.open("svn+%s" % repos_url)
self.assertEqual([None],
repository.get_ancestry(
- "svn-v%d:1@%s-" % (MAPPING_VERSION, repository.uuid)))
+ repository.generate_revision_id(1, "")))
self.assertEqual([None,
- "svn-v%d:1@%s-" % (MAPPING_VERSION, repository.uuid)],
+ repository.generate_revision_id(1, "")],
repository.get_ancestry(
- "svn-v%d:2@%s-" % (MAPPING_VERSION, repository.uuid)))
+ repository.generate_revision_id(2, "")))
def test_get_ancestry_merged(self):
repos_url = self.make_client('d', 'dc')
@@ -472,12 +471,12 @@
repository = Repository.open("svn+%s" % repos_url)
self.assertEqual([None],
repository.get_ancestry(
- "svn-v%d:1@%s-" % (MAPPING_VERSION, repository.uuid)))
+ repository.generate_revision_id(1, "")))
self.assertEqual([None,
- "svn-v%d:1@%s-" % (MAPPING_VERSION, repository.uuid),
+ repository.generate_revision_id(1, ""),
"a-parent"],
repository.get_ancestry(
- "svn-v%d:2@%s-" % (MAPPING_VERSION, repository.uuid)))
+ repository.generate_revision_id(2, "")))
def test_get_inventory(self):
@@ -495,14 +494,14 @@
self.client_commit("dc", "Third Message")
repository = Repository.open("svn+%s" % repos_url)
inv = repository.get_inventory(
- "svn-v%d:1@%s-" % (MAPPING_VERSION, repository.uuid))
+ repository.generate_revision_id(1, ""))
self.assertIsInstance(inv, Inventory)
self.assertIsInstance(inv.path2id("foo"), basestring)
inv = repository.get_inventory(
- "svn-v%d:2@%s-" % (MAPPING_VERSION, repository.uuid))
- self.assertEqual("svn-v%d:2@%s-" % (MAPPING_VERSION, repository.uuid),
+ repository.generate_revision_id(2, ""))
+ self.assertEqual(repository.generate_revision_id(2, ""),
inv[inv.path2id("foo")].revision)
- self.assertEqual("svn-v%d:1@%s-" % (MAPPING_VERSION, repository.uuid),
+ self.assertEqual(repository.generate_revision_id(1, ""),
inv[inv.path2id("blah")].revision)
self.assertIsInstance(inv, Inventory)
self.assertIsInstance(inv.path2id("foo"), basestring)
@@ -527,16 +526,16 @@
repository = Repository.open("svn+%s" % repos_url)
self.assertRaises(NoSuchRevision, repository.parse_revision_id,
"nonexisting")
- self.assertEqual(("bloe", 0),
+ self.assertEqual(("bloe", 1),
repository.parse_revision_id(
- "svn-v%d:0@%s-bloe" % (MAPPING_VERSION, repository.uuid)))
+ repository.generate_revision_id(1, "bloe")))
def test_parse_revision_id_invalid_uuid(self):
repos_url = self.make_client('d', 'dc')
repository = Repository.open("svn+%s" % repos_url)
self.assertRaises(NoSuchRevision,
repository.parse_revision_id,
- "svn-v%d:0 at invaliduuid-bloe" % MAPPING_VERSION)
+ generate_svn_revision_id("invaliduuid", 0, "bloe"))
def test_check(self):
repos_url = self.make_client('d', 'dc')
@@ -545,8 +544,8 @@
self.client_commit("dc", "My Message")
repository = Repository.open("svn+%s" % repos_url)
repository.check([
- "svn-v%d:0@%s-" % (MAPPING_VERSION, repository.uuid),
- "svn-v%d:1@%s-" % (MAPPING_VERSION, repository.uuid)])
+ repository.generate_revision_id(0, ""),
+ repository.generate_revision_id(1, "")])
def test_copy_contents_into(self):
repos_url = self.make_client('d', 'dc')
@@ -562,16 +561,14 @@
to_repos = BzrDir.create_repository("e")
repository.copy_content_into(to_repos,
- "svn-v%d:2@%s-" % (MAPPING_VERSION, repository.uuid))
+ repository.generate_revision_id(2, ""))
self.assertTrue(repository.has_revision(
- "svn-v%d:2@%s-" % (MAPPING_VERSION, repository.uuid)))
- self.assertTrue(repository.has_revision(
- "svn-v%d:1@%s-" % (MAPPING_VERSION, repository.uuid)))
- self.assertTrue(repository.has_revision(
- "svn-v%d:0@%s-" % (MAPPING_VERSION, repository.uuid)))
+ repository.generate_revision_id(2, "")))
+ self.assertTrue(repository.has_revision(
+ repository.generate_revision_id(1, "")))
self.assertFalse(repository.has_revision(
- "svn-v%d:4@%s-" % (MAPPING_VERSION, repository.uuid)))
+ repository.generate_revision_id(4, "")))
def test_is_shared(self):
repos_url = self.make_client('d', 'dc')
@@ -589,7 +586,7 @@
self.client_commit("dc", "Msg")
repos = Repository.open(repos_url)
- renames = repos.revision_fileid_renames("svn-v%d:1@%s-" % (MAPPING_VERSION, repos.uuid))
+ renames = repos.revision_fileid_renames(repos.generate_revision_id(1, ""))
self.assertEqual({"test": "bla"}, renames)
def test_fetch_fileid_renames(self):
@@ -604,7 +601,7 @@
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
self.assertEqual("bla", newrepos.get_inventory(
- "svn-v%d:1@%s-" % (MAPPING_VERSION, oldrepos.uuid)).path2id("test"))
+ oldrepos.generate_revision_id(1, "")).path2id("test"))
def test_fetch_trunk1(self):
repos_url = self.make_client('d', 'dc')
@@ -641,7 +638,7 @@
self.client_commit("dc", "Second Message")
newrepos = Repository.open("f")
oldrepos.copy_content_into(newrepos)
- self.assertTrue(oldrepos.has_revision("svn-v%d:2@%s-" % (MAPPING_VERSION, oldrepos.uuid)))
+ self.assertTrue(oldrepos.has_revision(oldrepos.generate_revision_id(2, "")))
def test_fetch_local(self):
repos_url = self.make_client('d', 'dc')
@@ -657,11 +654,11 @@
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
self.assertTrue(newrepos.has_revision(
- "svn-v%d:1@%s-" % (MAPPING_VERSION, oldrepos.uuid)))
+ oldrepos.generate_revision_id(1, "")))
self.assertTrue(newrepos.has_revision(
- "svn-v%d:2@%s-" % (MAPPING_VERSION, oldrepos.uuid)))
+ oldrepos.generate_revision_id(2, "")))
tree = newrepos.revision_tree(
- "svn-v%d:2@%s-" % (MAPPING_VERSION, oldrepos.uuid))
+ oldrepos.generate_revision_id(2, ""))
self.assertTrue(tree.has_filename("foo/bla"))
self.assertTrue(tree.has_filename("foo"))
self.assertEqual("data", tree.get_file_by_path("foo/bla").read())
@@ -691,28 +688,26 @@
oldrepos.copy_content_into(newrepos)
self.assertTrue(newrepos.has_revision(
- "svn-v%d:1@%s-trunk" % (MAPPING_VERSION, oldrepos.uuid)))
- self.assertTrue(newrepos.has_revision(
- "svn-v%d:2@%s-trunk" % (MAPPING_VERSION, oldrepos.uuid)))
- self.assertTrue(newrepos.has_revision(
- "svn-v%d:3@%s-trunk" % (MAPPING_VERSION, oldrepos.uuid)))
- self.assertTrue(newrepos.has_revision(
- "svn-v%d:4@%s-branches%%2ffoobranch" % (MAPPING_VERSION, oldrepos.uuid)))
- self.assertFalse(newrepos.has_revision(
- "svn-v%d:4@%s-trunk" % (MAPPING_VERSION, oldrepos.uuid)))
- self.assertFalse(newrepos.has_revision(
- "svn-v%d:2@%s-" % (MAPPING_VERSION, oldrepos.uuid)))
+ oldrepos.generate_revision_id(1, "trunk")))
+ self.assertTrue(newrepos.has_revision(
+ oldrepos.generate_revision_id(2, "trunk")))
+ self.assertTrue(newrepos.has_revision(
+ oldrepos.generate_revision_id(3, "trunk")))
+ self.assertTrue(newrepos.has_revision(
+ oldrepos.generate_revision_id(4, "branches/foobranch")))
+ self.assertFalse(newrepos.has_revision(
+ oldrepos.generate_revision_id(4, "trunk")))
+ self.assertFalse(newrepos.has_revision(
+ oldrepos.generate_revision_id(2, "")))
- rev = newrepos.get_revision(
- "svn-v%d:1@%s-trunk" % (MAPPING_VERSION, oldrepos.uuid))
+ rev = newrepos.get_revision(oldrepos.generate_revision_id(1, "trunk"))
self.assertEqual("$", rev.message)
rev = newrepos.get_revision(
- "svn-v%d:2@%s-trunk" % (MAPPING_VERSION, oldrepos.uuid))
+ oldrepos.generate_revision_id(2, "trunk"))
self.assertEqual(u'bla\xfcbla', rev.message)
- rev = newrepos.get_revision(
- "svn-v%d:3@%s-trunk" % (MAPPING_VERSION, oldrepos.uuid))
+ rev = newrepos.get_revision(oldrepos.generate_revision_id(3, "trunk"))
self.assertEqual(u"a\\x0cb", rev.message)
def test_fetch_replace(self):
@@ -729,13 +724,13 @@
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
self.assertTrue(newrepos.has_revision(
- "svn-v%d:1@%s-" % (MAPPING_VERSION, oldrepos.uuid)))
+ oldrepos.generate_revision_id(1, "")))
self.assertTrue(newrepos.has_revision(
- "svn-v%d:2@%s-" % (MAPPING_VERSION, oldrepos.uuid)))
+ oldrepos.generate_revision_id(2, "")))
inv1 = newrepos.get_inventory(
- "svn-v%d:1@%s-" % (MAPPING_VERSION, oldrepos.uuid))
+ oldrepos.generate_revision_id(1, ""))
inv2 = newrepos.get_inventory(
- "svn-v%d:2@%s-" % (MAPPING_VERSION, oldrepos.uuid))
+ oldrepos.generate_revision_id(2, ""))
self.assertNotEqual(inv1.path2id("bla"), inv2.path2id("bla"))
def test_fetch_copy_subdir(self):
@@ -889,13 +884,13 @@
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
self.assertTrue(newrepos.has_revision(
- "svn-v%d:1@%s-" % (MAPPING_VERSION, oldrepos.uuid)))
+ oldrepos.generate_revision_id(1, "")))
self.assertTrue(newrepos.has_revision(
- "svn-v%d:3@%s-" % (MAPPING_VERSION, oldrepos.uuid)))
+ oldrepos.generate_revision_id(3, "")))
inv1 = newrepos.get_inventory(
- "svn-v%d:1@%s-" % (MAPPING_VERSION, oldrepos.uuid))
+ oldrepos.generate_revision_id(1, ""))
inv2 = newrepos.get_inventory(
- "svn-v%d:3@%s-" % (MAPPING_VERSION, oldrepos.uuid))
+ oldrepos.generate_revision_id(3, ""))
def test_fetch_replace_self(self):
filename = os.path.join(self.test_dir, "dumpfile")
@@ -1034,13 +1029,13 @@
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
self.assertTrue(newrepos.has_revision(
- "svn-v%d:1@%s-" % (MAPPING_VERSION, oldrepos.uuid)))
+ oldrepos.generate_revision_id(1, "")))
self.assertTrue(newrepos.has_revision(
- "svn-v%d:3@%s-" % (MAPPING_VERSION, oldrepos.uuid)))
+ oldrepos.generate_revision_id(3, "")))
inv1 = newrepos.get_inventory(
- "svn-v%d:1@%s-" % (MAPPING_VERSION, oldrepos.uuid))
+ oldrepos.generate_revision_id(1, ""))
inv2 = newrepos.get_inventory(
- "svn-v%d:3@%s-" % (MAPPING_VERSION, oldrepos.uuid))
+ oldrepos.generate_revision_id(3, ""))
self.assertEqual(inv1.path2id("bla"), inv2.path2id("bla"))
def test_fetch_replace_backup(self):
@@ -1213,13 +1208,13 @@
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
self.assertTrue(newrepos.has_revision(
- "svn-v%d:1@%s-" % (MAPPING_VERSION, oldrepos.uuid)))
+ oldrepos.generate_revision_id(1, "")))
self.assertTrue(newrepos.has_revision(
- "svn-v%d:3@%s-" % (MAPPING_VERSION, oldrepos.uuid)))
+ oldrepos.generate_revision_id(3, "")))
inv1 = newrepos.get_inventory(
- "svn-v%d:1@%s-" % (MAPPING_VERSION, oldrepos.uuid))
+ oldrepos.generate_revision_id(1, ""))
inv2 = newrepos.get_inventory(
- "svn-v%d:3@%s-" % (MAPPING_VERSION, oldrepos.uuid))
+ oldrepos.generate_revision_id(3, ""))
self.assertEqual(inv1.path2id("bla"), inv2.path2id("bla"))
def test_fetch_replace_unrelated(self):
@@ -1353,13 +1348,13 @@
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
self.assertTrue(newrepos.has_revision(
- "svn-v%d:1@%s-" % (MAPPING_VERSION, oldrepos.uuid)))
+ oldrepos.generate_revision_id(1, "")))
self.assertTrue(newrepos.has_revision(
- "svn-v%d:4@%s-" % (MAPPING_VERSION, oldrepos.uuid)))
+ oldrepos.generate_revision_id(4, "")))
inv1 = newrepos.get_inventory(
- "svn-v%d:1@%s-" % (MAPPING_VERSION, oldrepos.uuid))
+ oldrepos.generate_revision_id(1, ""))
inv2 = newrepos.get_inventory(
- "svn-v%d:4@%s-" % (MAPPING_VERSION, oldrepos.uuid))
+ oldrepos.generate_revision_id(4, ""))
self.assertNotEqual(inv1.path2id("x"), inv2.path2id("x"))
def test_fetch_replace_related(self):
@@ -1515,13 +1510,13 @@
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
self.assertTrue(newrepos.has_revision(
- "svn-v%d:1@%s-" % (MAPPING_VERSION, oldrepos.uuid)))
+ oldrepos.generate_revision_id(1, "")))
self.assertTrue(newrepos.has_revision(
- "svn-v%d:5@%s-" % (MAPPING_VERSION, oldrepos.uuid)))
+ oldrepos.generate_revision_id(5, "")))
inv1 = newrepos.get_inventory(
- "svn-v%d:1@%s-" % (MAPPING_VERSION, oldrepos.uuid))
+ oldrepos.generate_revision_id(1, ""))
inv2 = newrepos.get_inventory(
- "svn-v%d:5@%s-" % (MAPPING_VERSION, oldrepos.uuid))
+ oldrepos.generate_revision_id(5, ""))
self.assertNotEqual(inv1.path2id("y"), inv2.path2id("y"))
def test_fetch_dir_upgrade(self):
@@ -1543,7 +1538,7 @@
oldrepos.copy_content_into(newrepos)
branch = Branch.open("%s/branches/mybranch" % repos_url)
- self.assertEqual(['svn-v%d:2@%s-branches%%2fmybranch' % (MAPPING_VERSION, oldrepos.uuid)],
+ self.assertEqual([oldrepos.generate_revision_id(2, "branches/mybranch")],
branch.revision_history())
def test_fetch_file_from_non_branch(self):
@@ -1565,7 +1560,7 @@
oldrepos.copy_content_into(newrepos)
branch = Branch.open("%s/trunk" % repos_url)
- self.assertEqual(['svn-v%d:2@%s-trunk' % (MAPPING_VERSION, oldrepos.uuid)],
+ self.assertEqual([oldrepos.generate_revision_id(2, "trunk")],
branch.revision_history())
def test_fetch_dir_from_non_branch(self):
@@ -1587,7 +1582,7 @@
oldrepos.copy_content_into(newrepos)
branch = Branch.open("%s/trunk" % repos_url)
- self.assertEqual(['svn-v%d:2@%s-trunk' % (MAPPING_VERSION, oldrepos.uuid)],
+ self.assertEqual([oldrepos.generate_revision_id(2, "trunk")],
branch.revision_history())
def test_fetch_from_non_branch(self):
@@ -1607,7 +1602,7 @@
oldrepos.copy_content_into(newrepos)
branch = Branch.open("%s/trunk" % repos_url)
- self.assertEqual(['svn-v%d:2@%s-trunk' % (MAPPING_VERSION, oldrepos.uuid)],
+ self.assertEqual([oldrepos.generate_revision_id(2, "trunk")],
branch.revision_history())
@@ -1655,17 +1650,17 @@
oldrepos.copy_content_into(newrepos)
self.assertTrue(newrepos.has_revision(
- "svn-v%d:1@%s-trunk" % (MAPPING_VERSION, oldrepos.uuid)))
- self.assertTrue(newrepos.has_revision(
- "svn-v%d:2@%s-trunk" % (MAPPING_VERSION, oldrepos.uuid)))
- self.assertTrue(newrepos.has_revision(
- "svn-v%d:3@%s-trunk" % (MAPPING_VERSION, oldrepos.uuid)))
- self.assertTrue(newrepos.has_revision(
- "svn-v%d:4@%s-branches%%2ffoobranch" % (MAPPING_VERSION, oldrepos.uuid)))
- self.assertFalse(newrepos.has_revision(
- "svn-v%d:4@%s-trunk" % (MAPPING_VERSION, oldrepos.uuid)))
- self.assertFalse(newrepos.has_revision(
- "svn-v%d:2@%s-" % (MAPPING_VERSION, oldrepos.uuid)))
+ oldrepos.generate_revision_id(1, "trunk")))
+ self.assertTrue(newrepos.has_revision(
+ oldrepos.generate_revision_id(2, "trunk")))
+ self.assertTrue(newrepos.has_revision(
+ oldrepos.generate_revision_id(3, "trunk")))
+ self.assertTrue(newrepos.has_revision(
+ oldrepos.generate_revision_id(4, "branches/foobranch")))
+ self.assertFalse(newrepos.has_revision(
+ oldrepos.generate_revision_id(4, "trunk")))
+ self.assertFalse(newrepos.has_revision(
+ oldrepos.generate_revision_id(2, "")))
def test_fetch_odd(self):
repos_url = self.make_client('d', 'dc')
@@ -1695,7 +1690,7 @@
TrunkBranchingScheme()).find_repository()
tree = repos.revision_tree(
- "svn-v%d:6@%s-branches%%2ffoobranch" % (MAPPING_VERSION, repos.uuid))
+ repos.generate_revision_id(6, "branches/foobranch"))
def test_fetch_consistent(self):
repos_url = self.make_client('d', 'dc')
@@ -1711,9 +1706,9 @@
oldrepos.copy_content_into(newrepos1)
oldrepos.copy_content_into(newrepos2)
inv1 = newrepos1.get_inventory(
- "svn-v%d:1@%s-" % (MAPPING_VERSION, oldrepos.uuid))
+ oldrepos.generate_revision_id(1, ""))
inv2 = newrepos2.get_inventory(
- "svn-v%d:1@%s-" % (MAPPING_VERSION, oldrepos.uuid))
+ oldrepos.generate_revision_id(1, ""))
self.assertEqual(inv1, inv2)
def test_fetch_executable(self):
@@ -1729,9 +1724,9 @@
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
self.assertTrue(newrepos.has_revision(
- "svn-v%d:1@%s-" % (MAPPING_VERSION, oldrepos.uuid)))
+ oldrepos.generate_revision_id(1, "")))
inv1 = newrepos.get_inventory(
- "svn-v%d:1@%s-" % (MAPPING_VERSION, oldrepos.uuid))
+ oldrepos.generate_revision_id(1, ""))
self.assertTrue(inv1[inv1.path2id("bla")].executable)
self.assertTrue(inv1[inv1.path2id("blie")].executable)
@@ -1747,9 +1742,9 @@
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
self.assertTrue(newrepos.has_revision(
- "svn-v%d:1@%s-" % (MAPPING_VERSION, oldrepos.uuid)))
+ oldrepos.generate_revision_id(1, "")))
inv1 = newrepos.get_inventory(
- "svn-v%d:1@%s-" % (MAPPING_VERSION, oldrepos.uuid))
+ oldrepos.generate_revision_id(1, ""))
self.assertEqual('symlink', inv1[inv1.path2id("mylink")].kind)
self.assertEqual('bla', inv1[inv1.path2id("mylink")].symlink_target)
@@ -1766,14 +1761,14 @@
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
self.assertTrue(newrepos.has_revision(
- "svn-v%d:1@%s-" % (MAPPING_VERSION, oldrepos.uuid)))
+ oldrepos.generate_revision_id(1, "")))
inv1 = newrepos.get_inventory(
- "svn-v%d:1@%s-" % (MAPPING_VERSION, oldrepos.uuid))
+ oldrepos.generate_revision_id(1, ""))
self.assertFalse(inv1[inv1.path2id("bla")].executable)
inv2 = newrepos.get_inventory(
- "svn-v%d:2@%s-" % (MAPPING_VERSION, oldrepos.uuid))
+ oldrepos.generate_revision_id(2, ""))
self.assertTrue(inv2[inv2.path2id("bla")].executable)
- self.assertEqual("svn-v%d:2@%s-" % (MAPPING_VERSION, oldrepos.uuid),
+ self.assertEqual(oldrepos.generate_revision_id(2, ""),
inv2[inv2.path2id("bla")].revision)
def test_fetch_ghosts(self):
@@ -1787,8 +1782,7 @@
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
- rev = newrepos.get_revision(
- "svn-v%d:1@%s-" % (MAPPING_VERSION, oldrepos.uuid))
+ rev = newrepos.get_revision(oldrepos.generate_revision_id(1, ""))
self.assertTrue("aghost" in rev.parent_ids)
def test_fetch_invalid_ghosts(self):
@@ -1802,8 +1796,7 @@
newrepos = dir.create_repository()
oldrepos.copy_content_into(newrepos)
- rev = newrepos.get_revision(
- "svn-v%d:1@%s-" % (MAPPING_VERSION, oldrepos.uuid))
+ rev = newrepos.get_revision(oldrepos.generate_revision_id(1, ""))
self.assertEqual([], rev.parent_ids)
def test_set_branching_scheme(self):
@@ -1839,9 +1832,9 @@
oldrepos.set_branching_scheme(TrunkBranchingScheme())
dir = BzrDir.create("f")
newrepos = dir.create_repository()
- copyrev = "svn-v%d:2@%s-branches%%2fabranch" % (MAPPING_VERSION, oldrepos.uuid)
- prevrev = "svn-v%d:3@%s-branches%%2fabranch" % (MAPPING_VERSION, oldrepos.uuid)
- lastrev = "svn-v%d:4@%s-branches%%2fabranch" % (MAPPING_VERSION, oldrepos.uuid)
+ copyrev = oldrepos.generate_revision_id(2, "branches/abranch")
+ prevrev = oldrepos.generate_revision_id(3, "branches/abranch")
+ lastrev = oldrepos.generate_revision_id(4, "branches/abranch")
oldrepos.copy_content_into(newrepos, lastrev)
inventory = newrepos.get_inventory(lastrev)
@@ -1861,9 +1854,9 @@
self.client_commit("dc", "My Message")
self.repos = Repository.open(repos_url)
self.inventory = self.repos.get_inventory(
- "svn-v%d:1@%s-" % (MAPPING_VERSION, self.repos.uuid))
+ self.repos.generate_revision_id(1, ""))
self.tree = self.repos.revision_tree(
- "svn-v%d:1@%s-" % (MAPPING_VERSION, self.repos.uuid))
+ self.repos.generate_revision_id(1, ""))
def test_inventory(self):
self.assertIsInstance(self.tree.inventory, Inventory)
@@ -1873,7 +1866,7 @@
self.assertEqual([], self.tree.get_parent_ids())
def test_get_revision_id(self):
- self.assertEqual("svn-v%d:1@%s-" % (MAPPING_VERSION, self.repos.uuid),
+ self.assertEqual(self.repos.generate_revision_id(1, ""),
self.tree.get_revision_id())
def test_get_file_lines(self):
@@ -1885,7 +1878,7 @@
self.client_commit("dc", "My Message")
inventory = self.repos.get_inventory(
- "svn-v%d:2@%s-" % (MAPPING_VERSION, self.repos.uuid))
+ self.repos.generate_revision_id(2, ""))
self.assertTrue(inventory[inventory.path2id("foo/bla")].executable)
@@ -1895,7 +1888,7 @@
self.client_commit("dc", "My Message")
inventory = self.repos.get_inventory(
- "svn-v%d:2@%s-" % (MAPPING_VERSION, self.repos.uuid))
+ self.repos.generate_revision_id(2, ""))
self.assertEqual('symlink', inventory[inventory.path2id("bar")].kind)
self.assertEqual('foo/bla', inventory[inventory.path2id("bar")].symlink_target)
=== modified file 'tests/test_upgrade.py'
--- a/tests/test_upgrade.py 2007-01-07 00:48:00 +0000
+++ b/tests/test_upgrade.py 2007-01-09 05:59:35 +0000
@@ -123,9 +123,9 @@
upgrade_repository(newrepos, oldrepos, allow_change=True)
- self.assertTrue(newrepos.has_revision("svn-v%d:1@%s-" % (MAPPING_VERSION, oldrepos.uuid)))
+ self.assertTrue(newrepos.has_revision(oldrepos.generate_revision_id(1, "")))
self.assertTrue(newrepos.has_revision("customrev-svn%d-upgrade" % MAPPING_VERSION))
- self.assertTrue(["svn-v%d:1@%s-" % (MAPPING_VERSION, oldrepos.uuid)],
+ self.assertTrue([oldrepos.generate_revision_id(1, "")],
newrepos.revision_parents("customrev-svn%d-upgrade" % MAPPING_VERSION))
def test_more_custom(self):
@@ -154,10 +154,10 @@
"anotherrev": "anotherrev-svn%d-upgrade" % MAPPING_VERSION},
renames)
- self.assertTrue(newrepos.has_revision("svn-v%d:1@%s-" % (MAPPING_VERSION, oldrepos.uuid)))
+ self.assertTrue(newrepos.has_revision(oldrepos.generate_revision_id(1, "")))
self.assertTrue(newrepos.has_revision("customrev-svn%d-upgrade" % MAPPING_VERSION))
self.assertTrue(newrepos.has_revision("anotherrev-svn%d-upgrade" % MAPPING_VERSION))
- self.assertTrue(["svn-v%d:1@%s-" % (MAPPING_VERSION, oldrepos.uuid)],
+ self.assertTrue([oldrepos.generate_revision_id(1, "")],
newrepos.revision_parents("customrev-svn%d-upgrade" % MAPPING_VERSION))
self.assertTrue(["customrev-svn%d-upgrade" % MAPPING_VERSION],
newrepos.revision_parents("anotherrev-svn%d-upgrade" % MAPPING_VERSION))
=== modified file 'tests/test_workingtree.py'
--- a/tests/test_workingtree.py 2007-01-08 16:36:23 +0000
+++ b/tests/test_workingtree.py 2007-01-09 05:59:35 +0000
@@ -166,7 +166,7 @@
self.client_update("dc")
tree = WorkingTree.open("dc")
self.assertEqual(
- "svn-v%d:1@%s-" % (MAPPING_VERSION, tree.branch.repository.uuid),
+ tree.branch.generate_revision_id(1),
tree.basis_tree().get_revision_id())
def test_move(self):
@@ -346,14 +346,14 @@
orig_tree = tree.basis_tree()
tree.commit(message="data")
self.assertEqual(
- "svn-v%d:1@%s-" % (MAPPING_VERSION, tree.branch.repository.uuid),
+ tree.branch.generate_revision_id(1),
tree.basis_tree().get_revision_id())
delta = tree.basis_tree().changes_from(orig_tree)
self.assertTrue(delta.has_changed())
tree = WorkingTree.open("dc")
delta = tree.basis_tree().changes_from(tree)
self.assertEqual(
- "svn-v%d:1@%s-" % (MAPPING_VERSION, tree.branch.repository.uuid),
+ tree.branch.generate_revision_id(1),
tree.basis_tree().get_revision_id())
self.assertFalse(delta.has_changed())
More information about the bazaar-commits
mailing list