← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/knit.py

  • Committer: Martin Pool
  • Date: 2008-07-21 07:48:30 UTC
  • mfrom: (3564 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3566.
  • Revision ID: mbp@sourcefrog.net-20080721074830-i1pgj2hswpfo6pav
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/knit.py
64
64
from itertools import izip, chain
65
65
import operator
66
66
import os
67
 
import urllib
68
 
import sys
69
 
import warnings
70
 
from zlib import Z_DEFAULT_COMPRESSION
71
67
 
72
 
import bzrlib
73
68
from bzrlib.lazy_import import lazy_import
74
69
lazy_import(globals(), """
75
70
from bzrlib import (
76
71
    annotate,
 
72
    debug,
 
73
    diff,
77
74
    graph as _mod_graph,
78
75
    index as _mod_index,
79
76
    lru_cache,
80
77
    pack,
 
78
    progress,
81
79
    trace,
 
80
    tsort,
 
81
    tuned_gzip,
82
82
    )
83
83
""")
84
84
from bzrlib import (
85
 
    cache_utf8,
86
 
    debug,
87
 
    diff,
88
85
    errors,
89
86
    osutils,
90
87
    patiencediff,
91
 
    progress,
92
 
    merge,
93
 
    ui,
94
88
    )
95
89
from bzrlib.errors import (
96
90
    FileExists,
102
96
    RevisionNotPresent,
103
97
    RevisionAlreadyPresent,
104
98
    )
105
 
from bzrlib.graph import Graph
106
99
from bzrlib.osutils import (
107
100
    contains_whitespace,
108
101
    contains_linebreaks,
110
103
    sha_strings,
111
104
    split_lines,
112
105
    )
113
 
from bzrlib.tsort import topo_sort
114
 
from bzrlib.tuned_gzip import GzipFile, bytes_to_gzip
115
 
import bzrlib.ui
116
106
from bzrlib.versionedfile import (
117
107
    AbsentContentFactory,
118
108
    adapter_registry,
122
112
    VersionedFile,
123
113
    VersionedFiles,
124
114
    )
125
 
import bzrlib.weave
126
115
 
127
116
 
128
117
# TODO: Split out code specific to this format into an associated object.
1183
1172
        global_map, parent_maps = self._get_parent_map_with_sources(keys)
1184
1173
        if ordering == 'topological':
1185
1174
            # Global topological sort
1186
 
            present_keys = topo_sort(global_map)
 
1175
            present_keys = tsort.topo_sort(global_map)
1187
1176
            # Now group by source:
1188
1177
            source_keys = []
1189
1178
            current_source = None
1497
1486
        :return: the header and the decompressor stream.
1498
1487
                 as (stream, header_record)
1499
1488
        """
1500
 
        df = GzipFile(mode='rb', fileobj=StringIO(raw_data))
 
1489
        df = tuned_gzip.GzipFile(mode='rb', fileobj=StringIO(raw_data))
1501
1490
        try:
1502
1491
            # Current serialise
1503
1492
            rec = self._check_header(key, df.readline())
1512
1501
        # 4168 calls in 2880 217 internal
1513
1502
        # 4168 calls to _parse_record_header in 2121
1514
1503
        # 4168 calls to readlines in 330
1515
 
        df = GzipFile(mode='rb', fileobj=StringIO(data))
 
1504
        df = tuned_gzip.GzipFile(mode='rb', fileobj=StringIO(data))
1516
1505
        try:
1517
1506
            record_contents = df.readlines()
1518
1507
        except Exception, e:
1613
1602
                'data must be plain bytes was %s' % type(bytes))
1614
1603
        if lines and lines[-1][-1] != '\n':
1615
1604
            raise ValueError('corrupt lines value %r' % lines)
1616
 
        compressed_bytes = bytes_to_gzip(bytes)
 
1605
        compressed_bytes = tuned_gzip.bytes_to_gzip(bytes)
1617
1606
        return len(compressed_bytes), compressed_bytes
1618
1607
 
1619
1608
    def _split_header(self, line):
2703
2692
        # TODO: this code generates a parent maps of present ancestors; it
2704
2693
        # could be split out into a separate method, and probably should use
2705
2694
        # iter_ancestry instead. -- mbp and robertc 20080704
2706
 
        graph = Graph(self._knit)
 
2695
        graph = _mod_graph.Graph(self._knit)
2707
2696
        head_cache = _mod_graph.FrozenHeadsCache(graph)
2708
2697
        search = graph._make_breadth_first_searcher([key])
2709
2698
        keys = set()