← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testbranch.py

  • Committer: Aaron Bentley
  • Date: 2005-09-29 21:07:17 UTC
  • mfrom: (1393.1.6)
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1419.
  • Revision ID: abentley@panoramicfeedback.com-20050929210717-cd73981590f17017
Merged the weave changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testbranch.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
import os
18
 
from bzrlib.selftest import TestCaseInTempDir
19
 
from bzrlib.branch import Branch, copy_stores, copy_branch
 
18
from bzrlib.branch import Branch
 
19
from bzrlib.clone import copy_branch
20
20
from bzrlib.commit import commit
21
21
from bzrlib.errors import NoSuchRevision, UnlistableBranch
 
22
from bzrlib.selftest import TestCaseInTempDir
 
23
from bzrlib.trace import mutter
22
24
 
23
25
class TestBranch(TestCaseInTempDir):
24
26
 
30
32
        br.append_revision("rev2", "rev3")
31
33
        self.assertEquals(br.revision_history(), ["rev1", "rev2", "rev3"])
32
34
 
33
 
    def test_copy_stores(self):
 
35
 
 
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):
34
60
        """Copy the stores from one branch to another"""
35
61
        os.mkdir('a')
36
62
        br_a = Branch.initialize("a")
42
68
        br_b = Branch.initialize("b")
43
69
        self.assertRaises(NoSuchRevision, br_b.get_revision, 
44
70
                          br_a.revision_history()[0])
45
 
        copy_stores(br_a, br_b)
 
71
        br_a.push_stores(br_b)
46
72
        rev = br_b.get_revision(br_a.revision_history()[0])
47
73
        tree = br_b.revision_tree(br_a.revision_history()[0])
48
74
        for file_id in tree:
52
78
 
53
79
    def test_copy_branch(self):
54
80
        """Copy the stores from one branch to another"""
55
 
        br_a, br_b = self.test_copy_stores()
 
81
        br_a, br_b = self.test_push_stores()
56
82
        commit(br_b, "silly commit")
57
83
        os.mkdir('c')
58
84
        br_c = copy_branch(br_a, 'c', basis_branch=br_b)
59
85
        self.assertEqual(br_a.revision_history(), br_c.revision_history())
60
 
        assert br_b.last_patch() not in br_c.revision_history()
61
 
        br_c.get_revision(br_b.last_patch())
 
86
        assert br_b.last_revision() not in br_c.revision_history()
 
87
        br_c.get_revision(br_b.last_revision())
62
88
# TODO: rewrite this as a regular unittest, without relying on the displayed output        
63
89
#         >>> from bzrlib.commit import commit
64
90
#         >>> bzrlib.trace.silent = True