/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_fetch.py

first cut at merge from integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_fetch.py
18
18
import sys
19
19
 
20
20
from bzrlib.branch import Branch
21
 
from bzrlib.clone import copy_branch
 
21
from bzrlib.builtins import merge
22
22
import bzrlib.errors
23
23
from bzrlib.fetch import greedy_fetch
24
 
from bzrlib.merge import merge
25
24
from bzrlib.tests import TestCaseWithTransport
26
25
from bzrlib.tests.HTTPTestUtil import TestCaseWithWebserver
27
26
from bzrlib.tests.test_revision import make_branches
31
30
 
32
31
def has_revision(branch, revision_id):
33
32
    try:
34
 
        branch.get_revision_xml(revision_id)
 
33
        branch.repository.get_revision_xml_file(revision_id)
35
34
        return True
36
35
    except bzrlib.errors.NoSuchRevision:
37
36
        return False
129
128
        wt1 = self.make_branch_and_tree('br1')
130
129
        br1 = wt1.branch
131
130
        wt1.commit(message='rev 1-1', rev_id='1-1')
132
 
        copy_branch(br1, 'br2')
133
 
        br2 = Branch.open('br2')
 
131
        br2 = br1.clone('br2')
134
132
        wt1.commit(message='rev 1-2', rev_id='1-2')
135
133
        WorkingTree('br2', br2).commit(message='rev 2-1', rev_id='2-1')
136
134
        merge(other_revision=['br1', -1], base_revision=[None, None], 
139
137
 
140
138
    def _check_revs_present(self, br2):
141
139
        for rev_id in '1-1', '1-2', '2-1':
142
 
            self.assertTrue(br2.has_revision(rev_id))
143
 
            rev = br2.get_revision(rev_id)
 
140
            self.assertTrue(br2.repository.has_revision(rev_id))
 
141
            rev = br2.repository.get_revision(rev_id)
144
142
            self.assertEqual(rev.revision_id, rev_id)
145
 
            self.assertTrue(br2.get_inventory(rev_id))
146
 
 
 
143
            self.assertTrue(br2.repository.get_inventory(rev_id))
147
144
 
148
145
 
149
146
class TestMergeFileHistory(TestCaseWithTransport):
153
150
        wt1 = self.make_branch_and_tree('br1')
154
151
        br1 = wt1.branch
155
152
        self.build_tree_contents([('br1/file', 'original contents\n')])
156
 
        wt1.add(['file'], ['this-file-id'])
 
153
        wt1.add('file', 'this-file-id')
157
154
        wt1.commit(message='rev 1-1', rev_id='1-1')
158
 
        copy_branch(br1, 'br2')
159
 
        br2 = Branch.open('br2')
 
155
        br2 = br1.clone('br2')
 
156
        wt2 = WorkingTree('br2', br2)
160
157
        self.build_tree_contents([('br1/file', 'original from 1\n')])
161
158
        wt1.commit(message='rev 1-2', rev_id='1-2')
162
159
        self.build_tree_contents([('br1/file', 'agreement\n')])
163
160
        wt1.commit(message='rev 1-3', rev_id='1-3')
164
161
        self.build_tree_contents([('br2/file', 'contents in 2\n')])
165
 
        br2.working_tree().commit(message='rev 2-1', rev_id='2-1')
 
162
        wt2.commit(message='rev 2-1', rev_id='2-1')
166
163
        self.build_tree_contents([('br2/file', 'agreement\n')])
167
 
        br2.working_tree().commit(message='rev 2-2', rev_id='2-2')
 
164
        wt2.commit(message='rev 2-2', rev_id='2-2')
168
165
 
169
166
    def test_merge_fetches_file_history(self):
170
167
        """Merge brings across file histories"""
175
172
                             ('1-3', 'agreement\n'),
176
173
                             ('2-1', 'contents in 2\n'),
177
174
                             ('2-2', 'agreement\n')]:
178
 
            self.assertEqualDiff(br2.revision_tree(rev_id).get_file_text('this-file-id'),
179
 
                                 text)
 
175
            self.assertEqualDiff(
 
176
                br2.repository.revision_tree(
 
177
                    rev_id).get_file_text('this-file-id'), text)
180
178
 
181
179
 
182
180
class TestHttpFetch(TestCaseWithWebserver):
189
187
        print "TestHttpFetch.test_fetch disabled during transition."
190
188
        return
191
189
        br_a, br_b = make_branches(self)
192
 
        br_rem_a = Branch.open(self.get_remote_url(br_a._transport.base))
 
190
        br_rem_a = Branch.open(self.get_remote_url(br_a.base))
193
191
        fetch_steps(self, br_rem_a, br_b, br_a)
194
192
 
195
193
    def test_weaves_are_retrieved_once(self):