/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2052.3.2 by John Arbash Meinel
Change Copyright .. by Canonical to Copyright ... Canonical
1
# Copyright (C) 2005 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1115 by Martin Pool
- split fetch tests into a separate file
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
1115 by Martin Pool
- split fetch tests into a separate file
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
1115 by Martin Pool
- split fetch tests into a separate file
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
1238 by Martin Pool
- remove a lot of dead code from fetch
16
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
17
import os
2004.1.22 by v.ladeuil+lp at free
Implements Range header handling for GET requests. Fix a test.
18
import re
1238 by Martin Pool
- remove a lot of dead code from fetch
19
import sys
20
2323.8.2 by Aaron Bentley
Give a nicer error on fetch when repos are in incompatible formats
21
from bzrlib import (
22
    bzrdir,
23
    errors,
1551.15.70 by Aaron Bentley
Avoid using builtins.merge
24
    merge,
2323.8.2 by Aaron Bentley
Give a nicer error on fetch when repos are in incompatible formats
25
    repository,
26
    )
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
27
from bzrlib.branch import Branch
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
28
from bzrlib.bzrdir import BzrDir
1115 by Martin Pool
- split fetch tests into a separate file
29
import bzrlib.errors
2241.1.5 by Martin Pool
Move KnitFormat2 into repofmt
30
from bzrlib.repofmt import knitrepo
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
31
from bzrlib.tests import TestCaseWithTransport
1185.31.25 by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py
32
from bzrlib.tests.HTTPTestUtil import TestCaseWithWebserver
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
33
from bzrlib.tests.test_revision import make_branches
34
from bzrlib.trace import mutter
1551.8.42 by Aaron Bentley
Ensure that fetch properly updates inventory root knit
35
from bzrlib.upgrade import Convert
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
36
from bzrlib.workingtree import WorkingTree
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
37
1115 by Martin Pool
- split fetch tests into a separate file
38
1238 by Martin Pool
- remove a lot of dead code from fetch
39
def has_revision(branch, revision_id):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
40
    return branch.repository.has_revision(revision_id)
1534.4.5 by Robert Collins
Turn branch format.open into a factory.
41
1393 by Robert Collins
reenable remotebranch tests
42
def fetch_steps(self, br_a, br_b, writable_a):
43
    """A foreign test method for testing fetch locally and remotely."""
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
44
     
45
    # TODO RBC 20060201 make this a repository test.
46
    repo_b = br_b.repository
47
    self.assertFalse(repo_b.has_revision(br_a.revision_history()[3]))
48
    self.assertTrue(repo_b.has_revision(br_a.revision_history()[2]))
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
49
    self.assertEquals(len(br_b.revision_history()), 7)
1534.1.31 by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
50
    self.assertEquals(br_b.fetch(br_a, br_a.revision_history()[2])[0], 0)
51
    # branch.fetch is not supposed to alter the revision history
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
52
    self.assertEquals(len(br_b.revision_history()), 7)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
53
    self.assertFalse(repo_b.has_revision(br_a.revision_history()[3]))
1393 by Robert Collins
reenable remotebranch tests
54
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
55
    # fetching the next revision up in sample data copies one revision
1534.1.31 by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
56
    self.assertEquals(br_b.fetch(br_a, br_a.revision_history()[3])[0], 1)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
57
    self.assertTrue(repo_b.has_revision(br_a.revision_history()[3]))
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
58
    self.assertFalse(has_revision(br_a, br_b.revision_history()[6]))
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
59
    self.assertTrue(br_a.repository.has_revision(br_b.revision_history()[5]))
1393 by Robert Collins
reenable remotebranch tests
60
1092.2.28 by Robert Collins
reenable test of fetching a branch with ghosts
61
    # When a non-branch ancestor is missing, it should be unlisted...
1415 by Robert Collins
remove the ancestry weave file
62
    # as its not reference from the inventory weave.
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
63
    br_b4 = self.make_branch('br_4')
