~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bundle.py

  • Committer: John Arbash Meinel
  • Date: 2011-01-11 18:10:55 UTC
  • mto: This revision was merged to the branch mainline in revision 5596.
  • Revision ID: john@arbash-meinel.com-20110111181055-d79p02kioxcg4f7l
Change tuned_gzip.GzipFile to be deprecated

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2005-2011 Canonical Ltd
 
1
# Copyright (C) 2005-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
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(),
1414
1409
        branch = tree_a.branch
1415
1410
        repo_a = branch.repository
1416
1411
        tree_a.commit("base", allow_pointless=True, rev_id='A')
1417
 
        self.assertFalse(branch.repository.has_signature_for_revision_id('A'))
 
1412
        self.failIf(branch.repository.has_signature_for_revision_id('A'))
1418
1413
        try:
1419
1414
            from bzrlib.testament import Testament
1420
1415
            # monkey patch gpg signing mechanism
1444
1439
        install_bundle(repo_b, serializer.read(s))
1445
1440
 
1446
1441
 
 
1442
class V4WeaveBundleTester(V4BundleTester):
 
1443
 
 
1444
    def bzrdir_format(self):
 
1445
        return 'metaweave'
 
1446
 
 
1447
 
1447
1448
class V4_2aBundleTester(V4BundleTester):
1448
1449
 
1449
1450
    def bzrdir_format(self):