← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testbranch.py

  • Committer: Martin Pool
  • Date: 2005-08-30 06:10:39 UTC
  • Revision ID: mbp@sourcefrog.net-20050830061039-1d0347fb236c39ad
- clean up some code in revision.py

- move all exceptions to bzrlib.errors

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testbranch.py
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
16
16
 
17
 
import os
18
 
from bzrlib.branch import Branch
19
 
from bzrlib.clone import copy_branch
20
 
from bzrlib.commit import commit
21
 
from bzrlib.errors import NoSuchRevision, UnlistableBranch
22
17
from bzrlib.selftest import TestCaseInTempDir
23
 
from bzrlib.trace import mutter
24
 
 
25
 
class TestBranch(TestCaseInTempDir):
26
 
 
 
18
 
 
19
 
 
20
class TestAppendRevisions(TestCaseInTempDir):
 
21
    """Test appending more than one revision"""
27
22
    def test_append_revisions(self):
28
 
        """Test appending more than one revision"""
29
 
        br = Branch.initialize(".")
 
23
        from bzrlib.branch import Branch
 
24
        br = Branch(".", init=True)
30
25
        br.append_revision("rev1")
31
26
        self.assertEquals(br.revision_history(), ["rev1",])
32
27
        br.append_revision("rev2", "rev3")
33
28
        self.assertEquals(br.revision_history(), ["rev1", "rev2", "rev3"])
34
29
 
35
30
 
36
 
class TestFetch(TestCaseInTempDir):
37
 
 
38
 
    def test_fetch_revisions(self):
39
 
        """Test fetch-revision operation."""
40
 
        from bzrlib.fetch import Fetcher
41
 
        os.mkdir('b1')
42
 
        os.mkdir('b2')
43
 
        b1 = Branch.initialize('b1')
44
 
        b2 = Branch.initialize('b2')
45
 
        file(os.sep.join(['b1', 'foo']), 'w').write('hello')
46
 
        b1.add(['foo'], ['foo-id'])
47
 
        b1.commit('lala!', rev_id='revision-1', allow_pointless=False)
48
 
 
49
 
        mutter('start fetch')
50
 
        f = Fetcher(from_branch=b1, to_branch=b2)
51
 
        eq = self.assertEquals
52
 
        eq(f.count_copied, 1)
53
 
        eq(f.last_revision, 'revision-1')
54
 
 
55
 
        rev = b2.get_revision('revision-1')
56
 
        tree = b2.revision_tree('revision-1')
57
 
        eq(tree.get_file_text('foo-id'), 'hello')
58
 
 
59
 
    def test_push_stores(self):
60
 
        """Copy the stores from one branch to another"""
61
 
        os.mkdir('a')
62
 
        br_a = Branch.initialize("a")
63
 
        file('a/b', 'wb').write('b')
64
 
        br_a.add('b')
65
 
        commit(br_a, "silly commit")
66
 
 
67
 
        os.mkdir('b')
68
 
        br_b = Branch.initialize("b")
69
 
        self.assertRaises(NoSuchRevision, br_b.get_revision, 
70
 
                          br_a.revision_history()[0])
71
 
        br_a.push_stores(br_b)
72
 
        rev = br_b.get_revision(br_a.revision_history()[0])
73
 
        tree = br_b.revision_tree(br_a.revision_history()[0])
74
 
        for file_id in tree:
75
 
            if tree.inventory[file_id].kind == "file":
76
 
                tree.get_file(file_id).read()
77
 
        return br_a, br_b
78
 
 
79
 
    def test_copy_branch(self):
80
 
        """Copy the stores from one branch to another"""
81
 
        br_a, br_b = self.test_push_stores()
82
 
        commit(br_b, "silly commit")
83
 
        os.mkdir('c')
84
 
        br_c = copy_branch(br_a, 'c', basis_branch=br_b)
85
 
        self.assertEqual(br_a.revision_history(), br_c.revision_history())
86
 
        self.assertFalse(br_b.last_revision() in br_c.revision_history())
87
 
        br_c.get_revision(br_b.last_revision())
88
 
        
89
31
# TODO: rewrite this as a regular unittest, without relying on the displayed output        
90
32
#         >>> from bzrlib.commit import commit
91
33
#         >>> bzrlib.trace.silent = True