← 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-10-03 19:50:36 UTC
  • mfrom: (1399)
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1419.
  • Revision ID: abentley@panoramicfeedback.com-20051003195036-28dbd56f0e852b08
Merged latest from Robert Collins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testbranch.py
22
22
from bzrlib.selftest import TestCaseInTempDir
23
23
from bzrlib.trace import mutter
24
24
 
 
25
 
25
26
class TestBranch(TestCaseInTempDir):
26
27
 
27
28
    def test_append_revisions(self):
32
33
        br.append_revision("rev2", "rev3")
33
34
        self.assertEquals(br.revision_history(), ["rev1", "rev2", "rev3"])
34
35
 
35
 
 
36
 
class TestFetch(TestCaseInTempDir):
37
 
 
38
36
    def test_fetch_revisions(self):
39
37
        """Test fetch-revision operation."""
40
38
        from bzrlib.fetch import Fetcher
83
81
        os.mkdir('c')
84
82
        br_c = copy_branch(br_a, 'c', basis_branch=br_b)
85
83
        self.assertEqual(br_a.revision_history(), br_c.revision_history())
86
 
        assert br_b.last_revision() not in br_c.revision_history()
87
 
        br_c.get_revision(br_b.last_revision())
 
84
        ## # basis branches currently disabled for weave format
 
85
        ## self.assertFalse(br_b.last_revision() in br_c.revision_history())
 
86
        ## br_c.get_revision(br_b.last_revision())
 
87
 
 
88
    def test_copy_partial(self):
 
89
        """Copy only part of the history of a branch."""
 
90
        self.build_tree(['a/', 'a/one'])
 
91
        br_a = Branch.initialize('a')
 
92
        br_a.add(['one'])
 
93
        br_a.commit('commit one', rev_id='u@d-1')
 
94
        self.build_tree(['a/two'])
 
95
        br_a.add(['two'])
 
96
        br_a.commit('commit two', rev_id='u@d-2')
 
97
        br_b = copy_branch(br_a, 'b', revision='u@d-1')
 
98
        self.assertEqual(br_b.last_revision(), 'u@d-1')
 
99
        self.assertTrue(os.path.exists('b/one'))
 
100
        self.assertFalse(os.path.exists('b/two'))
 
101
        
 
102
 
 
103
    def test_record_initial_ghost_merge(self):
 
104
        """A pending merge with no revision present is still a merge."""
 
105
        branch = Branch.initialize('.')
 
106
        branch.add_pending_merge('non:existent@rev--ision--0--2')
 
107
        branch.commit('pretend to merge nonexistent-revision', rev_id='first')
 
108
        rev = branch.get_revision(branch.last_revision())
 
109
        self.assertEqual(len(rev.parent_ids), 1)
 
110
        # parent_sha1s is not populated now, WTF. rbc 20051003
 
111
        self.assertEqual(len(rev.parent_sha1s), 0)
 
112
        self.assertEqual(rev.parent_ids[0], 'non:existent@rev--ision--0--2')
 
113
 
 
114
# TODO 20051003 RBC:
 
115
# compare the gpg-to-sign info for a commit with a ghost and 
 
116
#     an identical tree without a ghost
 
117
# fetch missing should rewrite the TOC of weaves to list newly available parents.
 
118
        
 
119
    def test_pending_merges(self):
 
120
        """Tracking pending-merged revisions."""
 
121
        b = Branch.initialize('.')
 
122
 
 
123
        self.assertEquals(b.pending_merges(), [])
 
124
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
 
125
        self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
 
126
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
 
127
        self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
 
128
        b.add_pending_merge('wibble@fofof--20050401--1928390812')
 
129
        self.assertEquals(b.pending_merges(),
 
130
                          ['foo@azkhazan-123123-abcabc',
 
131
                           'wibble@fofof--20050401--1928390812'])
 
132
        b.commit("commit from base with two merges")
 
133
        rev = b.get_revision(b.revision_history()[0])
 
134
        self.assertEquals(len(rev.parent_ids), 2)
 
135
        self.assertEquals(rev.parent_ids[0],
 
136
                          'foo@azkhazan-123123-abcabc')
 
137
        self.assertEquals(rev.parent_ids[1],
 
138
                           'wibble@fofof--20050401--1928390812')
 
139
        # list should be cleared when we do a commit
 
140
        self.assertEquals(b.pending_merges(), [])
 
141
 
 
142
 
88
143
# TODO: rewrite this as a regular unittest, without relying on the displayed output        
89
144
#         >>> from bzrlib.commit import commit
90
145
#         >>> bzrlib.trace.silent = True