← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/knit.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/knit.py
54
54
 
55
55
from cStringIO import StringIO
56
56
from itertools import izip
57
 
import gzip
58
57
import operator
59
58
import os
60
59
import sys
61
60
 
62
61
from bzrlib.lazy_import import lazy_import
63
62
lazy_import(globals(), """
 
63
import gzip
 
64
 
64
65
from bzrlib import (
65
66
    annotate,
66
67
    debug,
83
84
    osutils,
84
85
    )
85
86
from bzrlib.errors import (
86
 
    FileExists,
87
87
    NoSuchFile,
88
 
    KnitError,
89
88
    InvalidRevisionId,
90
89
    KnitCorrupt,
91
90
    KnitHeaderError,
92
91
    RevisionNotPresent,
93
 
    RevisionAlreadyPresent,
94
92
    SHA1KnitCorrupt,
95
93
    )
96
94
from bzrlib.osutils import (
97
95
    contains_whitespace,
98
 
    contains_linebreaks,
99
96
    sha_string,
100
97
    sha_strings,
101
98
    split_lines,
105
102
    adapter_registry,
106
103
    ConstantMapper,
107
104
    ContentFactory,
108
 
    ChunkedContentFactory,
109
105
    sort_groupcompress,
110
 
    VersionedFile,
111
106
    VersionedFiles,
112
107
    )
113
108