1534.1.31 by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
64
    count, failures = br_b4.fetch(br_b)
1092.2.28 by Robert Collins
reenable test of fetching a branch with ghosts
65
    self.assertEqual(count, 7)
66
    self.assertEqual(failures, [])
1393 by Robert Collins
reenable remotebranch tests
67
1534.1.31 by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
68
    self.assertEqual(writable_a.fetch(br_b)[0], 1)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
69
    self.assertTrue(has_revision(br_a, br_b.revision_history()[3]))
70
    self.assertTrue(has_revision(br_a, br_b.revision_history()[4]))
1393 by Robert Collins
reenable remotebranch tests
71
        
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
72
    br_b2 = self.make_branch('br_b2')
1534.1.31 by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
73
    self.assertEquals(br_b2.fetch(br_b)[0], 7)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
74
    self.assertTrue(has_revision(br_b2, br_b.revision_history()[4]))
75
    self.assertTrue(has_revision(br_b2, br_a.revision_history()[2]))
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
76
    self.assertFalse(has_revision(br_b2, br_a.revision_history()[3]))
1393 by Robert Collins
reenable remotebranch tests
77
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
78
    br_a2 = self.make_branch('br_a2')
1534.1.31 by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
79
    self.assertEquals(br_a2.fetch(br_a)[0], 9)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
80
    self.assertTrue(has_revision(br_a2, br_b.revision_history()[4]))
81
    self.assertTrue(has_revision(br_a2, br_a.revision_history()[3]))
82
    self.assertTrue(has_revision(br_a2, br_a.revision_history()[2]))
1393 by Robert Collins
reenable remotebranch tests
83
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
84
    br_a3 = self.make_branch('br_a3')
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
85
    # pulling a branch with no revisions grabs nothing, regardless of 
86
    # whats in the inventory.
1534.1.31 by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
87
    self.assertEquals(br_a3.fetch(br_a2)[0], 0)
1393 by Robert Collins
reenable remotebranch tests
88
    for revno in range(4):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
89
        self.assertFalse(
90
            br_a3.repository.has_revision(br_a.revision_history()[revno]))
1534.1.31 by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
91
    self.assertEqual(br_a3.fetch(br_a2, br_a.revision_history()[2])[0], 3)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
92
    # pull the 3 revisions introduced by a@u-0-3
1534.1.31 by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
93
    fetched = br_a3.fetch(br_a2, br_a.revision_history()[3])[0]
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
94
    self.assertEquals(fetched, 3, "fetched %d instead of 3" % fetched)
1393 by Robert Collins
reenable remotebranch tests
95
    # InstallFailed should be raised if the branch is missing the revision
96
    # that was requested.
1534.1.31 by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
97
    self.assertRaises(bzrlib.errors.InstallFailed, br_a3.fetch, br_a2, 'pizza')
1393 by Robert Collins
reenable remotebranch tests
98
    # InstallFailed should be raised if the branch is missing a revision
99
    # from its own revision history
2230.3.28 by Aaron Bentley
Restore default formats
100
    br_a2.append_revision('a-b-c')
1534.1.31 by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
101
    self.assertRaises(bzrlib.errors.InstallFailed, br_a3.fetch, br_a2)
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
102
2230.3.9 by Aaron Bentley
Fix most fetch tests
103
    # TODO: ADHB 20070116 Perhaps set_last_revision shouldn't accept
104
    #       revisions which are not present?  In that case, this test
105
    #       must be rewritten.
2230.3.12 by Aaron Bentley
Clean up trailing whitespace
106
    #
2230.3.9 by Aaron Bentley
Fix most fetch tests
107
    #       RBC 20060403 the way to do this is to uncommit the revision from
108
    #       the repository after the commit
1638.1.2 by Robert Collins
Change the basis-inventory file to not have the revision-id in the file name.
109
1185.13.4 by Robert Collins
make reweave visible as a weave method, and quickly integrate into fetch
110
    #TODO: test that fetch correctly does reweaving when needed. RBC 20051008
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
111
    # Note that this means - updating the weave when ghosts are filled in to 
