← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_versionedfile.py

  • Committer: Jelmer Vernooij
  • Date: 2011-01-13 01:32:26 UTC
  • mfrom: (5606 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5607.
  • Revision ID: jelmer@samba.org-20110113013226-1d41bwtmps9y68wm
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_versionedfile.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2011 Canonical Ltd
2
2
#
3
3
# Authors:
4
4
#   Johan Rydberg <jrydberg@gnu.org>
21
21
# TODO: might be nice to create a versionedfile with some type of corruption
22
22
# considered typical and check that it can be detected/corrected.
23
23
 
 
24
from gzip import GzipFile
24
25
from itertools import chain, izip
25
26
from StringIO import StringIO
26
27
 
37
38
from bzrlib.errors import (
38
39
                           RevisionNotPresent,
39
40
                           RevisionAlreadyPresent,
40
 
                           WeaveParentMismatch
41
41
                           )
42
42
from bzrlib.knit import (
43
43
    cleanup_pack_knit,
44
44
    make_file_factory,
45
45
    make_pack_factory,
46
 
    KnitAnnotateFactory,
47
 
    KnitPlainFactory,
48
46
    )
49
47
from bzrlib.tests import (
50
48
    TestCase,
53
51
    TestSkipped,
54
52
    )
55
53
from bzrlib.tests.http_utils import TestCaseWithWebserver
56
 
from bzrlib.trace import mutter
57
54
from bzrlib.transport.memory import MemoryTransport
58
 
from bzrlib.tsort import topo_sort
59
 
from bzrlib.tuned_gzip import GzipFile
60
55
import bzrlib.versionedfile as versionedfile
61
56
from bzrlib.versionedfile import (
62
57
    ConstantMapper,
66
61
    make_versioned_files_factory,
67
62
    )
68
63
from bzrlib.weave import WeaveFile
69
 
from bzrlib.weavefile import read_weave, write_weave
 
64
from bzrlib.weavefile import write_weave
70
65
from bzrlib.tests.scenarios import load_tests_apply_scenarios
71
66
 
72
67