/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

[merge] jam-integration 1512, includes Storage changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_fetch.py
17
17
import os
18
18
import sys
19
19
 
 
20
from bzrlib.branch import Branch
 
21
from bzrlib.builtins import merge
20
22
import bzrlib.errors
 
23
from bzrlib.fetch import greedy_fetch
21
24
from bzrlib.tests.test_revision import make_branches
22
 
from bzrlib.trace import mutter
23
 
from bzrlib.branch import Branch
24
 
from bzrlib.fetch import greedy_fetch
25
 
from bzrlib.merge import merge
26
 
from bzrlib.clone import copy_branch
27
 
 
28
25
from bzrlib.tests import TestCaseInTempDir
29
26
from bzrlib.tests.HTTPTestUtil import TestCaseWithWebserver
 
27
from bzrlib.trace import mutter
30
28
 
31
29
 
32
30
def has_revision(branch, revision_id):
33
31
    try:
34
 
        branch.get_revision_xml(revision_id)
 
32
        branch.repository.get_revision_xml_file(revision_id)
35
33
        return True
36
34
    except bzrlib.errors.NoSuchRevision:
37
35
        return False
86
84
        self.assertFalse(has_revision(br_a3, br_a.revision_history()[revno]))
87
85
    self.assertEqual(greedy_fetch(br_a3, br_a2, br_a.revision_history()[2])[0], 3)
88
86
    fetched = greedy_fetch(br_a3, br_a2, br_a.revision_history()[3])[0]
89
 
    self.assertEquals(fetched, 3, "fetched %d instead of 3" % fetched)
 
87
    self.assertEquals(fetched, 6, "fetched %d instead of 6" % fetched)
90
88
    # InstallFailed should be raised if the branch is missing the revision
91
89
    # that was requested.
92
90
    self.assertRaises(bzrlib.errors.InstallFailed, greedy_fetch, br_a3,
128
126
        os.mkdir('br1')
129
127
        br1 = Branch.initialize('br1')
130
128
        br1.working_tree().commit(message='rev 1-1', rev_id='1-1')
131
 
        copy_branch(br1, 'br2')
 
129
        br1.clone('br2')
132
130
        br2 = Branch.open('br2')
133
131
        br1.working_tree().commit(message='rev 1-2', rev_id='1-2')
134
132
        br2.working_tree().commit(message='rev 2-1', rev_id='2-1')
138
136
 
139
137
    def _check_revs_present(self, br2):
140
138
        for rev_id in '1-1', '1-2', '2-1':
141
 
            self.assertTrue(br2.has_revision(rev_id))
142
 
            rev = br2.get_revision(rev_id)
 
139
            self.assertTrue(br2.repository.has_revision(rev_id))
 
140
            rev = br2.repository.get_revision(rev_id)
143
141
            self.assertEqual(rev.revision_id, rev_id)
144
 
            self.assertTrue(br2.get_inventory(rev_id))
 
142
            self.assertTrue(br2.repository.get_inventory(rev_id))
145
143
 
146
144
 
147
145
 
153
151
        self.build_tree_contents([('br1/file', 'original contents\n')])
154
152
        br1.working_tree().add(['file'], ['this-file-id'])
155
153
        br1.working_tree().commit(message='rev 1-1', rev_id='1-1')
156
 
        copy_branch(br1, 'br2')
 
154
        br1.clone('br2')
157
155
        br2 = Branch.open('br2')
158
156
        self.build_tree_contents([('br1/file', 'original from 1\n')])
159
157
        br1.working_tree().commit(message='rev 1-2', rev_id='1-2')
173
171
                             ('1-3', 'agreement\n'),
174
172
                             ('2-1', 'contents in 2\n'),
175
173
                             ('2-2', 'agreement\n')]:
176
 
            self.assertEqualDiff(br2.revision_tree(rev_id).get_file_text('this-file-id'),
177
 
                                 text)
 
174
            self.assertEqualDiff(
 
175
                br2.repository.revision_tree(
 
176
                    rev_id).get_file_text('this-file-id'), text)
178
177
 
179
178
 
180
179
 
184
183
    def test_fetch(self):
185
184
        #highest indices a: 5, b: 7
186
185
        br_a, br_b = make_branches(self)
187
 
        br_rem_a = Branch.open(self.get_remote_url(br_a._transport.base))
 
186
        br_rem_a = Branch.open(self.get_remote_url(br_a.base))
188
187
        fetch_steps(self, br_rem_a, br_b, br_a)
189
188
 
190
189
    def test_weaves_are_retrieved_once(self):