Rev 1619: Remove too trivial utility functions. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk
Jelmer Vernooij
jelmer at samba.org
Sat Aug 23 16:38:19 BST 2008
At http://people.samba.org/bzr/jelmer/bzr-svn/trunk
------------------------------------------------------------
revno: 1619
revision-id: jelmer at samba.org-20080823153817-9uyfaqeu8un4umjl
parent: jelmer at samba.org-20080823151426-507xy9ew7vfee3qj
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sat 2008-08-23 17:38:17 +0200
message:
Remove too trivial utility functions.
modified:
tests/__init__.py __init__.py-20060508151940-e9f4d914801a2535
tests/test_branch.py test_branch.py-20060508162215-74ffeb5d608f8e20
tests/test_checkout.py test_checkout.py-20070101154110-eevkc29qj0q7udz5-1
tests/test_commit.py test_commit.py-20060624213521-l5kcufywkh9mnilk-1
tests/test_radir.py test_radir.py-20061231173434-31utf9o4byu7wktm-1
tests/test_tree.py test_tree.py-20070103204350-pr8nupes7e5sd2wr-1
tests/test_workingtree.py test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
=== modified file 'tests/__init__.py'
--- a/tests/__init__.py 2008-07-23 01:51:10 +0000
+++ b/tests/__init__.py 2008-08-23 15:38:17 +0000
@@ -24,9 +24,8 @@
from bzrlib import osutils, urlutils
from bzrlib.bzrdir import BzrDir
-from bzrlib.tests import TestCaseInTempDir, TestSkipped
+from bzrlib.tests import TestCaseInTempDir
from bzrlib.trace import mutter
-from bzrlib.urlutils import local_path_to_url
from bzrlib.workingtree import WorkingTree
from bzrlib.plugins.svn import properties, ra, repos
@@ -160,7 +159,7 @@
open(revprop_hook, 'w').write("#!/bin/sh\n")
os.chmod(revprop_hook, os.stat(revprop_hook).st_mode | 0111)
- return local_path_to_url(abspath)
+ return urlutils.local_path_to_url(abspath)
def make_local_bzrdir(self, repos_path, relpath):
"""Create a repository and checkout."""
@@ -174,14 +173,6 @@
def make_checkout(self, repos_url, relpath):
self.client_ctx.checkout(repos_url, relpath, "HEAD")
- @staticmethod
- def open_checkout(url):
- return WorkingTree.open(url)
-
- @staticmethod
- def open_checkout_bzrdir(url):
- return BzrDir.open(url)
-
def client_set_prop(self, path, name, value):
if value is None:
value = ""
=== modified file 'tests/test_branch.py'
--- a/tests/test_branch.py 2008-08-23 14:55:24 +0000
+++ b/tests/test_branch.py 2008-08-23 15:38:17 +0000
@@ -785,7 +785,7 @@
foo.add_file("foo/bla").modify()
sc.close()
- olddir = self.open_checkout_bzrdir("sc")
+ olddir = BzrDir.open("sc")
os.mkdir("dc")
@@ -811,7 +811,7 @@
sc.close()
self.client_update('sc')
- olddir = self.open_checkout_bzrdir("sc/branches/abranch")
+ olddir = BzrDir.open("sc/branches/abranch")
os.mkdir("dc")
@@ -837,7 +837,7 @@
sc.close()
self.client_update('sc')
- olddir = self.open_checkout_bzrdir("sc/trunk")
+ olddir = BzrDir.open("sc/trunk")
os.mkdir("dc")
@@ -860,7 +860,7 @@
sc.change_prop("bzr:ancestry:v3-none", "some-ghost\n")
sc.close()
- olddir = self.open_checkout_bzrdir("sc")
+ olddir = BzrDir.open("sc")
os.mkdir("dc")
=== modified file 'tests/test_checkout.py'
--- a/tests/test_checkout.py 2008-08-23 15:14:26 +0000
+++ b/tests/test_checkout.py 2008-08-23 15:38:17 +0000
@@ -62,27 +62,27 @@
def test_open_repository(self):
self.make_client("d", "dc")
- x = self.open_checkout_bzrdir("dc")
+ x = BzrDir.open("dc")
self.assertRaises(NoRepositoryPresent, x.open_repository)
def test_find_repository(self):
self.make_client("d", "dc")
- x = self.open_checkout_bzrdir("dc")
+ x = BzrDir.open("dc")
self.assertRaises(NoRepositoryPresent, x.find_repository)
def test__find_repository(self):
self.make_client("d", "dc")
- x = self.open_checkout_bzrdir("dc")
+ x = BzrDir.open("dc")
self.assertTrue(hasattr(x._find_repository(), "uuid"))
def test_needs_format_conversion_default(self):
self.make_client("d", "dc")
- x = self.open_checkout_bzrdir("dc")
+ x = BzrDir.open("dc")
self.assertTrue(x.needs_format_conversion())
def test_needs_format_conversion_self(self):
self.make_client("d", "dc")
- x = self.open_checkout_bzrdir("dc")
+ x = BzrDir.open("dc")
self.assertFalse(x.needs_format_conversion(SvnWorkingTreeDirFormat()))
def test_checkout_checkout(self):
@@ -99,5 +99,5 @@
dc.close()
self.client_update("dc")
- x = self.open_checkout_bzrdir("dc/trunk")
+ x = BzrDir.open("dc/trunk")
self.assertEquals(repos_url+"/trunk", x.open_branch().base)
=== modified file 'tests/test_commit.py'
--- a/tests/test_commit.py 2008-08-06 01:58:22 +0000
+++ b/tests/test_commit.py 2008-08-23 15:38:17 +0000
@@ -40,7 +40,7 @@
self.make_client('d', 'dc')
self.build_tree({'dc/foo/bla': "data"})
self.client_add("dc/foo")
- wt = self.open_checkout("dc")
+ wt = WorkingTree.open("dc")
revid = wt.commit(message="data")
self.assertEqual(wt.branch.generate_revision_id(1), revid)
self.client_update("dc")
@@ -56,7 +56,7 @@
self.make_client('d', 'dc')
self.build_tree({'dc/foo/bla': "data"})
self.client_add("dc/foo")
- wt = self.open_checkout("dc")
+ wt = WorkingTree.open("dc")
revid = wt.commit(message="data")
self.assertEqual(wt.branch.generate_revision_id(1), revid)
self.assertEqual(
@@ -70,7 +70,7 @@
self.make_client('d', 'dc')
self.build_tree({'dc/foo/bla': "data"})
self.client_add("dc/foo")
- wt = self.open_checkout("dc")
+ wt = WorkingTree.open("dc")
revid = wt.commit(message="data", rev_id="some-revid-bla")
self.assertEqual("some-revid-bla", revid)
self.assertEqual(wt.branch.generate_revision_id(1), revid)
@@ -84,7 +84,7 @@
self.make_client('d', 'dc')
self.build_tree({u'dc/I²C': "data"})
self.client_add(u"dc/I²C".encode("utf-8"))
- wt = self.open_checkout("dc")
+ wt = WorkingTree.open("dc")
wt.commit(message="data")
@@ -92,7 +92,7 @@
self.make_client('d', 'dc')
self.build_tree({'dc/foo/bla': "data"})
self.client_add("dc/foo")
- wt = self.open_checkout("dc")
+ wt = WorkingTree.open("dc")
self.assertRaises(BzrError, wt.commit,
message="data", local=True)
@@ -100,7 +100,7 @@
self.make_client('d', 'dc')
self.build_tree({'dc/foo/bla': "data"})
self.client_add("dc/foo")
- wt = self.open_checkout("dc")
+ wt = WorkingTree.open("dc")
revid = wt.commit(message="data", committer="john doe")
rev = wt.branch.repository.get_revision(revid)
self.assertEquals("john doe", rev.committer)
@@ -109,7 +109,7 @@
self.make_client('d', 'dc')
self.build_tree({'dc/foo/bla': "data"})
self.client_add("dc/foo")
- wt = self.open_checkout("dc")
+ wt = WorkingTree.open("dc")
revid = wt.commit(message=u"føø")
self.assertEqual(revid, wt.branch.generate_revision_id(1))
self.assertEqual(
@@ -123,7 +123,7 @@
self.make_client('d', 'dc')
self.build_tree({'dc/foo/bla': "data"})
self.client_add("dc/foo")
- wt = self.open_checkout("dc")
+ wt = WorkingTree.open("dc")
wt.set_pending_merges(["some-ghost-revision"])
wt.commit(message="data")
self.assertEqual(
@@ -134,7 +134,7 @@
repos_url = self.make_client('d', 'dc')
self.build_tree({'dc/foo/bla': "data"})
self.client_add("dc/foo")
- wt = self.open_checkout("dc")
+ wt = WorkingTree.open("dc")
wt.set_pending_merges(["some-ghost-revision"])
self.assertEqual(["some-ghost-revision"], wt.pending_merges())
wt.commit(message="data")
@@ -148,7 +148,7 @@
repos_url = self.make_client('d', 'dc')
self.build_tree({'dc/foo': "data"})
self.client_add("dc/foo")
- wt = self.open_checkout("dc")
+ wt = WorkingTree.open("dc")
wt.set_pending_merges(["some-ghost-revision"])
oldid = wt.path2id("foo")
wt.commit(message="data")
@@ -166,7 +166,7 @@
repos_url = self.make_client('d', 'dc')
self.build_tree({'dc/adir/foo': "data"})
self.client_add("dc/adir")
- wt = self.open_checkout("dc")
+ wt = WorkingTree.open("dc")
wt.commit(message="data")
wt.rename_one("adir/foo", "bar")
self.assertFalse(wt.has_filename("adir/foo"))
@@ -180,7 +180,7 @@
def test_commit_revision_id(self):
repos_url = self.make_client('d', 'dc')
- wt = self.open_checkout("dc")
+ wt = WorkingTree.open("dc")
self.build_tree({'dc/foo/bla': "data", 'dc/bla': "otherdata"})
wt.add('bla')
wt.commit(message="data")
@@ -248,7 +248,7 @@
def test_commit_metadata(self):
repos_url = self.make_client('d', 'dc')
- wt = self.open_checkout("dc")
+ wt = WorkingTree.open("dc")
self.build_tree({'dc/foo/bla': "data", 'dc/bla': "otherdata"})
wt.add('bla')
wt.commit(message="data")
@@ -318,7 +318,7 @@
self.client_add("sc/foo")
self.client_commit("sc", "foo")
- self.olddir = self.open_checkout_bzrdir("sc")
+ self.olddir = BzrDir.open("sc")
os.mkdir("dc")
self.newdir = self.olddir.sprout("dc")
@@ -537,7 +537,7 @@
self.client_add("sc/foo")
self.client_commit("sc", "foo")
- self.olddir = self.open_checkout_bzrdir("sc/foo/trunk")
+ self.olddir = BzrDir.open("sc/foo/trunk")
os.mkdir("dc")
self.newdir = self.olddir.sprout("dc")
=== modified file 'tests/test_radir.py'
--- a/tests/test_radir.py 2008-08-23 15:14:26 +0000
+++ b/tests/test_radir.py 2008-08-23 15:38:17 +0000
@@ -35,7 +35,7 @@
dc.add_dir("foo")
dc.close()
- x = self.open_checkout_bzrdir("dc")
+ x = BzrDir.open("dc")
self.assertRaises(NotImplementedError, x.clone, "dir")
def test_break_lock(self):
=== modified file 'tests/test_tree.py'
--- a/tests/test_tree.py 2008-08-23 15:14:26 +0000
+++ b/tests/test_tree.py 2008-08-23 15:38:17 +0000
@@ -20,6 +20,7 @@
from bzrlib.repository import Repository
from bzrlib.revision import NULL_REVISION
from bzrlib.tests import TestSkipped
+from bzrlib.workingtree import WorkingTree
from bzrlib.plugins.svn import errors
from bzrlib.plugins.svn.core import SubversionException
@@ -39,7 +40,7 @@
self.client_update("dc")
- tree = SvnBasisTree(self.open_checkout("dc"))
+ tree = SvnBasisTree(WorkingTree.open("dc"))
self.assertTrue(tree.inventory[tree.inventory.path2id("file")].executable)
def test_executable_changed(self):
@@ -51,7 +52,7 @@
self.client_update("dc")
self.client_set_prop("dc/file", "svn:executable", "*")
- tree = SvnBasisTree(self.open_checkout("dc"))
+ tree = SvnBasisTree(WorkingTree.open("dc"))
self.assertFalse(tree.inventory[tree.inventory.path2id("file")].executable)
def test_symlink(self):
@@ -64,7 +65,7 @@
dc.close()
self.client_update("dc")
- tree = SvnBasisTree(self.open_checkout("dc"))
+ tree = SvnBasisTree(WorkingTree.open("dc"))
self.assertEqual('symlink',
tree.inventory[tree.inventory.path2id("file")].kind)
self.assertEqual("target",
@@ -80,7 +81,7 @@
dc.close()
self.client_update("dc")
- tree = SvnBasisTree(self.open_checkout("dc"))
+ tree = SvnBasisTree(WorkingTree.open("dc"))
self.assertEqual('symlink',
tree.inventory[tree.inventory.path2id("file")].kind)
self.assertEqual("target\nbar\nbla",
@@ -104,7 +105,7 @@
if num == errors.ERR_WC_BAD_ADM_LOG:
raise TestSkipped("Unable to run test with svn 1.4")
raise
- tree = SvnBasisTree(self.open_checkout("dc"))
+ tree = SvnBasisTree(WorkingTree.open("dc"))
self.assertEqual('file',
tree.inventory[tree.inventory.path2id("file")].kind)
@@ -124,7 +125,7 @@
self.client_update("dc")
- tree = SvnBasisTree(self.open_checkout("dc"))
+ tree = SvnBasisTree(WorkingTree.open("dc"))
self.assertEqual('symlink',
tree.inventory[tree.inventory.path2id("file")].kind)
self.assertEqual("target",
@@ -142,7 +143,7 @@
dc.close()
self.client_update('dc')
- tree = SvnBasisTree(self.open_checkout("dc"))
+ tree = SvnBasisTree(WorkingTree.open("dc"))
self.assertRaises(NotImplementedError, tree.annotate_iter, tree.path2id("file"))
def test_executable_link(self):
@@ -164,7 +165,7 @@
raise TestSkipped("Unable to run test with svn 1.4")
raise
- wt = self.open_checkout("dc")
+ wt = WorkingTree.open("dc")
tree = SvnBasisTree(wt)
self.assertFalse(tree.inventory[tree.inventory.path2id("file")].executable)
self.assertFalse(wt.inventory[wt.inventory.path2id("file")].executable)
=== modified file 'tests/test_workingtree.py'
--- a/tests/test_workingtree.py 2008-08-23 15:14:26 +0000
+++ b/tests/test_workingtree.py 2008-08-23 15:38:17 +0000
@@ -36,18 +36,18 @@
self.make_client('a', 'dc')
self.build_tree({"dc/bl": "data"})
self.client_add("dc/bl")
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
tree.add(["bl"])
def test_add_unexisting(self):
self.make_client('a', 'dc')
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
self.assertRaises(NoSuchFile, tree.add, ["bl"])
def test_add(self):
self.make_client('a', 'dc')
self.build_tree({"dc/bl": "data"})
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
tree.add(["bl"])
inv = tree.read_working_inventory()
@@ -59,7 +59,7 @@
self.make_client('a', 'dc')
self.build_tree({u"dc/I²C": "data"})
self.client_add("dc/I²C")
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
inv = tree.read_working_inventory()
self.assertIsInstance(inv, Inventory)
self.assertTrue(inv.has_filename(u"I²C"))
@@ -67,7 +67,7 @@
def test_smart_add_file(self):
self.make_client('a', 'dc')
self.build_tree({"dc/bl": "data"})
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
tree.smart_add(["dc/bl"])
inv = tree.read_working_inventory()
@@ -78,7 +78,7 @@
def test_smart_add_recurse(self):
self.make_client('a', 'dc')
self.build_tree({"dc/bl/foo": "data"})
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
tree.smart_add(["dc/bl"])
inv = tree.read_working_inventory()
@@ -90,7 +90,7 @@
def test_smart_add_recurse_more(self):
self.make_client('a', 'dc')
self.build_tree({"dc/bl/foo/da": "data"})
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
tree.smart_add(["dc/bl"])
inv = tree.read_working_inventory()
@@ -103,7 +103,7 @@
def test_smart_add_more(self):
self.make_client('a', 'dc')
self.build_tree({"dc/bl/foo/da": "data", "dc/ha": "contents"})
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
tree.smart_add(["dc/bl", "dc/ha"])
inv = tree.read_working_inventory()
@@ -118,7 +118,7 @@
self.make_client('a', 'dc')
self.build_tree({"dc/.bzrignore": "bl/ha"})
self.build_tree({"dc/bl/foo/da": "data", "dc/bl/ha": "contents"})
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
tree.smart_add(["dc/bl"])
inv = tree.read_working_inventory()
@@ -132,7 +132,7 @@
def test_smart_add_toplevel(self):
self.make_client('a', 'dc')
self.build_tree({"dc/bl/foo/da": "data", "dc/ha": "contents"})
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
tree.smart_add(["dc"])
inv = tree.read_working_inventory()
@@ -146,7 +146,7 @@
def test_add_nolist(self):
self.make_client('a', 'dc')
self.build_tree({"dc/bl": "data"})
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
tree.add("bl")
inv = tree.read_working_inventory()
@@ -157,7 +157,7 @@
def test_add_nolist_withid(self):
self.make_client('a', 'dc')
self.build_tree({"dc/bl": "data"})
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
tree.add("bl", "bloe")
inv = tree.read_working_inventory()
@@ -169,7 +169,7 @@
def test_add_not_recursive(self):
self.make_client('a', 'dc')
self.build_tree({"dc/bl/file": "data"})
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
tree.add(["bl"])
tree = WorkingTree.open("dc")
@@ -179,7 +179,7 @@
def test_add_nested(self):
self.make_client('a', 'dc')
self.build_tree({"dc/bl/file": "data"})
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
tree.add(["bl", "bl/file"])
tree = WorkingTree.open("dc")
@@ -188,29 +188,29 @@
def test_lock_write(self):
self.make_client('a', 'dc')
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
tree.lock_write()
def test_lock_read(self):
self.make_client('a', 'dc')
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
tree.lock_read()
def test_unlock(self):
self.make_client('a', 'dc')
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
tree.lock_read()
tree.unlock()
def test_get_ignore_list_empty(self):
self.make_client('a', 'dc')
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
self.assertEqual(set([".svn"] + svn_config.get_default_ignores()), tree.get_ignore_list())
def test_get_ignore_list_onelevel(self):
self.make_client('a', 'dc')
self.client_set_prop("dc", "svn:ignore", "*.d\n*.c\n")
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
self.assertEqual(set([".svn"] + svn_config.get_default_ignores() + ["./*.d", "./*.c"]), tree.get_ignore_list())
def test_get_ignore_list_morelevel(self):
@@ -219,13 +219,13 @@
self.build_tree({'dc/x': None})
self.client_add("dc/x")
self.client_set_prop("dc/x", "svn:ignore", "*.e\n")
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
self.assertEqual(set([".svn"] + svn_config.get_default_ignores() + ["./*.d", "./*.c", "./x/*.e"]), tree.get_ignore_list())
def test_add_reopen(self):
self.make_client('a', 'dc')
self.build_tree({"dc/bl": "data"})
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
tree.add(["bl"])
inv = WorkingTree.open("dc").read_working_inventory()
@@ -234,7 +234,7 @@
def test_remove(self):
self.make_client('a', 'dc')
self.build_tree({"dc/bl": "data"})
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
tree.add(["bl"])
tree.remove(["bl"])
inv = tree.read_working_inventory()
@@ -243,7 +243,7 @@
def test_remove_dup(self):
self.make_client('a', 'dc')
self.build_tree({"dc/bl": "data"})
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
tree.add(["bl"])
os.remove("dc/bl")
inv = tree.read_working_inventory()
@@ -251,7 +251,7 @@
def test_is_control_file(self):
self.make_client('a', 'dc')
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
self.assertTrue(tree.is_control_filename(".svn"))
self.assertFalse(tree.is_control_filename(".bzr"))
@@ -272,7 +272,7 @@
self.build_tree({"dc/bl": "data"})
self.client_add("dc/bl")
self.client_commit("dc", "Bla")
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
tree.rename_one("bl", "bloe")
basis_inv = tree.basis_tree().inventory
@@ -286,7 +286,7 @@
def test_empty_basis_tree(self):
self.make_client('a', 'dc')
- wt = self.open_checkout("dc")
+ wt = WorkingTree.open("dc")
self.assertEqual(wt.branch.generate_revision_id(0),
wt.basis_tree().inventory.revision_id)
inv = Inventory()
@@ -302,7 +302,7 @@
self.client_add("dc/bl")
self.client_commit("dc", "Bla")
self.client_update("dc")
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
self.assertEqual(
tree.branch.generate_revision_id(1),
tree.basis_tree().get_revision_id())
@@ -314,7 +314,7 @@
self.client_add("dc/a")
self.client_add("dc/dir")
self.client_commit("dc", "Bla")
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
tree.move(["bl", "a"], "dir")
basis_inv = tree.basis_tree().inventory
@@ -331,7 +331,7 @@
def test_get_parent_ids_no_merges(self):
repos_url = self.make_client('a', 'dc')
self.build_tree({"dc/bl": "data"})
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
self.assertEqual([Branch.open(repos_url).last_revision()], tree.get_parent_ids())
def test_delta(self):
@@ -341,7 +341,7 @@
self.build_tree({"dc/bl": "data"})
self.client_commit("dc", "Bla")
self.build_tree({"dc/bl": "data2"})
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
tree.basis_tree()
delta = tree.changes_from(tree.basis_tree())
self.assertEqual("bl", delta.modified[0][0])
@@ -354,7 +354,7 @@
self.client_commit("dc", "bla")
self.build_tree({"dc/test": "data"})
self.client_add("dc/test")
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
inv = tree.read_working_inventory()
self.assertEqual(inv.path2id(""), inv.root.file_id)
self.assertTrue(inv.path2id("foo") != "")
@@ -371,7 +371,7 @@
self.client_commit("dc", "bla")
self.client_set_prop("dc", "svn:ignore", "foo\nbar\n")
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
ignorelist = tree.get_ignore_list()
self.assertTrue("./bl/test.*" in ignorelist)
self.assertTrue("./foo" in ignorelist)
@@ -385,7 +385,7 @@
self.client_commit("dc", "bla")
self.client_set_prop("dc", "svn:ignore", "foo\nbar\n")
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
self.assertTrue(tree.is_ignored("bl/test.foo"))
self.assertFalse(tree.is_ignored("bl/notignored"))
self.assertTrue(tree.is_ignored("foo"))
@@ -394,28 +394,28 @@
def test_ignore_controldir(self):
self.make_client('a', 'dc')
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
self.assertEqual([], list(tree.unknowns()))
def test_unknowns(self):
self.make_client('a', 'dc')
self.build_tree({"dc/bl": None})
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
self.assertEqual(['bl'], list(tree.unknowns()))
def test_unknown_not_added(self):
self.make_client('a', 'dc')
self.build_tree({"dc/bl": None})
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
self.assertFalse(tree.inventory.has_filename("bl"))
def test_extras(self):
self.make_client('a', 'dc')
self.build_tree({"dc/bl": None})
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
self.assertEqual(['.svn', 'bl'], list(tree.extras()))
def test_executable(self):
@@ -425,7 +425,7 @@
self.build_tree({"dc/bla": "data"})
self.client_add("dc/bla")
self.client_set_prop("dc/bla", "svn:executable", "*")
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
inv = tree.read_working_inventory()
self.assertTrue(inv[inv.path2id("bla")].executable)
@@ -435,7 +435,7 @@
self.make_client('a', 'dc')
os.symlink("target", "dc/bla")
self.client_add("dc/bla")
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
inv = tree.read_working_inventory()
self.assertEqual('symlink', inv[inv.path2id("bla")].kind)
self.assertEqual("target", inv[inv.path2id("bla")].symlink_target)
@@ -446,7 +446,7 @@
lhs_parent_id = Branch.open(repos_url).last_revision()
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
tree.set_pending_merges(["a", "c"])
self.assertEqual([lhs_parent_id, "a", "c"], tree.get_parent_ids())
tree.set_pending_merges([])
@@ -457,7 +457,7 @@
self.build_tree({"dc/bl": None})
self.client_add("dc/bl")
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
tree.set_pending_merges([
tree.branch.mapping.generate_revision_id("a-uuid-foo", 1, "branch/fpath"), "c"])
self.assertEqual(
@@ -469,7 +469,7 @@
self.build_tree({"dc/bl": None})
self.client_add("dc/bl")
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
tree.set_pending_merges([
tree.branch.mapping.generate_revision_id("a-uuid-foo", 1, "branch/path"), "c"])
self.assertEqual("a-uuid-foo:/branch/path:1\n",
@@ -479,7 +479,7 @@
self.make_client('a', 'dc')
self.build_tree({"dc/bl": "data"})
self.client_add("dc/bl")
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
tree.basis_tree()
tree.commit(message_callback=lambda x: "data")
@@ -487,7 +487,7 @@
self.make_client('a', 'dc')
self.build_tree({"dc/bl": "data"})
self.client_add("dc/bl")
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
tree.basis_tree()
tree.commit(message_callback=lambda x: u"data")
@@ -495,7 +495,7 @@
self.make_client('a', 'dc')
self.build_tree({"dc/bl": "data"})
self.client_add("dc/bl")
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
orig_tree = tree.basis_tree()
tree.commit(message=u"data")
@@ -505,7 +505,7 @@
self.client_add("dc/branches")
self.client_commit("dc", "initial changes")
self.make_checkout(repos_url + "/branches/foobranch", "de")
- tree = self.open_checkout("de")
+ tree = WorkingTree.open("de")
self.build_tree({'de/file': "foo"})
tree.basis_tree()
tree.commit(message="data")
@@ -514,7 +514,7 @@
self.make_client('a', 'dc')
self.build_tree({"dc/bl": "data"})
self.client_add("dc/bl")
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
orig_tree = tree.basis_tree()
tree.commit(message="data")
self.assertEqual(
@@ -531,7 +531,7 @@
def test_status(self):
self.make_client('a', 'dc')
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
self.assertTrue(os.path.exists(os.path.join("dc", ".svn")))
self.assertFalse(os.path.exists(os.path.join("dc", ".bzr")))
tree.read_working_inventory()
@@ -542,14 +542,14 @@
self.build_tree({'dc/bla': "data"})
self.client_add("dc/bla")
self.client_commit("dc", "msg")
- tree = self.open_checkout("de")
+ tree = WorkingTree.open("de")
tree.update()
self.assertTrue(os.path.exists(os.path.join("de", ".svn")))
self.assertTrue(os.path.exists(os.path.join("de", "bla")))
def test_status_bzrdir(self):
self.make_client('a', 'dc')
- bzrdir = self.open_checkout_bzrdir("dc")
+ bzrdir = BzrDir.open("dc")
self.assertTrue(os.path.exists(os.path.join("dc", ".svn")))
self.assertTrue(not os.path.exists(os.path.join("dc", ".bzr")))
bzrdir.open_workingtree()
@@ -557,7 +557,7 @@
def test_file_id_consistent(self):
self.make_client('a', 'dc')
self.build_tree({'dc/file': 'data'})
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
tree.add(["file"])
oldid = tree.inventory.path2id("file")
tree = WorkingTree.open("dc")
@@ -567,7 +567,7 @@
def test_file_id_kept(self):
self.make_client('a', 'dc')
self.build_tree({'dc/file': 'data'})
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
tree.add(["file"], ["fooid"])
self.assertEqual("fooid", tree.inventory.path2id("file"))
tree = WorkingTree.open("dc")
@@ -576,7 +576,7 @@
def test_file_rename_id(self):
self.make_client('a', 'dc')
self.build_tree({'dc/file': 'data'})
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
tree.add(["file"], ["fooid"])
tree.commit("msg")
tree.rename_one("file", "file2")
@@ -588,7 +588,7 @@
def test_file_id_kept_2(self):
self.make_client('a', 'dc')
self.build_tree({'dc/file': 'data', 'dc/other': 'blaid'})
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
tree.add(["file", "other"], ["fooid", "blaid"])
self.assertEqual("fooid", tree.inventory.path2id("file"))
self.assertEqual("blaid", tree.inventory.path2id("other"))
@@ -596,7 +596,7 @@
def test_file_remove_id(self):
self.make_client('a', 'dc')
self.build_tree({'dc/file': 'data'})
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
tree.add(["file"], ["fooid"])
tree.commit("msg")
tree.remove(["file"])
@@ -607,7 +607,7 @@
def test_file_move_id(self):
self.make_client('a', 'dc')
self.build_tree({'dc/file': 'data', 'dc/dir': None})
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
tree.add(["file", "dir"], ["fooid", "blaid"])
tree.commit("msg")
tree.move(["file"], "dir")
@@ -620,7 +620,7 @@
def test_escaped_char_filename(self):
self.make_client('a', 'dc')
self.build_tree({'dc/file with spaces': 'data'})
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
tree.add(["file with spaces"], ["fooid"])
tree.commit("msg")
self.assertEqual("fooid", tree.inventory.path2id("file with spaces"))
@@ -628,7 +628,7 @@
def test_get_branch_nick(self):
self.make_client('a', 'dc')
self.build_tree({'dc/some strange file': 'data'})
- tree = self.open_checkout("dc")
+ tree = WorkingTree.open("dc")
tree.add(["some strange file"])
tree.commit("message")
self.assertEqual(None, tree.branch.nick)
@@ -643,7 +643,7 @@
self.build_tree({'dc/some strange file': 'data-x'})
self.client_commit("dc", "msg")
self.client_update("dc")
- tree = self.open_checkout("de")
+ tree = WorkingTree.open("de")
self.build_tree({'de/some strange file': 'data-y'})
self.assertRaises(OutOfDateTree, lambda: tree.commit("bar"))
More information about the bazaar-commits
mailing list