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  | 
||
| 
1551.8.42
by Aaron Bentley
 Ensure that fetch properly updates inventory root knit  | 
21  | 
from bzrlib import bzrdir, repository  | 
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
22  | 
from bzrlib.branch import Branch  | 
| 
1534.4.41
by Robert Collins
 Branch now uses BzrDir reasonably sanely.  | 
23  | 
from bzrlib.bzrdir import BzrDir  | 
| 
1534.1.16
by Robert Collins
 Merge from jam-integration.  | 
24  | 
from bzrlib.builtins import merge  | 
| 
1115
by Martin Pool
 - split fetch tests into a separate file  | 
25  | 
import bzrlib.errors  | 
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
26  | 
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  | 
27  | 
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.  | 
28  | 
from bzrlib.tests.test_revision import make_branches  | 
29  | 
from bzrlib.trace import mutter  | 
|
| 
1551.8.42
by Aaron Bentley
 Ensure that fetch properly updates inventory root knit  | 
30  | 
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.  | 
31  | 
from bzrlib.workingtree import WorkingTree  | 
| 
1185.1.41
by Robert Collins
 massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid  | 
32  | 
|
| 
1115
by Martin Pool
 - split fetch tests into a separate file  | 
33  | 
|
| 
1238
by Martin Pool
 - remove a lot of dead code from fetch  | 
34  | 
def has_revision(branch, revision_id):  | 
| 
1534.4.41
by Robert Collins
 Branch now uses BzrDir reasonably sanely.  | 
35  | 
return branch.repository.has_revision(revision_id)  | 
| 
1534.4.5
by Robert Collins
 Turn branch format.open into a factory.  | 
36  | 
|
| 
1393
by Robert Collins
 reenable remotebranch tests  | 
37  | 
def fetch_steps(self, br_a, br_b, writable_a):  | 
38  | 
"""A foreign test method for testing fetch locally and remotely."""  | 
|
| 
1534.4.41
by Robert Collins
 Branch now uses BzrDir reasonably sanely.  | 
39  | 
|
40  | 
    # TODO RBC 20060201 make this a repository test.
 | 
|
41  | 
repo_b = br_b.repository  | 
|
42  | 
self.assertFalse(repo_b.has_revision(br_a.revision_history()[3]))  | 
|
43  | 
self.assertTrue(repo_b.has_revision(br_a.revision_history()[2]))  | 
|
| 
1185.16.145
by Martin Pool
 Remove all assert statements from test cases.  | 
44  | 
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.  | 
45  | 
self.assertEquals(br_b.fetch(br_a, br_a.revision_history()[2])[0], 0)  | 
46  | 
    # branch.fetch is not supposed to alter the revision history
 | 
|
| 
1185.16.145
by Martin Pool
 Remove all assert statements from test cases.  | 
47  | 
self.assertEquals(len(br_b.revision_history()), 7)  | 
| 
1534.4.41
by Robert Collins
 Branch now uses BzrDir reasonably sanely.  | 
48  | 
self.assertFalse(repo_b.has_revision(br_a.revision_history()[3]))  | 
| 
1393
by Robert Collins
 reenable remotebranch tests  | 
49  | 
|
| 
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.  | 
50  | 
    # 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.  | 
51  | 
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.  | 
52  | 
self.assertTrue(repo_b.has_revision(br_a.revision_history()[3]))  | 
| 
1185.16.145
by Martin Pool
 Remove all assert statements from test cases.  | 
53  | 
self.assertFalse(has_revision(br_a, br_b.revision_history()[6]))  | 
| 
1534.4.41
by Robert Collins
 Branch now uses BzrDir reasonably sanely.  | 
54  | 
self.assertTrue(br_a.repository.has_revision(br_b.revision_history()[5]))  | 
| 
1393
by Robert Collins
 reenable remotebranch tests  | 
55  | 
|
| 
1092.2.28
by Robert Collins
 reenable test of fetching a branch with ghosts  | 
56  | 
    # When a non-branch ancestor is missing, it should be unlisted...
 | 
| 
1415
by Robert Collins
 remove the ancestry weave file  | 
57  | 
    # 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.  | 
58  | 
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.  | 
59  | 
count, failures = br_b4.fetch(br_b)  | 
| 
1092.2.28
by Robert Collins
 reenable test of fetching a branch with ghosts  | 
60  | 
self.assertEqual(count, 7)  | 
61  | 
self.assertEqual(failures, [])  | 
|
| 
1393
by Robert Collins
 reenable remotebranch tests  | 
62  | 
|
| 
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.  | 
63  | 
self.assertEqual(writable_a.fetch(br_b)[0], 1)  | 
| 
1534.4.41
by Robert Collins
 Branch now uses BzrDir reasonably sanely.  | 
64  | 
self.assertTrue(has_revision(br_a, br_b.revision_history()[3]))  | 
65  | 
self.assertTrue(has_revision(br_a, br_b.revision_history()[4]))  | 
|
| 
1393
by Robert Collins
 reenable remotebranch tests  | 
66  | 
|
| 
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.  | 
67  | 
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.  | 
68  | 
self.assertEquals(br_b2.fetch(br_b)[0], 7)  | 
| 
1534.4.41
by Robert Collins
 Branch now uses BzrDir reasonably sanely.  | 
69  | 
self.assertTrue(has_revision(br_b2, br_b.revision_history()[4]))  | 
70  | 
self.assertTrue(has_revision(br_b2, br_a.revision_history()[2]))  | 
|
| 
1185.16.145
by Martin Pool
 Remove all assert statements from test cases.  | 
71  | 
self.assertFalse(has_revision(br_b2, br_a.revision_history()[3]))  | 
| 
1393
by Robert Collins
 reenable remotebranch tests  | 
72  | 
|
| 
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.  | 
73  | 
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.  | 
74  | 
self.assertEquals(br_a2.fetch(br_a)[0], 9)  | 
| 
1534.4.41
by Robert Collins
 Branch now uses BzrDir reasonably sanely.  | 
75  | 
self.assertTrue(has_revision(br_a2, br_b.revision_history()[4]))  | 
76  | 
self.assertTrue(has_revision(br_a2, br_a.revision_history()[3]))  | 
|
77  | 
self.assertTrue(has_revision(br_a2, br_a.revision_history()[2]))  | 
|
| 
1393
by Robert Collins
 reenable remotebranch tests  | 
78  | 
|
| 
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.  | 
79  | 
br_a3 = self.make_branch('br_a3')  | 
| 
1534.4.41
by Robert Collins
 Branch now uses BzrDir reasonably sanely.  | 
80  | 
    # pulling a branch with no revisions grabs nothing, regardless of 
 | 
81  | 
    # 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.  | 
82  | 
self.assertEquals(br_a3.fetch(br_a2)[0], 0)  | 
| 
1393
by Robert Collins
 reenable remotebranch tests  | 
83  | 
for revno in range(4):  | 
| 
1534.4.41
by Robert Collins
 Branch now uses BzrDir reasonably sanely.  | 
