~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bundle.py

  • Committer: INADA Naoki
  • Date: 2011-05-14 14:59:06 UTC
  • mto: This revision was merged to the branch mainline in revision 5874.
  • Revision ID: songofacandy@gmail.com-20110514145906-xj3xa06jihd4wapq
Notify when test_textwrap is skipped.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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(),