Rev 1694: Make generate_revision_id take a tuple. in file:///data/jelmer/bzr-svn/trunk/
Jelmer Vernooij
jelmer at samba.org
Fri Aug 29 16:39:09 BST 2008
At file:///data/jelmer/bzr-svn/trunk/
------------------------------------------------------------
revno: 1694
revision-id: jelmer at samba.org-20080829153907-8cmdkm7k96we54bb
parent: jelmer at samba.org-20080829151825-d1fe126jcxyp60l7
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2008-08-29 17:39:07 +0200
message:
Make generate_revision_id take a tuple.
modified:
mapping.py mapping.py-20080128201303-6cp01phc0dmc0kiv-1
mapping3/__init__.py __init__.py-20080502174630-9324zh25kka98vlw-1
mapping4.py mapping4.py-20080827182338-y4xzpsf43vyiwcir-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
revids.py revids.py-20070416220458-36vfa0730cchevp1-1
tests/test_blackbox.py test_blackbox.py-20070325150839-d10llf8arptpcfl6-1
tests/test_branch.py test_branch.py-20060508162215-74ffeb5d608f8e20
tests/test_convert.py test_convert.py-20060705203611-b1l0bapeku6foco0-1
tests/test_mapping.py test_mapping.py-20080201131338-0zd86eznn4bojtee-1
tests/test_repository.py test_repos.py-20060508151940-ddc49a59257ca712
tests/test_tree.py test_tree.py-20070103204350-pr8nupes7e5sd2wr-1
tests/test_workingtree.py test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
upgrade.py upgrade.py-20070106192108-0rakplee2lzah4gs-1
=== modified file 'mapping.py'
--- a/mapping.py 2008-08-29 11:36:34 +0000
+++ b/mapping.py 2008-08-29 15:39:07 +0000
@@ -299,7 +299,7 @@
"""
raise NotImplementedError(self.parse_revision_id)
- def generate_revision_id(self, uuid, revnum, path):
+ def generate_revision_id(self, (uuid, revnum, path)):
"""Generate a unambiguous revision id.
:param uuid: UUID of the repository.
@@ -419,7 +419,7 @@
assert revnum >= 0
return (uuid, branch_path, revnum, cls())
- def generate_revision_id(self, uuid, revnum, path):
+ def generate_revision_id(self, (uuid, revnum, path)):
return "svn-v1:%d@%s-%s" % (revnum, uuid, escape_svn_path(path))
def __eq__(self, other):
@@ -443,7 +443,7 @@
assert revnum >= 0
return (uuid, branch_path, revnum, cls())
- def generate_revision_id(self, uuid, revnum, path):
+ def generate_revision_id(self, (uuid, revnum, path)):
return "svn-v2:%d@%s-%s" % (revnum, uuid, escape_svn_path(path))
def __eq__(self, other):
=== modified file 'mapping3/__init__.py'
--- a/mapping3/__init__.py 2008-08-29 11:36:34 +0000
+++ b/mapping3/__init__.py 2008-08-29 15:39:07 +0000
@@ -325,7 +325,7 @@
return "%s%s:%s:%s:%d" % (cls.revid_prefix, scheme, uuid, \
mapping.escape_svn_path(path.strip("/")), revnum)
- def generate_revision_id(self, uuid, revnum, path):
+ def generate_revision_id(self, (uuid, revnum, path)):
return self._generate_revision_id(uuid, revnum, path, self.scheme)
def unprefix(self, branch_path, repos_path):
=== modified file 'mapping4.py'
--- a/mapping4.py 2008-08-29 10:52:34 +0000
+++ b/mapping4.py 2008-08-29 15:39:07 +0000
@@ -56,7 +56,7 @@
return (uuid, branch_path, int(srevnum), cls())
- def generate_revision_id(self, uuid, revnum, path):
+ def generate_revision_id(self, (uuid, revnum, path)):
return "svn-v4:%s:%s:%d" % (uuid, path, revnum)
def generate_file_id(self, uuid, revnum, branch, inv_path):
=== modified file 'repository.py'
--- a/repository.py 2008-08-27 17:39:12 +0000
+++ b/repository.py 2008-08-29 15:39:07 +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.generate_revision_id((uuid, revnum, bp))
class SvnRepositoryFormat(RepositoryFormat):
=== modified file 'revids.py'
--- a/revids.py 2008-08-29 11:36:34 +0000
+++ b/revids.py 2008-08-29 15:39:07 +0000
@@ -41,7 +41,7 @@
# Or generate it
if revid is None:
- return mapping.generate_revision_id(self.repos.uuid, revnum, path)
+ return mapping.generate_revision_id((self.repos.uuid, revnum, path))
return revid
=== modified file 'tests/test_blackbox.py'
--- a/tests/test_blackbox.py 2008-08-23 15:14:26 +0000
+++ b/tests/test_blackbox.py 2008-08-29 15:39:07 +0000
@@ -276,13 +276,13 @@
newrepos = Repository.open("dc")
mapping = BzrSvnMappingv3FileProps(NoBranchingScheme())
self.assertTrue(newrepos.has_revision(
- mapping.generate_revision_id(uuid, 5, "")))
+ mapping.generate_revision_id((uuid, 5, ""))))
self.assertTrue(newrepos.has_revision(
- mapping.generate_revision_id(uuid, 1, "")))
+ mapping.generate_revision_id((uuid, 1, ""))))
inv1 = newrepos.get_inventory(
- mapping.generate_revision_id(uuid, 1, ""))
+ mapping.generate_revision_id((uuid, 1, "")))
inv2 = newrepos.get_inventory(
- mapping.generate_revision_id(uuid, 5, ""))
+ mapping.generate_revision_id((uuid, 5, "")))
self.assertNotEqual(inv1.path2id("y"), inv2.path2id("y"))
=== modified file 'tests/test_branch.py'
--- a/tests/test_branch.py 2008-08-28 00:55:50 +0000
+++ b/tests/test_branch.py 2008-08-29 15:39:07 +0000
@@ -695,9 +695,9 @@
host_fileid = tree.inventory.path2id("hosts")
mapping = BzrSvnMappingv3FileProps(TrunkBranchingScheme())
self.assertVersionsPresentEquals(texts, host_fileid, [
- mapping.generate_revision_id(uuid, 1, "trunk"),
- mapping.generate_revision_id(uuid, 2, "trunk"),
- mapping.generate_revision_id(uuid, 3, "trunk"),
+ mapping.generate_revision_id((uuid, 1, "trunk")),
+ mapping.generate_revision_id((uuid, 2, "trunk")),
+ mapping.generate_revision_id((uuid, 3, "trunk")),
oldbranch.generate_revision_id(6)])
newbranch.repository.unlock()
=== modified file 'tests/test_convert.py'
--- a/tests/test_convert.py 2008-08-23 17:55:26 +0000
+++ b/tests/test_convert.py 2008-08-29 15:39:07 +0000
@@ -409,5 +409,5 @@
abspath = '/' + abspath
branch = Branch.open(os.path.join(self.test_dir, "e", "trunk"))
self.assertEqual(local_path_to_url(os.path.join(self.test_dir, "e", "trunk")), branch.base.rstrip("/"))
- self.assertEqual(mapping.generate_revision_id("6987ef2d-cd6b-461f-9991-6f1abef3bd59", 1, 'trunk'), branch.last_revision())
+ self.assertEqual(mapping.generate_revision_id(("6987ef2d-cd6b-461f-9991-6f1abef3bd59", 1, 'trunk')), branch.last_revision())
=== modified file 'tests/test_mapping.py'
--- a/tests/test_mapping.py 2008-08-29 10:52:34 +0000
+++ b/tests/test_mapping.py 2008-08-29 15:39:07 +0000
@@ -142,7 +142,7 @@
class MappingTestAdapter(object):
def test_roundtrip_revision(self):
- revid = self.mapping.generate_revision_id("myuuid", 42, "path")
+ revid = self.mapping.generate_revision_id(("myuuid", 42, "path"))
(uuid, path, revnum, mapping) = self.mapping.parse_revision_id(revid)
self.assertEquals(uuid, "myuuid")
self.assertEquals(revnum, 42)
@@ -214,7 +214,7 @@
def test_parse_revision_id(self):
self.assertEquals(("myuuid", "bla", 5, self.mapping),
self.mapping.parse_revision_id(
- self.mapping.generate_revision_id("myuuid", 5, "bla")))
+ self.mapping.generate_revision_id(("myuuid", 5, "bla"))))
class Mappingv1Tests(MappingTestAdapter, TestCase):
=== modified file 'tests/test_repository.py'
--- a/tests/test_repository.py 2008-08-27 19:24:36 +0000
+++ b/tests/test_repository.py 2008-08-29 15:39:07 +0000
@@ -121,7 +121,7 @@
repos_url = self.make_repository("a")
repos = Repository.open(repos_url)
mapping = repos.get_mapping()
- self.assertEqual({u"": (mapping.generate_file_id(repos.uuid, 0, "", u""), mapping.generate_revision_id(repos.uuid, 0, ""))}, repos.get_fileid_map(0, "", mapping))
+ self.assertEqual({u"": (mapping.generate_file_id(repos.uuid, 0, "", u""), mapping.generate_revision_id((repos.uuid, 0, "")))}, repos.get_fileid_map(0, "", mapping))
def test_generate_revision_id_forced_revid(self):
repos_url = self.make_repository("a")
@@ -145,7 +145,7 @@
repos = Repository.open(repos_url)
revid = repos.generate_revision_id(1, "", repos.get_mapping())
self.assertEquals(
- repos.get_mapping().generate_revision_id(repos.uuid, 1, ""),
+ repos.get_mapping().generate_revision_id((repos.uuid, 1, "")),
revid)
def test_add_revision(self):
@@ -165,7 +165,7 @@
cb = self.get_commit_editor(repos_url)
cb.add_file("foo").modify("bar")
cb.close()
- revid = repos.get_mapping().generate_revision_id(repos.uuid, 1, "")
+ revid = repos.get_mapping().generate_revision_id((repos.uuid, 1, ""))
repos.add_signature_text(revid, "TEXT")
self.assertTrue(repos.has_signature_for_revision_id(revid))
self.assertEquals(repos.get_signature_text(revid), "TEXT")
@@ -650,7 +650,7 @@
bzrdir = self.make_client_and_bzrdir('d', 'dc')
repository = bzrdir.find_repository()
self.assertFalse(repository.has_revision(
- repository.get_mapping().generate_revision_id(repository.uuid, 5, "")))
+ repository.get_mapping().generate_revision_id((repository.uuid, 5, ""))))
def test_get_parent_map(self):
repos_url = self.make_client('d', 'dc')
@@ -789,7 +789,7 @@
(num, date, author) = self.client_commit("dc", "Second Message")
repository = Repository.open("svn+%s" % repos_url)
mapping = repository.get_mapping()
- revid = mapping.generate_revision_id(repository.uuid, 2, "")
+ revid = mapping.generate_revision_id((repository.uuid, 2, ""))
rev = repository.get_revision("myrevid")
self.assertEqual((repository.generate_revision_id(1, "", mapping),),
rev.parent_ids)
@@ -946,14 +946,14 @@
repository = Repository.open("svn+%s" % repos_url)
mapping = repository.get_mapping()
self.assertEqual(
- mapping.generate_revision_id(repository.uuid, 1, "bla/bloe"),
+ mapping.generate_revision_id((repository.uuid, 1, "bla/bloe")),
repository.generate_revision_id(1, "bla/bloe", mapping))
def test_generate_revision_id_zero(self):
repos_url = self.make_client('d', 'dc')
repository = Repository.open("svn+%s" % repos_url)
mapping = repository.get_mapping()
- self.assertEqual(mapping.generate_revision_id(repository.uuid, 0, ""),
+ self.assertEqual(mapping.generate_revision_id((repository.uuid, 0, "")),
repository.generate_revision_id(0, "", mapping))
def test_lookup_revision_id(self):
@@ -979,7 +979,7 @@
repository = Repository.open("svn+%s" % repos_url)
mapping = repository.get_mapping()
self.assertEqual(("", 1), repository.lookup_revision_id(
- mapping.generate_revision_id(repository.uuid, 1, ""))[:2])
+ mapping.generate_revision_id((repository.uuid, 1, "")))[:2])
self.assertEqual(("", 1),
repository.lookup_revision_id("myid")[:2])
@@ -994,7 +994,7 @@
repository = Repository.open("svn+%s" % repos_url)
mapping = repository.get_mapping()
self.assertEqual(("", 1), repository.lookup_revision_id(
- mapping.generate_revision_id(repository.uuid, 1, ""))[:2])
+ mapping.generate_revision_id((repository.uuid, 1, "")))[:2])
self.assertRaises(NoSuchRevision, repository.lookup_revision_id,
"corrupt-entry")
@@ -1013,9 +1013,9 @@
repository = Repository.open("svn+%s" % repos_url)
mapping = repository.get_mapping()
self.assertEqual(("", 2), repository.lookup_revision_id(
- mapping.generate_revision_id(repository.uuid, 2, ""))[:2])
+ mapping.generate_revision_id((repository.uuid, 2, "")))[:2])
self.assertEqual(("", 1), repository.lookup_revision_id(
- mapping.generate_revision_id(repository.uuid, 1, ""))[:2])
+ mapping.generate_revision_id((repository.uuid, 1, "")))[:2])
self.assertEqual(("", 2), repository.lookup_revision_id(
"corrupt-entry")[:2])
@@ -1056,7 +1056,7 @@
mapping = repository.get_mapping()
self.assertRaises(NoSuchRevision,
repository.lookup_revision_id,
- mapping.generate_revision_id("invaliduuid", 0, ""))
+ mapping.generate_revision_id(("invaliduuid", 0, "")))
def test_check(self):
repos_url = self.make_client('d', 'dc')
=== modified file 'tests/test_tree.py'
--- a/tests/test_tree.py 2008-08-23 15:38:17 +0000
+++ b/tests/test_tree.py 2008-08-29 15:39:07 +0000
@@ -179,12 +179,12 @@
mapping = repos.get_mapping()
inv = Inventory(root_id='blabloe')
inventory_add_external(inv, 'blabloe', 'blie/bla',
- mapping.generate_revision_id(repos.uuid, 1, ""),
+ mapping.generate_revision_id((repos.uuid, 1, "")),
None, repos_url)
self.assertEqual(TreeReference(
mapping.generate_file_id(repos.uuid, 0, "", u""),
'bla', inv.path2id('blie'),
- revision=mapping.generate_revision_id(repos.uuid, 1, "")),
+ revision=mapping.generate_revision_id((repos.uuid, 1, ""))),
inv[inv.path2id('blie/bla')])
def test_add_simple_norev(self):
@@ -193,13 +193,13 @@
mapping = repos.get_mapping()
inv = Inventory(root_id='blabloe')
inventory_add_external(inv, 'blabloe', 'bla',
- mapping.generate_revision_id(repos.uuid, 1, ""), None,
+ mapping.generate_revision_id((repos.uuid, 1, "")), None,
repos_url)
self.assertEqual(TreeReference(
mapping.generate_file_id(repos.uuid, 0, "", u""),
'bla', 'blabloe',
- revision=mapping.generate_revision_id(repos.uuid, 1, "")),
+ revision=mapping.generate_revision_id((repos.uuid, 1, ""))),
inv[inv.path2id('bla')])
def test_add_simple_rev(self):
@@ -208,13 +208,13 @@
inv = Inventory(root_id='blabloe')
mapping = repos.get_mapping()
inventory_add_external(inv, 'blabloe', 'bla',
- mapping.generate_revision_id(repos.uuid, 1, ""), 0, repos_url)
+ mapping.generate_revision_id((repos.uuid, 1, "")), 0, repos_url)
expected_ie = TreeReference(mapping.generate_file_id(repos.uuid, 0, "", u""),
'bla', 'blabloe',
- revision=mapping.generate_revision_id(repos.uuid, 1, ""),
+ revision=mapping.generate_revision_id((repos.uuid, 1, "")),
reference_revision=NULL_REVISION)
ie = inv[inv.path2id('bla')]
self.assertEqual(NULL_REVISION, ie.reference_revision)
- self.assertEqual(mapping.generate_revision_id(repos.uuid, 1, ""),
+ self.assertEqual(mapping.generate_revision_id((repos.uuid, 1, "")),
ie.revision)
self.assertEqual(expected_ie, inv[inv.path2id('bla')])
=== modified file 'tests/test_workingtree.py'
--- a/tests/test_workingtree.py 2008-08-27 19:06:48 +0000
+++ b/tests/test_workingtree.py 2008-08-29 15:39:07 +0000
@@ -460,7 +460,7 @@
tree = WorkingTree.open("dc")
tree.set_pending_merges([
- tree.branch.mapping.generate_revision_id("a-uuid-foo", 1, "branch/fpath"), "c"])
+ tree.branch.mapping.generate_revision_id(("a-uuid-foo", 1, "branch/fpath")), "c"])
self.assertEqual(
"svn-v3-none:a-uuid-foo:branch%2Ffpath:1\tc\n",
self.client_get_prop("dc", "bzr:ancestry:v3-none"))
@@ -472,7 +472,7 @@
tree = WorkingTree.open("dc")
tree.set_pending_merges([
- tree.branch.mapping.generate_revision_id("a-uuid-foo", 1, "branch/path"), "c"])
+ tree.branch.mapping.generate_revision_id(("a-uuid-foo", 1, "branch/path")), "c"])
self.assertEqual("a-uuid-foo:/branch/path:1\n",
self.client_get_prop("dc", "svk:merge"))
=== modified file 'upgrade.py'
--- a/upgrade.py 2008-08-23 15:14:26 +0000
+++ b/upgrade.py 2008-08-29 15:39:07 +0000
@@ -101,7 +101,7 @@
except InvalidRevisionId:
# Not a bzr-svn revision, nothing to do
continue
- newrevid = new_mapping.generate_revision_id(uuid, rev, bp)
+ newrevid = new_mapping.generate_revision_id((uuid, rev, bp))
if revid == newrevid:
continue
rename_map[revid] = newrevid
@@ -199,7 +199,7 @@
(uuid, bp, rev, mapping) = parse_revision_id(revid)
except InvalidRevisionId:
return revid
- return new_mapping.generate_revision_id(uuid, rev, bp)
+ return new_mapping.generate_revision_id((uuid, rev, bp))
def replay(repository, oldrevid, newrevid, new_parents):
return replay_snapshot(repository, oldrevid, newrevid, new_parents,
revid_renames, fix_revid)
More information about the bazaar-commits
mailing list