14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
from bzrlib.selftest import InTempDir
21
class TestAppendRevisions(InTempDir):
22
"""Test appending more than one revision"""
24
from bzrlib.branch import Branch
25
br = Branch(".", init=True)
18
from bzrlib.branch import Branch, copy_branch
19
from bzrlib.commit import commit
20
from bzrlib.errors import NoSuchRevision, UnlistableBranch
21
from bzrlib.selftest import TestCaseInTempDir
22
from bzrlib.trace import mutter
24
class TestBranch(TestCaseInTempDir):
26
def test_append_revisions(self):
27
"""Test appending more than one revision"""
28
br = Branch.initialize(".")
26
29
br.append_revision("rev1")
27
30
self.assertEquals(br.revision_history(), ["rev1",])
28
31
br.append_revision("rev2", "rev3")
29
32
self.assertEquals(br.revision_history(), ["rev1", "rev2", "rev3"])
35
class TestFetch(TestCaseInTempDir):
37
def test_fetch_revisions(self):
38
"""Test fetch-revision operation."""
39
from bzrlib.fetch import Fetcher
42
b1 = Branch.initialize('b1')
43
b2 = Branch.initialize('b2')
44
file(os.sep.join(['b1', 'foo']), 'w').write('hello')
45
b1.add(['foo'], ['foo-id'])
46
b1.commit('lala!', rev_id='revision-1', allow_pointless=False)
49
f = Fetcher(from_branch=b1, to_branch=b2)
50
eq = self.assertEquals
52
eq(f.last_revision, 'revision-1')
54
rev = b2.get_revision('revision-1')
55
tree = b2.revision_tree('revision-1')
56
eq(tree.get_file_text('foo-id'), 'hello')
58
def test_push_stores(self):
59
"""Copy the stores from one branch to another"""
61
br_a = Branch.initialize("a")
62
file('a/b', 'wb').write('b')
64
commit(br_a, "silly commit")
67
br_b = Branch.initialize("b")
68
self.assertRaises(NoSuchRevision, br_b.get_revision,
69
br_a.revision_history()[0])
70
br_a.push_stores(br_b)
71
rev = br_b.get_revision(br_a.revision_history()[0])
72
tree = br_b.revision_tree(br_a.revision_history()[0])
74
if tree.inventory[file_id].kind == "file":
75
tree.get_file(file_id).read()
78
def test_copy_branch(self):
79
"""Copy the stores from one branch to another"""
80
br_a, br_b = self.test_push_stores()
81
commit(br_b, "silly commit")
83
br_c = copy_branch(br_a, 'c', basis_branch=br_b)
84
self.assertEqual(br_a.revision_history(), br_c.revision_history())
85
assert br_b.last_revision() not in br_c.revision_history()
86
br_c.get_revision(br_b.last_revision())
87
# TODO: rewrite this as a regular unittest, without relying on the displayed output
88
# >>> from bzrlib.commit import commit
89
# >>> bzrlib.trace.silent = True
90
# >>> br1 = ScratchBranch(files=['foo', 'bar'])
93
# >>> commit(br1, "lala!", rev_id="REVISION-ID-1", verbose=False)
94
# >>> br2 = ScratchBranch()
95
# >>> br2.update_revisions(br1)
97
# Added 1 inventories.
99
# >>> br2.revision_history()
101
# >>> br2.update_revisions(br1)
103
# >>> br1.text_store.total_size() == br2.text_store.total_size()