/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_bundle.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bundle.py
28
28
    merge,
29
29
    osutils,
30
30
    revision as _mod_revision,
 
31
    symbol_versioning,
31
32
    tests,
32
33
    treebuilder,
33
34
    )
142
143
        result.seek(0,0)
143
144
        return result
144
145
 
 
146
    def get_file_revision(self, file_id):
 
147
        return self.inventory[file_id].revision
 
148
 
145
149
    def contents_stats(self, file_id):
146
150
        if file_id not in self.contents:
147
151
            return None, None
503
507
                old.unlock()
504
508
        if not _mod_revision.is_null(rev_id):
505
509
            rh = self.b1.revision_history()
506
 
            tree.branch.set_revision_history(rh[:rh.index(rev_id)+1])
 
510
            self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
 
511
                tree.branch.set_revision_history, rh[:rh.index(rev_id)+1])
507
512
            tree.update()
508
513
            delta = tree.changes_from(self.b1.repository.revision_tree(rev_id))
509
514
            self.assertFalse(delta.has_changed(),
1409
1414
        branch = tree_a.branch
1410
1415
        repo_a = branch.repository
1411
1416
        tree_a.commit("base", allow_pointless=True, rev_id='A')
1412
 
        self.failIf(branch.repository.has_signature_for_revision_id('A'))
 
1417
        self.assertFalse(branch.repository.has_signature_for_revision_id('A'))
1413
1418
        try:
1414
1419
            from bzrlib.testament import Testament
1415
1420
            # monkey patch gpg signing mechanism