112
    # add the right parents.
113
1185.13.4 by Robert Collins
make reweave visible as a weave method, and quickly integrate into fetch
114
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
115
class TestFetch(TestCaseWithTransport):
1392 by Robert Collins
reinstate testfetch test case
116
117
    def test_fetch(self):
1115 by Martin Pool
- split fetch tests into a separate file
118
        #highest indices a: 5, b: 7
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
119
        br_a, br_b = make_branches(self)
1393 by Robert Collins
reenable remotebranch tests
120
        fetch_steps(self, br_a, br_b, br_a)
1404 by Robert Collins
only pull remote text weaves once per fetch operation
121
1558.4.11 by Aaron Bentley
Allow merge against self, make fetching self a noop
122
    def test_fetch_self(self):
123
        wt = self.make_branch_and_tree('br')
124
        self.assertEqual(wt.branch.fetch(wt.branch), (0, []))
125
1551.8.42 by Aaron Bentley
Ensure that fetch properly updates inventory root knit
126
    def test_fetch_root_knit(self):
1551.8.43 by Aaron Bentley
Update from reviews
127
        """Ensure that knit2.fetch() updates the root knit
1551.8.42 by Aaron Bentley
Ensure that fetch properly updates inventory root knit
128
        
1551.8.43 by Aaron Bentley
Update from reviews
129
        This tests the case where the root has a new revision, but there are no
130
        corresponding filename, parent, contents or other changes.
1551.8.42 by Aaron Bentley
Ensure that fetch properly updates inventory root knit
131
        """
1551.8.43 by Aaron Bentley
Update from reviews
132
        knit1_format = bzrdir.BzrDirMetaFormat1()
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
133
        knit1_format.repository_format = knitrepo.RepositoryFormatKnit1()
1551.8.43 by Aaron Bentley
Update from reviews
134
        knit2_format = bzrdir.BzrDirMetaFormat1()
2255.2.211 by Robert Collins
Remove knit2 repository format- it has never been supported.
135
        knit2_format.repository_format = knitrepo.RepositoryFormatKnit3()
1551.8.43 by Aaron Bentley
Update from reviews
136
        # we start with a knit1 repository because that causes the
137
        # root revision to change for each commit, even though the content,
138
        # parent, name, and other attributes are unchanged.
139
        tree = self.make_branch_and_tree('tree', knit1_format)
1551.8.42 by Aaron Bentley
Ensure that fetch properly updates inventory root knit
140
        tree.set_root_id('tree-root')
141
        tree.commit('rev1', rev_id='rev1')
142
        tree.commit('rev2', rev_id='rev2')
1551.8.43 by Aaron Bentley
Update from reviews
143
144
        # Now we convert it to a knit2 repository so that it has a root knit
145
        Convert(tree.basedir, knit2_format)
1551.8.42 by Aaron Bentley
Ensure that fetch properly updates inventory root knit
146
        tree = WorkingTree.open(tree.basedir)
1551.8.43 by Aaron Bentley
Update from reviews
147
        branch = self.make_branch('branch', format=knit2_format)
1551.8.42 by Aaron Bentley
Ensure that fetch properly updates inventory root knit
148
        branch.pull(tree.branch, stop_revision='rev1')
149
        repo = branch.repository
1551.8.43 by Aaron Bentley
Update from reviews
150
        root_knit = repo.weave_store.get_weave('tree-root',
1551.8.42 by Aaron Bentley
Ensure that fetch properly updates inventory root knit
151
                                                repo.get_transaction())
1551.8.43 by Aaron Bentley
Update from reviews
152
        # Make sure fetch retrieved only what we requested
153
        self.assertTrue('rev1' in root_knit)
154
        self.assertTrue('rev2' not in root_knit)
1551.8.42 by Aaron Bentley
Ensure that fetch properly updates inventory root knit
155
        branch.pull(tree.branch)
1551.8.43 by Aaron Bentley
Update from reviews
156
        root_knit = repo.weave_store.get_weave('tree-root',
1551.8.42 by Aaron Bentley
Ensure that fetch properly updates inventory root knit
157
                                                repo.get_transaction())
1551.8.43 by Aaron Bentley
Update from reviews
158
        # Make sure that the next revision in the root knit was retrieved,
159
        # even though the text, name, parent_id, etc., were unchanged.
160
        self.assertTrue('rev2' in root_knit)
1551.8.42 by Aaron Bentley
Ensure that fetch properly updates inventory root knit
161
2323.8.2 by Aaron Bentley
Give a nicer error on fetch when repos are in incompatible formats
162
    def test_fetch_incompatible(self):
163
        knit_tree = self.make_branch_and_tree('knit', format='knit')
164
        knit3_tree = self.make_branch_and_tree('knit3',
165
            format='dirstate-with-subtree')
166
        knit3_tree.commit('blah')
167
        self.assertRaises(errors.IncompatibleRepositories,
168
                          knit_tree.branch.fetch, knit3_tree.branch)
169
1185.16.96 by mbp at sourcefrog
More merge/fetch tests
170
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
171
class TestMergeFetch(TestCaseWithTransport):
1185.16.96 by mbp at sourcefrog
More merge/fetch tests
172
173
    def test_merge_fetches_unrelated(self):
174
        """Merge brings across history from unrelated source"""
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
175
        wt1 = self.make_branch_and_tree('br1')
176
        br1 = wt1.branch
177
        wt1.commit(message='rev 1-1', rev_id='1-1')
178
        wt1.commit(message='rev 1-2', rev_id='1-2')
179
        wt2 = self.make_branch_and_tree('br2')
180
        br2 = wt2.branch
181
        wt2.commit(message='rev 2-1', rev_id='2-1')
1551.15.70 by Aaron Bentley
Avoid using builtins.merge
182
        wt2.merge_from_branch(br1, from_revision='null:')
1185.16.96 by mbp at sourcefrog
More merge/fetch tests
183
        self._check_revs_present(br2)
184
1185.16.94 by mbp at sourcefrog
New test that merge fetches revisions from source
185
    def test_merge_fetches(self):
186
        """Merge brings across history from source"""
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
187
        wt1 = self.make_branch_and_tree('br1')
188
        br1 = wt1.branch
189
        wt1.commit(message='rev 1-1', rev_id='1-1')
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
190
        dir_2 = br1.bzrdir.sprout('br2')
191
        br2 = dir_2.open_branch()
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
192
        wt1.commit(message='rev 1-2', rev_id='1-2')
1551.15.70 by Aaron Bentley
Avoid using builtins.merge
193
        wt2 = dir_2.open_workingtree()
194
        wt2.commit(message='rev 2-1', rev_id='2-1')
195
        wt2.merge_from_branch(br1)
1185.16.96 by mbp at sourcefrog
More merge/fetch tests
196
        self._check_revs_present(br2)
197
198
    def _check_revs_present(self, br2):
1185.16.94 by mbp at sourcefrog
New test that merge fetches revisions from source
199
        for rev_id in '1-1', '1-2', '2-1':
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
200
            self.assertTrue(br2.repository.has_revision(rev_id))
201
            rev = br2.repository.get_revision(rev_id)
1185.16.94 by mbp at sourcefrog
New test that merge fetches revisions from source
202
            self.assertEqual(rev.revision_id, rev_id)
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
203
            self.assertTrue(br2.repository.get_inventory(rev_id))
1185.16.94 by mbp at sourcefrog
New test that merge fetches revisions from source
204
1185.16.96 by mbp at sourcefrog
More merge/fetch tests
205
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
206
class TestMergeFileHistory(TestCaseWithTransport):
207
1185.16.96 by mbp at sourcefrog
More merge/fetch tests
208
    def setUp(self):
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
209
        super(TestMergeFileHistory, self).setUp()
210
        wt1 = self.make_branch_and_tree('br1')
211
        br1 = wt1.branch
1185.16.96 by mbp at sourcefrog
More merge/fetch tests
212
        self.build_tree_contents([('br1/file', 'original contents\n')])
1534.4.28 by Robert Collins
first cut at merge from integration.
213
        wt1.add('file', 'this-file-id')
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
214
        wt1.commit(message='rev 1-1', rev_id='1-1')
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
215
        dir_2 = br1.bzrdir.sprout('br2')
216
        br2 = dir_2.open_branch()
217
        wt2 = dir_2.open_workingtree()
1185.16.96 by mbp at sourcefrog
More merge/fetch tests
218
        self.build_tree_contents([('br1/file', 'original from 1\n')])
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
219
        wt1.commit(message='rev 1-2', rev_id='1-2')
1185.16.96 by mbp at sourcefrog
More merge/fetch tests
220
        self.build_tree_contents([('br1/file', 'agreement\n')])
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
221
        wt1.commit(message='rev 1-3', rev_id='1-3')
1185.16.96 by mbp at sourcefrog
More merge/fetch tests
222
        self.build_tree_contents([('br2/file', 'contents in 2\n')])
1534.4.28 by Robert Collins
first cut at merge from integration.
223
        wt2.commit(message='rev 2-1', rev_id='2-1')
1185.16.96 by mbp at sourcefrog
More merge/fetch tests
224
        self.build_tree_contents([('br2/file', 'agreement\n')])
1534.4.28 by Robert Collins
first cut at merge from integration.
225
        wt2.commit(message='rev 2-2', rev_id='2-2')
1185.16.96 by mbp at sourcefrog
More merge/fetch tests
226
227
    def test_merge_fetches_file_history(self):
228
        """Merge brings across file histories"""
229
        br2 = Branch.open('br2')
1551.15.70 by Aaron Bentley
Avoid using builtins.merge
230
        br1 = Branch.open('br1')
231
        wt2 = WorkingTree.open('br2').merge_from_branch(br1)
1185.16.96 by mbp at sourcefrog
More merge/fetch tests
232
        for rev_id, text in [('1-2', 'original from 1\n'),
233
                             ('1-3', 'agreement\n'),
234
                             ('2-1', 'contents in 2\n'),
235
                             ('2-2', 'agreement\n')]:
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
236
            self.assertEqualDiff(
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
237
                br2.repository.revision_tree(
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
238
                    rev_id).get_file_text('this-file-id'), text)
1185.16.96 by mbp at sourcefrog
More merge/fetch tests
239
240
1404 by Robert Collins
only pull remote text weaves once per fetch operation
241
class TestHttpFetch(TestCaseWithWebserver):
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
242
    # FIXME RBC 20060124 this really isn't web specific, perhaps an
243
    # instrumented readonly transport? Can we do an instrumented
244
    # adapter and use self.get_readonly_url ?
1404 by Robert Collins
only pull remote text weaves once per fetch operation
245
246
    def test_fetch(self):
247
        #highest indices a: 5, b: 7
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
248
        br_a, br_b = make_branches(self)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
249
        br_rem_a = Branch.open(self.get_readonly_url('branch1'))
1404 by Robert Collins
only pull remote text weaves once per fetch operation
250
        fetch_steps(self, br_rem_a, br_b, br_a)
251
1540.3.15 by Martin Pool
[merge] large merge to sync with bzr.dev
252
    def _count_log_matches(self, target, logs):
253
        """Count the number of times the target file pattern was fetched in an http log"""
2004.1.22 by v.ladeuil+lp at free
Implements Range header handling for GET requests. Fix a test.
254
        get_succeeds_re = re.compile(
255
            '.*"GET .*%s HTTP/1.1" 20[06] - "-" "bzr/%s' %
256
            (     target,                    bzrlib.__version__))