84  | 
self.assertFalse(  | 
85  | 
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.  | 
86  | 
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.  | 
87  | 
    # 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.  | 
88  | 
fetched = br_a3.fetch(br_a2, br_a.revision_history()[3])[0]  | 
| 
1534.4.41
by Robert Collins
 Branch now uses BzrDir reasonably sanely.  | 
89  | 
self.assertEquals(fetched, 3, "fetched %d instead of 3" % fetched)  | 
| 
1393
by Robert Collins
 reenable remotebranch tests  | 
90  | 
    # InstallFailed should be raised if the branch is missing the revision
 | 
91  | 
    # 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.  | 
92  | 
self.assertRaises(bzrlib.errors.InstallFailed, br_a3.fetch, br_a2, 'pizza')  | 
| 
1393
by Robert Collins
 reenable remotebranch tests  | 
93  | 
    # InstallFailed should be raised if the branch is missing a revision
 | 
94  | 
    # from its own revision history
 | 
|
95  | 
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.  | 
96  | 
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.  | 
97  | 
|
98  | 
    # TODO: jam 20051218 Branch should no longer allow append_revision for revisions
 | 
|
99  | 
    #       which don't exist. So this test needs to be rewritten
 | 
|
100  | 
    #       RBC 20060403 the way to do this is to uncommit the revision from the
 | 
|
101  | 
    #           repository after the commit
 | 
|
102  | 
||
| 
1185.13.4
by Robert Collins
 make reweave visible as a weave method, and quickly integrate into fetch  | 
103  | 
    #TODO: test that fetch correctly does reweaving when needed. RBC 20051008
 | 
| 
1534.4.41
by Robert Collins
 Branch now uses BzrDir reasonably sanely.  | 
104  | 
    # Note that this means - updating the weave when ghosts are filled in to 
 | 
105  | 
    # add the right parents.
 | 
|
106  | 
||
| 
1185.13.4
by Robert Collins
 make reweave visible as a weave method, and quickly integrate into fetch  | 
107  | 
|
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
108  | 
class TestFetch(TestCaseWithTransport):  | 
| 
1392
by Robert Collins
 reinstate testfetch test case  | 
109  | 
|
110  | 
def test_fetch(self):  | 
|
| 
1115
by Martin Pool
 - split fetch tests into a separate file  | 
111  | 
        #highest indices a: 5, b: 7
 | 
| 
1185.16.145
by Martin Pool
 Remove all assert statements from test cases.  | 
112  | 
br_a, br_b = make_branches(self)  | 
| 
1393
by Robert Collins
 reenable remotebranch tests  | 
113  | 
fetch_steps(self, br_a, br_b, br_a)  | 
| 
1404
by Robert Collins
 only pull remote text weaves once per fetch operation  | 
114  | 
|
| 
1558.4.11
by Aaron Bentley
 Allow merge against self, make fetching self a noop  | 
115  | 
def test_fetch_self(self):  | 
116  | 
wt = self.make_branch_and_tree('br')  | 
|
117  | 
self.assertEqual(wt.branch.fetch(wt.branch), (0, []))  | 
|
118  | 
||
| 
1551.8.42
by Aaron Bentley
 Ensure that fetch properly updates inventory root knit  | 
119  | 
def test_fetch_root_knit(self):  | 
| 
1551.8.43
by Aaron Bentley
 Update from reviews  | 
120  | 
"""Ensure that knit2.fetch() updates the root knit  | 
| 
1551.8.42
by Aaron Bentley
 Ensure that fetch properly updates inventory root knit  | 
121  | 
        
 | 
| 
1551.8.43
by Aaron Bentley
 Update from reviews  | 
122  | 
        This tests the case where the root has a new revision, but there are no
 | 
123  | 
        corresponding filename, parent, contents or other changes.
 | 
|
| 
1551.8.42
by Aaron Bentley
 Ensure that fetch properly updates inventory root knit  | 
124  | 
        """
 | 
| 
1551.8.43
by Aaron Bentley
 Update from reviews  | 
125  | 
knit1_format = bzrdir.BzrDirMetaFormat1()  | 
126  | 
knit1_format.repository_format = repository.RepositoryFormatKnit1()  | 
|
127  | 
knit2_format = bzrdir.BzrDirMetaFormat1()  | 
|
128  | 
knit2_format.repository_format = repository.RepositoryFormatKnit2()  | 
|
129  | 
        # we start with a knit1 repository because that causes the
 | 
|
130  | 
        # root revision to change for each commit, even though the content,
 | 
|
131  | 
        # parent, name, and other attributes are unchanged.
 | 
|
132  | 
tree = self.make_branch_and_tree('tree', knit1_format)  | 
|
| 
1551.8.42
by Aaron Bentley
 Ensure that fetch properly updates inventory root knit  | 
133  | 
tree.set_root_id('tree-root')  | 
134  | 
tree.commit('rev1', rev_id='rev1')  | 
|
135  | 
tree.commit('rev2', rev_id='rev2')  | 
|
| 
1551.8.43
by Aaron Bentley
 Update from reviews  | 
136  | 
|
137  | 
        # Now we convert it to a knit2 repository so that it has a root knit
 | 
|
138  | 
Convert(tree.basedir, knit2_format)  | 
|
| 
1551.8.42
by Aaron Bentley
 Ensure that fetch properly updates inventory root knit  | 
139  | 
tree = WorkingTree.open(tree.basedir)  | 
| 
1551.8.43
by Aaron Bentley
 Update from reviews  | 
140  | 
branch = self.make_branch('branch', format=knit2_format)  | 
| 
1551.8.42
by Aaron Bentley
 Ensure that fetch properly updates inventory root knit  | 
141  | 
branch.pull(tree.branch, stop_revision='rev1')  | 
142  | 
repo = branch.repository  | 
|
| 
1551.8.43
by Aaron Bentley
 Update from reviews  | 
143  | 
root_knit = repo.weave_store.get_weave('tree-root',  | 
| 
1551.8.42
by Aaron Bentley
 Ensure that fetch properly updates inventory root knit  | 
144  | 
repo.get_transaction())  | 
| 
1551.8.43
by Aaron Bentley
 Update from reviews  | 
145  | 
        # Make sure fetch retrieved only what we requested
 | 
146  | 
self.assertTrue('rev1' in root_knit)  | 
|
147  | 
self.assertTrue('rev2' not in root_knit)  | 
|
| 
1551.8.42
by Aaron Bentley
 Ensure that fetch properly updates inventory root knit  | 
148  | 
branch.pull(tree.branch)  | 
| 
1551.8.43
by Aaron Bentley
 Update from reviews  | 
149  | 
root_knit = repo.weave_store.get_weave('tree-root',  | 
| 
1551.8.42
by Aaron Bentley
 Ensure that fetch properly updates inventory root knit  | 
150  | 
repo.get_transaction())  | 
| 
1551.8.43
by Aaron Bentley
 Update from reviews  | 
151  | 
        # Make sure that the next revision in the root knit was retrieved,
 | 
152  | 
        # even though the text, name, parent_id, etc., were unchanged.
 | 
|
153  | 
self.assertTrue('rev2' in root_knit)  | 
|
| 
1551.8.42
by Aaron Bentley
 Ensure that fetch properly updates inventory root knit  | 
154  | 
|
| 
1185.16.96
by mbp at sourcefrog
 More merge/fetch tests  | 
155  | 
|
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
156  | 
class TestMergeFetch(TestCaseWithTransport):  | 
| 
1185.16.96
by mbp at sourcefrog
 More merge/fetch tests  | 
157  | 
|
158  | 
def test_merge_fetches_unrelated(self):  | 
|
159  | 
"""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.  | 
160  | 
wt1 = self.make_branch_and_tree('br1')  | 
161  | 
br1 = wt1.branch  | 
|
162  | 
wt1.commit(message='rev 1-1', rev_id='1-1')  | 
|
163  | 
wt1.commit(message='rev 1-2', rev_id='1-2')  | 
|
164  | 
wt2 = self.make_branch_and_tree('br2')  | 
|
165  | 
br2 = wt2.branch  | 
|
166  | 
wt2.commit(message='rev 2-1', rev_id='2-1')  | 
|
| 
1185.16.96
by mbp at sourcefrog
 More merge/fetch tests  | 
167  | 
merge(other_revision=['br1', -1], base_revision=['br1', 0],  | 
168  | 
this_dir='br2')  | 
|
169  | 
self._check_revs_present(br2)  | 
|
170  | 
||
| 
1185.16.94
by mbp at sourcefrog
 New test that merge fetches revisions from source  | 
171  | 
def test_merge_fetches(self):  | 
172  | 
"""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.  | 
173  | 
wt1 = self.make_branch_and_tree('br1')  | 
174  | 
br1 = wt1.branch  | 
|
175  | 
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.  | 
176  | 
dir_2 = br1.bzrdir.sprout('br2')  | 
177  | 
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.  | 
178  | 
wt1.commit(message='rev 1-2', rev_id='1-2')  | 
| 
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.  | 
179  | 
dir_2.open_workingtree().commit(message='rev 2-1', rev_id='2-1')  | 
| 
1185.16.94
by mbp at sourcefrog
 New test that merge fetches revisions from source  | 
180  | 
merge(other_revision=['br1', -1], base_revision=[None, None],  | 
181  | 
this_dir='br2')  | 
|
| 
1185.16.96
by mbp at sourcefrog
 More merge/fetch tests  | 
182  | 
self._check_revs_present(br2)  | 
183  | 
||
184  | 
def _check_revs_present(self, br2):  | 
|
| 
1185.16.94
by mbp at sourcefrog
 New test that merge fetches revisions from source  | 
185  | 
for rev_id in '1-1', '1-2', '2-1':  | 
| 
1185.67.2
by Aaron Bentley
 Renamed Branch.storage to Branch.repository  | 
186  | 
self.assertTrue(br2.repository.has_revision(rev_id))  | 
187  | 
rev = br2.repository.get_revision(rev_id)  | 
|
| 
1185.16.94
by mbp at sourcefrog
 New test that merge fetches revisions from source  | 
188  | 
self.assertEqual(rev.revision_id, rev_id)  | 
| 
1185.67.2
by Aaron Bentley
 Renamed Branch.storage to Branch.repository  | 
189  | 
self.assertTrue(br2.repository.get_inventory(rev_id))  | 
| 
1185.16.94
by mbp at sourcefrog
 New test that merge fetches revisions from source  | 
190  | 
|
| 
1185.16.96
by mbp at sourcefrog
 More merge/fetch tests  | 
191  | 
|
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
192  | 
class TestMergeFileHistory(TestCaseWithTransport):  | 
193  | 
||
| 
1185.16.96
by mbp at sourcefrog
 More merge/fetch tests  | 
194  | 
def setUp(self):  | 
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
195  | 
super(TestMergeFileHistory, self).setUp()  | 
196  | 
wt1 = self.make_branch_and_tree('br1')  | 
|
197  | 
br1 = wt1.branch  | 
|
| 
1185.16.96
by mbp at sourcefrog
 More merge/fetch tests  | 
198  | 
self.build_tree_contents([('br1/file', 'original contents\n')])  | 
| 
1534.4.28
by Robert Collins
 first cut at merge from integration.  | 
199  | 
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.  | 
200  | 
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.  | 
201  | 
dir_2 = br1.bzrdir.sprout('br2')  | 
202  | 
br2 = dir_2.open_branch()  | 
|
203  | 
wt2 = dir_2.open_workingtree()  | 
|
| 
1185.16.96
by mbp at sourcefrog
 More merge/fetch tests  | 
204  | 
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.  | 
205  | 
wt1.commit(message='rev 1-2', rev_id='1-2')  | 
| 
1185.16.96
by mbp at sourcefrog
 More merge/fetch tests  | 
206  | 
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.  | 
207  | 
wt1.commit(message='rev 1-3', rev_id='1-3')  | 
| 
1185.16.96
by mbp at sourcefrog
 More merge/fetch tests  | 
208  | 
self.build_tree_contents([('br2/file', 'contents in 2\n')])  | 
| 
1534.4.28
by Robert Collins
 first cut at merge from integration.  | 
209  | 
wt2.commit(message='rev 2-1', rev_id='2-1')  | 
| 
1185.16.96
by mbp at sourcefrog
 More merge/fetch tests  | 
210  | 
self.build_tree_contents([('br2/file', 'agreement\n')])  | 
| 
1534.4.28
by Robert Collins
 first cut at merge from integration.  | 
211  | 
wt2.commit(message='rev 2-2', rev_id='2-2')  | 
| 
1185.16.96
by mbp at sourcefrog
 More merge/fetch tests  | 
212  | 
|
213  | 
def test_merge_fetches_file_history(self):  | 
|
214  | 
"""Merge brings across file histories"""  | 
|
215  | 
br2 = Branch.open('br2')  | 
|
216  | 
merge(other_revision=['br1', -1], base_revision=[None, None],  | 
|
217  | 
this_dir='br2')  | 
|
218  | 
for rev_id, text in [('1-2', 'original from 1\n'),  | 
|
219  | 
('1-3', 'agreement\n'),  | 
|
220  | 
('2-1', 'contents in 2\n'),  | 
|
221  | 
('2-2', 'agreement\n')]:  | 
|
| 
1185.65.1
by Aaron Bentley
 Refactored out ControlFiles and RevisionStore from _Branch  | 
222  | 
self.assertEqualDiff(  | 
| 
1185.67.2
by Aaron Bentley
 Renamed Branch.storage to Branch.repository  | 
223  | 
br2.repository.revision_tree(  | 
| 
1185.65.1
by Aaron Bentley
 Refactored out ControlFiles and RevisionStore from _Branch  | 
224  | 
rev_id).get_file_text('this-file-id'), text)  | 
| 
1185.16.96
by mbp at sourcefrog
 More merge/fetch tests  | 
225  | 
|
226  | 
||
| 
1404
by Robert Collins
 only pull remote text weaves once per fetch operation  | 
227  | 
class TestHttpFetch(TestCaseWithWebserver):  | 
| 
1534.4.26
by Robert Collins
 Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.  | 
228  | 
    # FIXME RBC 20060124 this really isn't web specific, perhaps an
 | 
229  | 
    # instrumented readonly transport? Can we do an instrumented
 | 
|
230  | 
    # adapter and use self.get_readonly_url ?
 | 
|
| 
1404
by Robert Collins
 only pull remote text weaves once per fetch operation  | 
231  | 
|
232  | 
def test_fetch(self):  | 
|
233  | 
        #highest indices a: 5, b: 7
 | 
|
| 
1185.16.145
by Martin Pool
 Remove all assert statements from test cases.  | 
234  | 
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.  | 
235  | 
br_rem_a = Branch.open(self.get_readonly_url('branch1'))  | 
| 
1404
by Robert Collins
 only pull remote text weaves once per fetch operation  | 
236  | 
fetch_steps(self, br_rem_a, br_b, br_a)  | 
237  | 
||
| 
1540.3.15
by Martin Pool
 [merge] large merge to sync with bzr.dev  | 
238  | 
def _count_log_matches(self, target, logs):  | 
239  | 
"""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.  | 
240  | 
get_succeeds_re = re.compile(  | 
241  | 
'.*"GET .*%s HTTP/1.1" 20[06] - "-" "bzr/%s' %  | 
|
242  | 
( target, bzrlib.__version__))  | 
|
| 
1540.3.15
by Martin Pool
 [merge] large merge to sync with bzr.dev  | 
243  | 
c = 0  | 
244  | 
for line in logs:  | 
|
| 
2004.1.22
by v.ladeuil+lp at free
 Implements Range header handling for GET requests. Fix a test.  | 
245  | 
if get_succeeds_re.match(line):  | 
| 
1540.3.15
by Martin Pool
 [merge] large merge to sync with bzr.dev  | 
246  | 
c += 1  | 
247  | 
return c  | 
|
248  | 
||
| 
1404
by Robert Collins
 only pull remote text weaves once per fetch operation  | 
249  | 
def test_weaves_are_retrieved_once(self):  | 
250  | 
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.  | 
251  | 
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.  | 
252  | 
branch = wt.branch  | 
253  | 
wt.add(["file"], ["id"])  | 
|
254  | 
wt.commit("added file")  | 
|
| 
1404
by Robert Collins
 only pull remote text weaves once per fetch operation  | 
255  | 
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.  | 
256  | 
wt.commit("changed file")  | 
| 
1534.4.41
by Robert Collins
 Branch now uses BzrDir reasonably sanely.  | 
257  | 
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.  | 
258  | 
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.  | 
259  | 
self.assertEqual(target.fetch(source), (2, []))  | 
| 
1430
by Robert Collins
 touchup the prefixed-store patch  | 
260  | 
        # this is the path to the literal file. As format changes 
 | 
261  | 
        # occur it needs to be updated. FIXME: ask the store for the
 | 
|
262  | 
        # path.
 | 
|
| 
1540.3.15
by Martin Pool
 [merge] large merge to sync with bzr.dev  | 
263  | 
self.log("web server logs are:")  | 
264  | 
http_logs = self.get_readonly_server().logs  | 
|
265  | 
self.log('\n'.join(http_logs))  | 
|
| 
1666.1.6
by Robert Collins
 Make knit the default format.  | 
266  | 
        # unfortunately this log entry is branch format specific. We could 
 | 
267  | 
        # factor out the 'what files does this format use' to a method on the 
 | 
|
268  | 
        # repository, which would let us to this generically. RBC 20060419
 | 
|
269  | 
self.assertEqual(1, self._count_log_matches('/ce/id.kndx', http_logs))  | 
|
270  | 
self.assertEqual(1, self._count_log_matches('/ce/id.knit', http_logs))  | 
|
271  | 
self.assertEqual(1, self._count_log_matches('inventory.kndx', http_logs))  | 
|
| 
1417.1.12
by Robert Collins
 cache revision history during read transactions  | 
272  | 
        # this r-h check test will prevent regressions, but it currently already 
 | 
273  | 
        # passes, before the patch to cache-rh is applied :[
 | 
|
| 
1540.3.15
by Martin Pool
 [merge] large merge to sync with bzr.dev  | 
274  | 
self.assertEqual(1, self._count_log_matches('revision-history', http_logs))  | 
| 
1530.1.18
by Robert Collins
 unbreak test_fetch  | 
275  | 
        # 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.  | 
276  | 
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  | 
277  | 
        # 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.  | 
278  | 
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.  | 
279  | 
self.assertEqual(target.fetch(source), (0, []))  | 
| 
1540.3.15
by Martin Pool
 [merge] large merge to sync with bzr.dev  | 
280  | 
        # should make just two requests
 | 
281  | 
http_logs = self.get_readonly_server().logs  | 
|
282  | 
self.log("web server logs are:")  | 
|
283  | 
self.log('\n'.join(http_logs))  | 
|
| 
1666.1.4
by Robert Collins
 * 'Metadir' is now the default disk format. This improves behaviour in  | 
284  | 
self.assertEqual(1, self._count_log_matches('branch-format', http_logs))  | 
285  | 
self.assertEqual(1, self._count_log_matches('branch/format', http_logs))  | 
|
286  | 
self.assertEqual(1, self._count_log_matches('repository/format', http_logs))  | 
|
287  | 
self.assertEqual(1, self._count_log_matches('revision-history', http_logs))  | 
|
288  | 
self.assertEqual(4, len(http_logs))  |