/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 breezy/tests/per_interrepository/test_fetch.py

  • Committer: Jelmer Vernooij
  • Date: 2017-11-19 18:35:20 UTC
  • mfrom: (6809.4.27 swap-arguments)
  • Revision ID: jelmer@jelmer.uk-20171119183520-fmw89uw30e0tbhwz
Merge lp:~jelmer/brz/swap-arguments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_interrepository/test_fetch.py
77
77
            tree = repo.revision_tree('rev1')
78
78
            tree.lock_read()
79
79
            self.addCleanup(tree.unlock)
80
 
            tree.get_file_text('file1')
 
80
            tree.get_file_text('foo')
81
81
            for file_id in tree.all_file_ids():
82
 
                if tree.kind(file_id) == "file":
83
 
                    tree.get_file(file_id).read()
 
82
                if tree.kind(tree.id2path(file_id)) == "file":
 
83
                    tree.get_file(tree.id2path(file_id)).read()
84
84
 
85
85
        # makes a target version repo
86
86
        repo_b = self.make_to_repository('b')
421
421
        """If fetching a delta, we should die if a basis is not present."""
422
422
        tree = self.make_branch_and_tree('tree')
423
423
        self.build_tree(['tree/a'])
424
 
        tree.add(['a'], ['a-id'])
 
424
        tree.add(['a'])
425
425
        tree.commit('one', rev_id='rev-one')
426
426
        self.build_tree_contents([('tree/a', 'new contents\n')])
427
427
        tree.commit('two', rev_id='rev-two')
465
465
            try:
466
466
                rt = to_repo.revision_tree('rev-two')
467
467
                self.assertEqual('new contents\n',
468
 
                                 rt.get_file_text('a-id'))
 
468
                                 rt.get_file_text('a'))
469
469
            finally:
470
470
                to_repo.unlock()
471
471