/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 breezy/versionedfile.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-21 18:10:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6623.
  • Revision ID: jelmer@jelmer.uk-20170521181028-zn04pdfw0od9hfj3
Rename brzlib => breezy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/versionedfile.py
24
24
import struct
25
25
from zlib import adler32
26
26
 
27
 
from brzlib.lazy_import import lazy_import
 
27
from breezy.lazy_import import lazy_import
28
28
lazy_import(globals(), """
29
 
from brzlib import (
 
29
from breezy import (
30
30
    annotate,
31
31
    bencode,
32
32
    errors,
41
41
    urlutils,
42
42
    )
43
43
""")
44
 
from brzlib.registry import Registry
45
 
from brzlib.textmerge import TextMerge
 
44
from breezy.registry import Registry
 
45
from breezy.textmerge import TextMerge
46
46
 
47
47
 
48
48
adapter_registry = Registry()
49
 
adapter_registry.register_lazy(('knit-delta-gz', 'fulltext'), 'brzlib.knit',
 
49
adapter_registry.register_lazy(('knit-delta-gz', 'fulltext'), 'breezy.knit',
50
50
    'DeltaPlainToFullText')
51
 
adapter_registry.register_lazy(('knit-ft-gz', 'fulltext'), 'brzlib.knit',
 
51
adapter_registry.register_lazy(('knit-ft-gz', 'fulltext'), 'breezy.knit',
52
52
    'FTPlainToFullText')
53
53
adapter_registry.register_lazy(('knit-annotated-delta-gz', 'knit-delta-gz'),
54
 
    'brzlib.knit', 'DeltaAnnotatedToUnannotated')
 
54
    'breezy.knit', 'DeltaAnnotatedToUnannotated')
55
55
adapter_registry.register_lazy(('knit-annotated-delta-gz', 'fulltext'),
56
 
    'brzlib.knit', 'DeltaAnnotatedToFullText')
 
56
    'breezy.knit', 'DeltaAnnotatedToFullText')
57
57
adapter_registry.register_lazy(('knit-annotated-ft-gz', 'knit-ft-gz'),
58
 
    'brzlib.knit', 'FTAnnotatedToUnannotated')
 
58
    'breezy.knit', 'FTAnnotatedToUnannotated')
59
59
adapter_registry.register_lazy(('knit-annotated-ft-gz', 'fulltext'),
60
 
    'brzlib.knit', 'FTAnnotatedToFullText')
 
60
    'breezy.knit', 'FTAnnotatedToFullText')
61
61
# adapter_registry.register_lazy(('knit-annotated-ft-gz', 'chunked'),
62
 
#     'brzlib.knit', 'FTAnnotatedToChunked')
 
62
#     'breezy.knit', 'FTAnnotatedToChunked')
63
63
 
64
64
 
65
65
class ContentFactory(object):
919
919
 
920
920
    The keyspace is expressed via simple tuples. Any instance of VersionedFiles
921
921
    may have a different length key-size, but that size will be constant for
922
 
    all texts added to or retrieved from it. For instance, brzlib uses
 
922
    all texts added to or retrieved from it. For instance, breezy uses
923
923
    instances with a key-size of 2 for storing user files in a repository, with
924
924
    the first element the fileid, and the second the version of that file.
925
925
 
1480
1480
 
1481
1481
    def plan_merge(self, ver_a, ver_b, base=None):
1482
1482
        """See VersionedFile.plan_merge"""
1483
 
        from brzlib.merge import _PlanMerge
 
1483
        from breezy.merge import _PlanMerge
1484
1484
        if base is None:
1485
1485
            return _PlanMerge(ver_a, ver_b, self, (self._file_id,)).plan_merge()
1486
1486
        old_plan = list(_PlanMerge(ver_a, base, self, (self._file_id,)).plan_merge())
1488
1488
        return _PlanMerge._subtract_plans(old_plan, new_plan)
1489
1489
 
1490
1490
    def plan_lca_merge(self, ver_a, ver_b, base=None):
1491
 
        from brzlib.merge import _PlanLCAMerge
 
1491
        from breezy.merge import _PlanLCAMerge
1492
1492
        graph = _mod_graph.Graph(self)
1493
1493
        new_plan = _PlanLCAMerge(ver_a, ver_b, self, (self._file_id,), graph).plan_merge()
1494
1494
        if base is None: