from bzrlib.branch import Branch
from bzrlib.bzrdir import BzrDir
-from bzrlib.errors import NoSuchFile
-from bzrlib.inventory import ROOT_ID
+from bzrlib.errors import NoSuchFile, NoSuchRevision, NotBranchError
from bzrlib.repository import Repository
from bzrlib.trace import mutter
from branch import FakeControlFiles, SvnBranchFormat
from convert import load_dumpfile
-from repository import MAPPING_VERSION, generate_svn_revision_id
+from fileids import generate_svn_file_id
+from repository import MAPPING_VERSION, generate_svn_revision_id, SVN_PROP_BZR_REVISION_ID
from tests import TestCaseWithSubversionRepository
class WorkingSubversionBranch(TestCaseWithSubversionRepository):
repos_url = self.make_client("a", "dc")
branch = Branch.open(repos_url)
branch.revision_history()
- self.assertEqual(None, branch.last_revision())
+ self.assertEqual(branch.generate_revision_id(0), branch.last_revision())
+
+ def test_get_branch_path_root(self):
+ repos_url = self.make_client("a", "dc")
+ branch = Branch.open(repos_url)
+ self.assertEqual("", branch.get_branch_path())
+
+ def test_get_branch_path_subdir(self):
+ repos_url = self.make_client("a", "dc")
+ self.build_tree({"dc/trunk": None})
+ self.client_add("dc/trunk")
+ self.client_commit("dc", "Add branch")
+ branch = Branch.open(repos_url+"/trunk")
+ self.assertEqual("trunk", branch.get_branch_path())
+
+ def test_open_nonexistant(self):
+ repos_url = self.make_client("a", "dc")
+ self.assertRaises(NotBranchError, Branch.open, repos_url + "/trunk")
+
+ def test_last_rev_rev_info(self):
+ repos_url = self.make_client("a", "dc")
+ branch = Branch.open(repos_url)
+ self.assertEqual((1, branch.generate_revision_id(0)),
+ branch.last_revision_info())
+ branch.revision_history()
+ self.assertEqual((1, branch.generate_revision_id(0)),
+ branch.last_revision_info())
+
+ def test_lookup_revision_id_unknown(self):
+ repos_url = self.make_client("a", "dc")
+ branch = Branch.open(repos_url)
+ self.assertRaises(NoSuchRevision,
+ lambda: branch.lookup_revision_id("bla"))
+
+ def test_lookup_revision_id(self):
+ repos_url = self.make_client("a", "dc")
+ branch = Branch.open(repos_url)
+ self.assertEquals(0,
+ branch.lookup_revision_id(branch.last_revision()))
def test_set_parent(self):
repos_url = self.make_client('a', 'dc')
repos_url = self.make_client('a', 'dc')
bzrdir = BzrDir.open("svn+"+repos_url)
branch = bzrdir.open_branch()
- self.assertEqual(None, branch.last_revision())
+ self.assertEqual(branch.generate_revision_id(0),
+ branch.last_revision())
self.build_tree({'dc/foo': "data"})
self.client_add("dc/foo")
self.client_commit("dc", "My Message")
+ self.client_update("dc")
bzrdir = BzrDir.open("svn+"+repos_url)
branch = bzrdir.open_branch()
repos = bzrdir.find_repository()
- self.assertEqual(repos.generate_revision_id(1, ""),
+ self.assertEqual(repos.generate_revision_id(1, "", "none"),
branch.last_revision())
self.build_tree({'dc/foo': "data2"})
branch = Branch.open("svn+"+repos_url)
repos = Repository.open("svn+"+repos_url)
- self.assertEqual(repos.generate_revision_id(2, ""),
+ self.assertEqual(repos.generate_revision_id(2, "", "none"),
branch.last_revision())
def test_set_revision_history(self):
branch = Branch.open("svn+"+repos_url)
self.assertRaises(NotImplementedError, branch.set_revision_history, [])
- def test_get_root_id_empty(self):
- repos_url = self.make_client('a', 'dc')
- branch = Branch.open("svn+"+repos_url)
- self.assertEqual(ROOT_ID, branch.get_root_id())
-
- def test_get_root_id_trunk(self):
- repos_url = self.make_client('a', 'dc')
- self.build_tree({'dc/trunk': None})
- self.client_add("dc/trunk")
- self.client_commit("dc", "msg")
- branch = Branch.open("svn+"+repos_url+"/trunk")
- self.assertEqual(ROOT_ID, branch.get_root_id())
-
def test_break_lock(self):
repos_url = self.make_client('a', 'dc')
branch = Branch.open("svn+"+repos_url)
repos_url = self.make_client('a', 'dc')
branch = Branch.open("svn+"+repos_url)
- self.assertEqual([], branch.revision_history())
+ self.assertEqual([branch.generate_revision_id(0)],
+ branch.revision_history())
self.build_tree({'dc/foo': "data"})
self.client_add("dc/foo")
+ self.client_set_prop("dc", SVN_PROP_BZR_REVISION_ID+"none",
+ "42 mycommit\n")
self.client_commit("dc", "My Message")
+ self.client_update("dc")
branch = Branch.open("svn+"+repos_url)
repos = Repository.open("svn+"+repos_url)
- self.assertEqual([repos.generate_revision_id(1, "")],
+ self.assertEqual([repos.generate_revision_id(0, "", "none"),
+ repos.generate_revision_id(1, "", "none")],
branch.revision_history())
self.build_tree({'dc/foo': "data34"})
repos = Repository.open("svn+"+repos_url)
self.assertEqual([
- repos.generate_revision_id(1, ""),
- repos.generate_revision_id(2, "")],
+ repos.generate_revision_id(0, "", "none"),
+ "mycommit",
+ repos.generate_revision_id(2, "", "none")],
branch.revision_history())
+ def test_revision_id_to_revno_none(self):
+ """The None revid should map to revno 0."""
+ repos_url = self.make_client('a', 'dc')
+ branch = Branch.open(repos_url)
+ self.assertEquals(0, branch.revision_id_to_revno(None))
+
+ def test_revision_id_to_revno_nonexistant(self):
+ """revision_id_to_revno() should raise NoSuchRevision if
+ the specified revision did not exist in the branch history."""
+ repos_url = self.make_client('a', 'dc')
+ branch = Branch.open(repos_url)
+ self.assertRaises(NoSuchRevision, branch.revision_id_to_revno, "bla")
+
+ def test_revision_id_to_revno_simple(self):
+ repos_url = self.make_client('a', 'dc')
+ self.build_tree({'dc/foo': "data"})
+ self.client_add("dc/foo")
+ self.client_set_prop("dc", "bzr:revision-id:v%d-none" % MAPPING_VERSION,
+ "2 myrevid\n")
+ self.client_commit("dc", "My Message")
+ branch = Branch.open(repos_url)
+ self.assertEquals(2, branch.revision_id_to_revno("myrevid"))
+
+ def test_revision_id_to_revno_older(self):
+ repos_url = self.make_client('a', 'dc')
+ self.build_tree({'dc/foo': "data"})
+ self.client_add("dc/foo")
+ self.client_set_prop("dc", "bzr:revision-id:v%d-none" % MAPPING_VERSION,
+ "2 myrevid\n")
+ self.client_commit("dc", "My Message")
+ self.build_tree({'dc/foo': "someotherdata"})
+ self.client_set_prop("dc", "bzr:revision-id:v%d-none" % MAPPING_VERSION,
+ "2 myrevid\n3 mysecondrevid\n")
+ self.client_commit("dc", "My Message")
+ branch = Branch.open(repos_url)
+ self.assertEquals(3, branch.revision_id_to_revno("mysecondrevid"))
+ self.assertEquals(2, branch.revision_id_to_revno("myrevid"))
+
def test_get_nick_none(self):
repos_url = self.make_client('a', 'dc')
def test_get_nick_path(self):
repos_url = self.make_client('a', 'dc')
- self.build_tree({'dc/trunk': "data"})
+ self.build_tree({'dc/trunk': None})
self.client_add("dc/trunk")
self.client_commit("dc", "My Message")
self.build_tree({'dc/foo': "data"})
self.client_add("dc/foo")
- self.client_set_prop("dc", "bzr:revprop:branch-nick", "mybranch")
+ self.client_set_prop("dc", "bzr:revision-info",
+ "properties: \n\tbranch-nick: mybranch\n")
self.client_commit("dc", "My Message")
branch = Branch.open("svn+"+repos_url)
newbranch = newdir.open_branch()
uuid = "6f95bc5c-e18d-4021-aca8-49ed51dbcb75"
+ newbranch.lock_read()
tree = newbranch.repository.revision_tree(
- generate_svn_revision_id(uuid, 7, "branches/foobranch"))
+ generate_svn_revision_id(uuid, 7, "branches/foobranch",
+ "trunk0"))
- weave = tree.get_weave(tree.inventory.path2id("hosts"))
+ weave = newbranch.repository.weave_store.get_weave(
+ tree.inventory.path2id("hosts"),
+ newbranch.repository.get_transaction())
self.assertEqual([
- generate_svn_revision_id(uuid, 6, "branches/foobranch"),
- generate_svn_revision_id(uuid, 7, "branches/foobranch")],
+ generate_svn_revision_id(uuid, 6, "branches/foobranch", "trunk0"),
+ generate_svn_revision_id(uuid, 7, "branches/foobranch", "trunk0")],
weave.versions())
+ newbranch.unlock()
def test_fetch_odd(self):
uuid = olddir.find_repository().uuid
tree = newbranch.repository.revision_tree(
- generate_svn_revision_id(uuid, 6, "branches/foobranch"))
-
- weave = tree.get_weave(tree.inventory.path2id("hosts"))
- self.assertEqual([
- generate_svn_revision_id(uuid, 1, "trunk"),
- generate_svn_revision_id(uuid, 2, "trunk"),
- generate_svn_revision_id(uuid, 3, "trunk"),
- generate_svn_revision_id(uuid, 6, "branches/foobranch")],
- weave.versions())
+ generate_svn_revision_id(uuid, 6, "branches/foobranch", "trunk0"))
+ transaction = newbranch.repository.get_transaction()
+ newbranch.repository.lock_read()
+ weave = newbranch.repository.weave_store.get_weave(
+ tree.inventory.path2id("hosts"), transaction)
+ self.assertEqual(set([
+ generate_svn_revision_id(uuid, 1, "trunk", "trunk0"),
+ generate_svn_revision_id(uuid, 2, "trunk", "trunk0"),
+ generate_svn_revision_id(uuid, 3, "trunk", "trunk0"),
+ generate_svn_revision_id(uuid, 6, "branches/foobranch", "trunk0")]),
+ set(weave.versions()))
+ newbranch.repository.unlock()
def test_check(self):
self.make_client('d', 'dc')
def test_generate_revision_id(self):
self.make_client('d', 'dc')
+ self.build_tree({'dc/bla/bloe': None})
+ self.client_add("dc/bla")
+ self.client_commit("dc", "bla")
branch = Branch.open('d')
- self.assertEqual("svn-v%d:1@%s-" % (MAPPING_VERSION, branch.repository.uuid), branch.generate_revision_id(1))
+ self.assertEqual("svn-v%d-none:%s::1" % (MAPPING_VERSION, branch.repository.uuid), branch.generate_revision_id(1))
def test_create_checkout(self):
repos_url = self.make_client('d', 'dc')
url = "svn+"+repos_url+"/trunk"
oldbranch = Branch.open(url)
- newtree = oldbranch.create_checkout("e")
+ newtree = self.create_checkout(oldbranch, "e")
self.assertTrue(newtree.branch.repository.has_revision(
oldbranch.generate_revision_id(1)))
url = "svn+"+repos_url+"/trunk"
oldbranch = Branch.open(url)
- newtree = oldbranch.create_checkout("e", lightweight=True)
+ newtree = self.create_checkout(oldbranch, "e", lightweight=True)
self.assertEqual(oldbranch.generate_revision_id(1), newtree.base_revid)
self.assertTrue(os.path.exists("e/.svn"))
self.assertFalse(os.path.exists("e/.bzr"))
'dc/trunk/hosts': 'hej1'})
self.client_add("dc/trunk")
self.client_commit("dc", "created trunk and added hosts") #1
+ self.client_update("dc")
self.build_tree({'dc/trunk/hosts': 'bloe'})
self.client_commit("dc", "added another revision")
+ self.client_update("dc")
url = "svn+"+repos_url+"/trunk"
oldbranch = Branch.open(url)
- newtree = oldbranch.create_checkout("e", revision_id=
+ newtree = self.create_checkout(oldbranch, "e", revision_id=
oldbranch.generate_revision_id(1), lightweight=True)
self.assertEqual(oldbranch.generate_revision_id(1),
newtree.base_revid)
self.client_add("sc/foo")
self.client_commit("sc", "foo")
- olddir = BzrDir.open("sc")
+ olddir = self.open_checkout_bzrdir("sc")
+
+ os.mkdir("dc")
+
+ newdir = olddir.sprout('dc')
+
+ self.assertEqual(
+ olddir.open_branch().last_revision(),
+ newdir.open_branch().last_revision())
+
+ def test_fetch_dir_upgrade(self):
+ repos_url = self.make_client('d', 'sc')
+
+ self.build_tree({'sc/trunk/mylib/bla': "data", "sc/branches": None})
+ self.client_add("sc/trunk")
+ self.client_add("sc/branches")
+ self.client_commit("sc", "foo")
+
+ self.client_copy("sc/trunk/mylib", "sc/branches/abranch")
+ self.client_commit("sc", "Promote mylib")
+
+ olddir = self.open_checkout_bzrdir("sc/branches/abranch")
os.mkdir("dc")
olddir.open_branch().last_revision(),
newdir.open_branch().last_revision())
+ def test_fetch_branch_downgrade(self):
+ repos_url = self.make_client('d', 'sc')
+
+ self.build_tree({'sc/trunk': None, "sc/branches/abranch/bla": 'foo'})
+ self.client_add("sc/trunk")
+ self.client_add("sc/branches")
+ self.client_commit("sc", "foo")
+
+ self.client_copy("sc/branches/abranch", "sc/trunk/mylib")
+ self.client_commit("sc", "Demote mylib")
+
+ olddir = self.open_checkout_bzrdir("sc/trunk")
+
+ os.mkdir("dc")
+
+ newdir = olddir.sprout('dc')
+
+ self.assertEqual(
+ olddir.open_branch().last_revision(),
+ newdir.open_branch().last_revision())
+
+
+
def test_ghost_workingtree(self):
# Looks like bazaar has trouble creating a working tree of a
# revision that has ghost parents
self.build_tree({'sc/foo/bla': "data"})
self.client_add("sc/foo")
- self.client_set_prop("sc", "bzr:merge", "some-ghost\n")
+ self.client_set_prop("sc", "bzr:ancestry:v3-none", "some-ghost\n")
self.client_commit("sc", "foo")
- olddir = BzrDir.open("sc")
+ olddir = self.open_checkout_bzrdir("sc")
os.mkdir("dc")
git.samba.org / jelmer / subvertpy.git / blobdiff