1540.3.15 by Martin Pool
[merge] large merge to sync with bzr.dev
257
        c = 0
258
        for line in logs:
2004.1.22 by v.ladeuil+lp at free
Implements Range header handling for GET requests. Fix a test.
259
            if get_succeeds_re.match(line):
1540.3.15 by Martin Pool
[merge] large merge to sync with bzr.dev
260
                c += 1
261
        return c
262
1404 by Robert Collins
only pull remote text weaves once per fetch operation
263
    def test_weaves_are_retrieved_once(self):
264
        self.build_tree(("source/", "source/file", "target/"))
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
265
        wt = self.make_branch_and_tree('source')
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
266
        branch = wt.branch
267
        wt.add(["file"], ["id"])
268
        wt.commit("added file")
1404 by Robert Collins
only pull remote text weaves once per fetch operation
269
        print >>open("source/file", 'w'), "blah"
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
270
        wt.commit("changed file")
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
271
        target = BzrDir.create_branch_and_repo("target/")
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
272
        source = Branch.open(self.get_readonly_url("source/"))
1534.1.31 by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
273
        self.assertEqual(target.fetch(source), (2, []))
1430 by Robert Collins
touchup the prefixed-store patch
274
        # this is the path to the literal file. As format changes 
275
        # occur it needs to be updated. FIXME: ask the store for the
276
        # path.
1540.3.15 by Martin Pool
[merge] large merge to sync with bzr.dev
277
        self.log("web server logs are:")
278
        http_logs = self.get_readonly_server().logs
279
        self.log('\n'.join(http_logs))
1666.1.6 by Robert Collins
Make knit the default format.
280
        # unfortunately this log entry is branch format specific. We could 
281
        # factor out the 'what files does this format use' to a method on the 
282
        # repository, which would let us to this generically. RBC 20060419
283
        self.assertEqual(1, self._count_log_matches('/ce/id.kndx', http_logs))
284
        self.assertEqual(1, self._count_log_matches('/ce/id.knit', http_logs))
285
        self.assertEqual(1, self._count_log_matches('inventory.kndx', http_logs))
1417.1.12 by Robert Collins
cache revision history during read transactions
286
        # this r-h check test will prevent regressions, but it currently already 
287
        # passes, before the patch to cache-rh is applied :[
2230.3.10 by Aaron Bentley
Genericised test_fetch to handle branch 6 retrieval patterns
288
        self.assertTrue(1 >= self._count_log_matches('revision-history',
289
                                                     http_logs))
290
        self.assertTrue(1 >= self._count_log_matches('last-revision',
291
                                                     http_logs))
1530.1.18 by Robert Collins
unbreak test_fetch
292
        # FIXME naughty poking in there.
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
293
        self.get_readonly_server().logs = []
1417.1.13 by Robert Collins
do not download remote ancestry.weave if the target revision we are stopping at is in our local store
294
        # check there is nothing more to fetch
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
295
        source = Branch.open(self.get_readonly_url("source/"))
1534.1.31 by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
296
        self.assertEqual(target.fetch(source), (0, []))
1540.3.15 by Martin Pool
[merge] large merge to sync with bzr.dev
297
        # should make just two requests
298
        http_logs = self.get_readonly_server().logs
299
        self.log("web server logs are:")
300
        self.log('\n'.join(http_logs))
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
301
        self.assertEqual(1, self._count_log_matches('branch-format', http_logs))
302
        self.assertEqual(1, self._count_log_matches('branch/format', http_logs))
303
        self.assertEqual(1, self._count_log_matches('repository/format', http_logs))
2230.3.11 by Aaron Bentley
Fix line endings
304
        self.assertTrue(1 >= self._count_log_matches('revision-history',
305
                                                     http_logs))
306
        self.assertTrue(1 >= self._count_log_matches('last-revision',
307
                                                     http_logs))
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
308
        self.assertEqual(4, len(http_logs))