Rev 2004: Change lookup_revision_id signature to return foreign_revid. in file:///data/jelmer/bzr-svn/0.5/
Jelmer Vernooij
jelmer at samba.org
Mon Nov 17 16:40:34 GMT 2008
At file:///data/jelmer/bzr-svn/0.5/
------------------------------------------------------------
revno: 2004
revision-id: jelmer at samba.org-20081117164030-tow1eb74fackq98g
parent: jelmer at samba.org-20081117162927-h3w9lhx33cr4cqad
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.5
timestamp: Mon 2008-11-17 17:40:30 +0100
message:
Change lookup_revision_id signature to return foreign_revid.
modified:
branch.py svnbranch.py-20051017135706-11c749eb0dab04a7
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
fileids.py fileids.py-20060714013623-u5iiyqqnko11grcf-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
revids.py revids.py-20070416220458-36vfa0730cchevp1-1
tags.py tags.py-20080822211316-scblu3akdvu0b64c-1
tests/mapping3/__init__.py __init__.py-20080831152358-oy04n53cpnh64aj6-1
tests/mapping_implementations/test_repository.py test_repository.py-20080902013845-ity7d1ymye69sobm-2
tests/test_fileids.py test_fileids.py-20060622131341-19gyrlgqy8yl2od5-1
=== modified file 'branch.py'
--- a/branch.py 2008-11-12 10:24:38 +0000
+++ b/branch.py 2008-11-17 16:40:30 +0000
@@ -193,7 +193,7 @@
:return: Revision number on the branch.
:raises NoSuchRevision: If the revision id was not found.
"""
- (bp, revnum, mapping) = self.repository.lookup_revision_id(revid,
+ (uuid, bp, revnum), mapping = self.repository.lookup_revision_id(revid,
ancestry=(self.get_branch_path(), self.get_revnum()),
project=self.project)
assert bp.strip("/") == self.get_branch_path(revnum).strip("/"), \
=== modified file 'commit.py'
--- a/commit.py 2008-11-17 16:01:46 +0000
+++ b/commit.py 2008-11-17 16:40:30 +0000
@@ -119,7 +119,7 @@
if graph.is_ancestor(revid, baserevid):
break
try:
- (path, revnum, mapping) = repository.lookup_revision_id(revid)
+ (uuid, path, revnum), mapping = repository.lookup_revision_id(revid)
except NoSuchRevision:
break
@@ -369,7 +369,7 @@
self.base_path = None
self.base_mapping = repository.get_mapping()
else:
- (self.base_path, self.base_revnum, self.base_mapping) = \
+ (uuid, self.base_path, self.base_revnum), self.base_mapping = \
repository.lookup_revision_id(self.base_revid)
self._base_revmeta = self.repository._revmeta_provider.get_revision(self.base_path, self.base_revnum)
self._base_branch_props = self._base_revmeta.get_fileprops()
@@ -1001,7 +1001,7 @@
parent_revid = rev.parent_ids[0]
- (bp, _, _) = self.target.lookup_revision_id(parent_revid)
+ (uuid, bp, _), _ = self.target.lookup_revision_id(parent_revid)
if target_branch is None:
target_branch = Branch.open(_url_escape_uri(urlutils.join(self.target.base, bp)))
if target_branch.get_branch_path() != bp:
=== modified file 'fetch.py'
--- a/fetch.py 2008-11-17 16:29:27 +0000
+++ b/fetch.py 2008-11-17 16:40:30 +0000
@@ -623,11 +623,11 @@
revmetas.append(revmeta)
for p in revmeta.get_rhs_parents(mapping):
try:
- (branch_path, revnum, mapping) = self.source.lookup_revision_id(p, project=project)
+ foreign_revid, mapping = self.source.lookup_revision_id(p, project=project)
except NoSuchRevision:
pass # Ghost
else:
- extra.append(((uuid, branch_path, revnum), project, mapping))
+ extra.append((foreign_revid, project, mapping))
elif not find_ghosts:
break
checked.add((revmeta.get_foreign_revid(), mapping))
@@ -773,8 +773,8 @@
elif revision_id is None:
needed = self._find_all(self.source.get_mapping(), pb=nested_pb)
else:
- (branch_path, revnum, mapping) = self.source.lookup_revision_id(revision_id)
- needed = self._find_until((self.source.uuid, branch_path, revnum), mapping, find_ghosts, pb=nested_pb)
+ foreign_revid, mapping = self.source.lookup_revision_id(revision_id)
+ needed = self._find_until(foreign_revid, mapping, find_ghosts, pb=nested_pb)
finally:
nested_pb.finished()
=== modified file 'fileids.py'
--- a/fileids.py 2008-11-09 20:20:31 +0000
+++ b/fileids.py 2008-11-17 16:40:30 +0000
@@ -132,7 +132,7 @@
self.repos.generate_revision_id, find_children)
if find_children is not None:
def get_children(path, revid):
- (bp, revnum, mapping) = self.repos.lookup_revision_id(revid)
+ (uuid, bp, revnum), mapping = self.repos.lookup_revision_id(revid)
for p in find_children(bp+"/"+path, revnum):
yield p[len(bp):].strip("/")
else:
=== modified file 'repository.py'
--- a/repository.py 2008-11-17 00:46:51 +0000
+++ b/repository.py 2008-11-17 16:40:30 +0000
@@ -406,7 +406,7 @@
"""
if revision_id in (None, NULL_REVISION):
return
- (branch_path, revnum, mapping) = self.lookup_revision_id(revision_id)
+ (uuid, branch_path, revnum), mapping = self.lookup_revision_id(revision_id)
for revmeta in self._revmeta_provider.iter_reverse_branch_changes(branch_path, revnum, to_revnum=0,
mapping=mapping, pb=pb,
limit=limit):
@@ -432,7 +432,7 @@
return True
try:
- (path, revnum, _) = self.lookup_revision_id(revision_id, project=project)
+ (uuid, path, revnum), _ = self.lookup_revision_id(revision_id, project=project)
except bzr_errors.NoSuchRevision:
return False
@@ -475,7 +475,7 @@
return parent_map
def _get_revmeta(self, revision_id):
- (branch, revnum, mapping) = self.lookup_revision_id(revision_id)
+ (uuid, branch, revnum), mapping = self.lookup_revision_id(revision_id)
revmeta = self._revmeta_provider.get_revision(branch, revnum)
return revmeta, mapping
@@ -597,7 +597,7 @@
return signature
def add_signature_text(self, revision_id, signature):
- (path, revnum, mapping) = self.lookup_revision_id(revision_id)
+ (uuid, path, revnum), mapping = self.lookup_revision_id(revision_id)
try:
self.transport.change_rev_prop(revnum, SVN_REVPROP_BZR_SIGNATURE, signature)
except subvertpy.SubversionException, (_, subvertpy.ERR_REPOS_DISABLED_FEATURE):
=== modified file 'revids.py'
--- a/revids.py 2008-11-12 19:49:51 +0000
+++ b/revids.py 2008-11-17 16:40:30 +0000
@@ -48,7 +48,7 @@
assert isinstance(branch_path, str)
assert isinstance(mapping, BzrSvnMapping)
if uuid == self.repos.uuid:
- return (branch_path, revnum, mapping)
+ return (self.repos.uuid, branch_path, revnum), mapping
# If the UUID doesn't match, this may still be a valid revision
# id; a revision from another SVN repository may be pushed into
# this one.
@@ -57,15 +57,15 @@
last_revnum = self.repos.get_latest_revnum()
fileprops_to_revnum = last_revnum
- for entry_revid, branch, min_revno, max_revno, mapping in self.discover_revprop_revids(lyout, last_revnum, 0):
+ for entry_revid, branch, min_revno, max_revno, mapping in self.discover_revprop_revids(layout, last_revnum, 0):
if revid == entry_revid:
- return (branch, min_revno, max_revno, mapping.name)
+ return (self.repos.uuid, branch, min_revno, max_revno), mapping
fileprops_to_revnum = min(fileprops_to_revnum, min_revno)
for entry_revid, branch, min_revno, max_revno, mapping in self.discover_fileprop_revids(layout, 0, fileprops_to_revnum, project):
if revid == entry_revid:
(bp, revnum, mapping_name) = self.bisect_revid_revnum(revid, branch, min_revno, max_revno)
- return (bp, revnum, mapping_name)
+ return (self.repos.uuid, bp, revnum), mapping_name
raise NoSuchRevision(self, revid)
def discover_revprop_revids(self, layout, from_revnum, to_revnum):
@@ -157,7 +157,7 @@
assert isinstance(branch_path, str)
assert isinstance(mapping, BzrSvnMapping)
if uuid == self.actual.repos.uuid:
- return (branch_path, revnum, mapping)
+ return (uuid, branch_path, revnum), mapping
# If the UUID doesn't match, this may still be a valid revision
# id; a revision from another SVN repository may be pushed into
# this one.
@@ -173,7 +173,7 @@
# Entry already complete?
assert min_revnum <= max_revnum
if min_revnum == max_revnum:
- return (branch_path, min_revnum, mapping_registry.parse_mapping_name("svn-" + mapping))
+ return (self.actual.repos.uuid, branch_path, min_revnum), mapping_registry.parse_mapping_name("svn-" + mapping)
except NoSuchRevision, e:
last_revnum = self.actual.repos.get_latest_revnum()
last_checked = self.cache.last_revnum_checked(repr((layout, project)))
@@ -212,8 +212,7 @@
(branch_path, revnum, mapping) = self.actual.bisect_revid_revnum(revid,
branch_path, min_revnum, max_revnum)
self.cache.insert_revid(revid, branch_path, revnum, revnum, mapping.name)
- return (branch_path, revnum, mapping)
-
+ return (self.actual.repos.uuid, branch_path, revnum), mapping
class RevisionIdMapCache(CacheTable):
=== modified file 'tags.py'
--- a/tags.py 2008-10-02 21:18:28 +0000
+++ b/tags.py 2008-11-17 16:40:30 +0000
@@ -51,7 +51,7 @@
assert isinstance(path, str)
parent = urlutils.dirname(path)
try:
- (from_bp, from_revnum, mapping) = self.repository.lookup_revision_id(tag_target, project=self.branch.project)
+ (from_uuid, from_bp, from_revnum), mapping = self.repository.lookup_revision_id(tag_target, project=self.branch.project)
except NoSuchRevision:
mutter("not setting tag %s; unknown revision %s", tag_name, tag_target)
return
=== modified file 'tests/mapping3/__init__.py'
--- a/tests/mapping3/__init__.py 2008-11-12 19:49:51 +0000
+++ b/tests/mapping3/__init__.py 2008-11-17 16:40:30 +0000
@@ -250,9 +250,9 @@
dc.close()
repository = Repository.open(self.repos_url)
mapping = repository.get_mapping()
- self.assertEqual(("", 1), repository.lookup_revision_id(
+ self.assertEqual((repository.uuid, "", 1), repository.lookup_revision_id(
mapping.revision_id_foreign_to_bzr((repository.uuid, "", 1)))[:2])
- self.assertEqual(("", 1),
+ self.assertEqual((repository.uuid, "", 1),
repository.lookup_revision_id("myid")[:2])
def test_lookup_revision_id_overridden_invalid(self):
@@ -263,7 +263,7 @@
repository = Repository.open(self.repos_url)
mapping = repository.get_mapping()
- self.assertEqual(("", 1), repository.lookup_revision_id(
+ self.assertEqual((repository.uuid, "", 1), repository.lookup_revision_id(
mapping.revision_id_foreign_to_bzr((repository.uuid, "", 1)))[:2])
self.assertRaises(NoSuchRevision, repository.lookup_revision_id,
"corrupt-entry")
@@ -282,11 +282,11 @@
self.client_commit("dc", "foobar")
repository = Repository.open(self.repos_url)
mapping = repository.get_mapping()
- self.assertEqual(("", 2), repository.lookup_revision_id(
+ self.assertEqual((repository.uuid, "", 2), repository.lookup_revision_id(
mapping.revision_id_foreign_to_bzr((repository.uuid, "", 2)))[:2])
- self.assertEqual(("", 1), repository.lookup_revision_id(
+ self.assertEqual((repository.uuid, "", 1), repository.lookup_revision_id(
mapping.revision_id_foreign_to_bzr((repository.uuid, "", 1)))[:2])
- self.assertEqual(("", 2), repository.lookup_revision_id(
+ self.assertEqual((repository.uuid, "", 2), repository.lookup_revision_id(
"corrupt-entry")[:2])
def test_lookup_revision_id_overridden_not_found(self):
=== modified file 'tests/mapping_implementations/test_repository.py'
--- a/tests/mapping_implementations/test_repository.py 2008-11-12 12:13:47 +0000
+++ b/tests/mapping_implementations/test_repository.py 2008-11-17 16:40:30 +0000
@@ -785,7 +785,7 @@
self.assertRaises(NoSuchRevision, repository.lookup_revision_id,
"nonexisting")
mapping = repository.get_mapping()
- self.assertEqual(("bloe", 1),
+ self.assertEqual((repository.uuid, "bloe", 1),
repository.lookup_revision_id(
repository.generate_revision_id(1, "bloe", mapping))[:2])
=== modified file 'tests/test_fileids.py'
--- a/tests/test_fileids.py 2008-09-18 23:41:23 +0000
+++ b/tests/test_fileids.py 2008-11-17 16:40:30 +0000
@@ -31,7 +31,7 @@
def lookup_revision_id(self, revid):
ret = self.mapping.revision_id_foreign_to_bzr(revid)
- return ret[1], ret[2], ret[3]
+ return ret, None
class TestComplexFileids(SubversionTestCase):
More information about the bazaar-commits
mailing list