← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bundle.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-04-16 01:09:56 UTC
  • mfrom: (5784.1.4 760435-less-fail)
  • Revision ID: pqm@pqm.ubuntu.com-20110416010956-5wrpm136qq2hz5f3
(mbp) rename and deprecate failUnlessExists and failIfExists (Martin Pool)

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,
32
31
    tests,
33
32
    treebuilder,
34
33
    )
143
142
        result.seek(0,0)
144
143
        return result
145
144
 
146
 
    def get_file_revision(self, file_id):
147
 
        return self.inventory[file_id].revision
148
 
 
149
145
    def contents_stats(self, file_id):
150
146
        if file_id not in self.contents:
151
147
            return None, None
507
503
                old.unlock()
508
504
        if not _mod_revision.is_null(rev_id):
509
505
            rh = self.b1.revision_history()
510
 
            self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
511
 
                tree.branch.set_revision_history, rh[:rh.index(rev_id)+1])
 
506
            tree.branch.set_revision_history(rh[:rh.index(rev_id)+1])
512
507
            tree.update()
513
508
            delta = tree.changes_from(self.b1.repository.revision_tree(rev_id))
514
509
            self.assertFalse(delta.has_changed(),