/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« 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
56
56
from itertools import izip
57
57
import operator
58
58
import os
59
 
import sys
60
59
 
61
60
from bzrlib.lazy_import import lazy_import
62
61
lazy_import(globals(), """
63
62
import gzip
64
63
 
65
64
from bzrlib import (
66
 
    annotate,
67
65
    debug,
68
66
    diff,
69
67
    graph as _mod_graph,
70
68
    index as _mod_index,
71
 
    lru_cache,
72
69
    pack,
73
70
    patiencediff,
74
 
    progress,
75
71
    static_tuple,
76
72
    trace,
77
73
    tsort,
78
74
    tuned_gzip,
79
75
    ui,
80
76
    )
 
77
 
 
78
from bzrlib.repofmt import pack_repo
81
79
""")
82
80
from bzrlib import (
 
81
    annotate,
83
82
    errors,
84
83
    osutils,
85
84
    )
98
97
    split_lines,
99
98
    )
100
99
from bzrlib.versionedfile import (
 
100
    _KeyRefs,
101
101
    AbsentContentFactory,
102
102
    adapter_registry,
103
103
    ConstantMapper,
801
801
        writer.begin()
802
802
        index = _KnitGraphIndex(graph_index, lambda:True, parents=parents,
803
803
            deltas=delta, add_callback=graph_index.add_nodes)
804
 
        access = _DirectPackAccess({})
 
804
        access = pack_repo._DirectPackAccess({})
805
805
        access.set_writer(writer, graph_index, (transport, 'newpack'))
806
806
        result = KnitVersionedFiles(index, access,
807
807
            max_delta_chain=max_delta_chain)
2782
2782
        return key[:-1], key[-1]
2783
2783
 
2784
2784
 
2785
 
class _KeyRefs(object):
2786
 
 
2787
 
    def __init__(self, track_new_keys=False):
2788
 
        # dict mapping 'key' to 'set of keys referring to that key'
2789
 
        self.refs = {}
2790
 
        if track_new_keys:
2791
 
            # set remembering all new keys
2792
 
            self.new_keys = set()
2793
 
        else:
2794
 
            self.new_keys = None
2795
 
 
2796
 
    def clear(self):
2797
 
        if self.refs:
2798
 
            self.refs.clear()
2799
 
        if self.new_keys:
2800
 
            self.new_keys.clear()
2801
 
 
2802
 
    def add_references(self, key, refs):
2803
 
        # Record the new references
2804
 
        for referenced in refs:
2805
 
            try:
2806
 
                needed_by = self.refs[referenced]
2807
 
            except KeyError:
2808
 
                needed_by = self.refs[referenced] = set()
2809
 
            needed_by.add(key)
2810
 
        # Discard references satisfied by the new key
2811
 
        self.add_key(key)
2812
 
 
2813
 
    def get_new_keys(self):
2814
 
        return self.new_keys
2815
 
    
2816
 
    def get_unsatisfied_refs(self):
2817
 
        return self.refs.iterkeys()
2818
 
 
2819
 
    def _satisfy_refs_for_key(self, key):
2820
 
        try:
2821
 
            del self.refs[key]
2822
 
        except KeyError:
2823
 
            # No keys depended on this key.  That's ok.
2824
 
            pass
2825
 
 
2826
 
    def add_key(self, key):
2827
 
        # satisfy refs for key, and remember that we've seen this key.
2828
 
        self._satisfy_refs_for_key(key)
2829
 
        if self.new_keys is not None:
2830
 
            self.new_keys.add(key)
2831
 
 
2832
 
    def satisfy_refs_for_keys(self, keys):
2833
 
        for key in keys:
2834
 
            self._satisfy_refs_for_key(key)
2835
 
 
2836
 
    def get_referrers(self):
2837
 
        result = set()
2838
 
        for referrers in self.refs.itervalues():
2839
 
            result.update(referrers)
2840
 
        return result
2841
 
 
2842
 
 
2843
2785
class _KnitGraphIndex(object):
2844
2786
    """A KnitVersionedFiles index layered on GraphIndex."""
2845
2787