← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/interrepository_implementations/test_fetch.py

  • Committer: Matt Nordhoff
  • Date: 2009-04-04 02:50:01 UTC
  • mfrom: (4253 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4256.
  • Revision ID: mnordhoff@mattnordhoff.com-20090404025001-z1403k0tatmc8l91
Merge bzr.dev, fixing conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/interrepository_implementations/test_fetch.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
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
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
18
import sys
20
20
import bzrlib
21
21
from bzrlib import (
22
22
    errors,
 
23
    inventory,
 
24
    osutils,
23
25
    repository,
24
 
    osutils,
 
26
    versionedfile,
25
27
    )
26
28
from bzrlib.errors import (
27
29
    NoSuchRevision,
51
53
        def check_push_rev1(repo):
52
54
            # ensure the revision is missing.
53
55
            self.assertRaises(NoSuchRevision, repo.get_revision, 'rev1')
54
 
            # fetch with a limit of NULL_REVISION and an explicit progress bar.
 
56
            # fetch with a limit of NULL_REVISION
55
57
            repo.fetch(tree_a.branch.repository,
56
 
                       revision_id=NULL_REVISION,
57
 
                       pb=bzrlib.progress.DummyProgress())
 
58
                       revision_id=NULL_REVISION)
58
59
            # nothing should have been pushed
59
60
            self.assertFalse(repo.has_revision('rev1'))
60
61
            # fetch with a default limit (grab everything)
69
70
                if tree.inventory[file_id].kind == "file":
70
71
                    tree.get_file(file_id).read()
71
72
 
72
 
        # makes a target version repo 
 
73
        # makes a target version repo
73
74
        repo_b = self.make_to_repository('b')
74
75
        check_push_rev1(repo_b)
75
76
 
 
77
    def test_fetch_inconsistent_last_changed_entries(self):
 
78
        """If an inventory has odd data we should still get what it references.
 
79
 
 
80
        This test tests that we do fetch a file text created in a revision not
 
81
        being fetched, but referenced from the revision we are fetching when the
 
82
        adjacent revisions to the one being fetched do not reference that text.
 
83
        """
 
84
        tree = self.make_branch_and_tree('source')
 
85
        revid = tree.commit('old')
 
86
        to_repo = self.make_to_repository('to_repo')
 
87
        to_repo.fetch(tree.branch.repository, revid)
 
88
        # Make a broken revision and fetch it.
 
89
        source = tree.branch.repository
 
90
        source.lock_write()
 
91
        self.addCleanup(source.unlock)
 
92
        source.start_write_group()
 
93
        try:
 
94
            # We need two revisions: OLD and NEW. NEW will claim to need a file
 
95
            # 'FOO' changed in 'OLD'. OLD will not have that file at all.
 
96
            source.texts.insert_record_stream([
 
97
                versionedfile.FulltextContentFactory(('foo', revid), (), None,
 
98
                'contents')])
 
99
            basis = source.revision_tree(revid)
 
100
            parent_id = basis.path2id('')
 
101
            entry = inventory.make_entry('file', 'foo-path', parent_id, 'foo')
 
102
            entry.revision = revid
 
103
            entry.text_size = len('contents')
 
104
            entry.text_sha1 = osutils.sha_string('contents')
 
105
            inv_sha1, _ = source.add_inventory_by_delta(revid, [
 
106
                (None, 'foo-path', 'foo', entry)], 'new', [revid])
 
107
            rev = Revision(timestamp=0,
 
108
                           timezone=None,
 
109
                           committer="Foo Bar <foo@example.com>",
 
110
                           message="Message",
 
111
                           inventory_sha1=inv_sha1,
 
112
                           revision_id='new',
 
113
                           parent_ids=[revid])
 
114
            source.add_revision(rev.revision_id, rev)
 
115
        except:
 
116
            source.abort_write_group()
 
117
            raise
 
118
        else:
 
119
            source.commit_write_group()
 
120
        to_repo.fetch(source, 'new')
 
121
        to_repo.lock_read()
 
122
        self.addCleanup(to_repo.unlock)
 
123
        self.assertEqual('contents',
 
124
            to_repo.texts.get_record_stream([('foo', revid)],
 
125
            'unordered', True).next().get_bytes_as('fulltext'))
 
126
 
76
127
    def test_fetch_missing_basis_text(self):
77
128
        """If fetching a delta, we should die if a basis is not present."""
78
129
        tree = self.make_branch_and_tree('tree')
104
155
        except (errors.BzrCheckError, errors.RevisionNotPresent), e:
105
156
            # If an exception is raised, the revision should not be in the
106
157
            # target.
107
 
            # 
 
158
            #
108
159
            # Can also just raise a generic check errors; stream insertion
109
160
            # does this to include all the missing data
110
161
            self.assertRaises((errors.NoSuchRevision, errors.RevisionNotPresent),
140
191
        source_tree = self.make_branch_and_tree('source')
141
192
        source = source_tree.branch.repository
142
193
        target = self.make_to_repository('target')
143
 
    
 
194
 
144
195
        # start by adding a file so the data knit for the file exists in
145
196
        # repositories that have specific files for each fileid.
146
197
        self.build_tree(['source/id'])