/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/tests/test_knit.py

  • Committer: Jelmer Vernooij
  • Date: 2020-06-08 23:03:56 UTC
  • mto: (7490.40.2 work)
  • mto: This revision was merged to the branch mainline in revision 7511.
  • Revision ID: jelmer@jelmer.uk-20200608230356-a4clct7auuvhbfep
https://launchpad.net/bugs/1882589
Fix handling of a particular kind of broken committer id.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_knit.py
21
21
from patiencediff import PatienceSequenceMatcher
22
22
import sys
23
23
 
24
 
from ... import (
 
24
from .. import (
25
25
    errors,
26
26
    multiparent,
27
27
    osutils,
28
28
    tests,
29
29
    transport,
30
30
    )
31
 
from .. import (
 
31
from ..bzr import (
32
32
    knit,
33
33
    pack,
34
34
    )
35
 
from ..index import *
36
 
from ..knit import (
 
35
from ..bzr.index import *
 
36
from ..bzr.knit import (
37
37
    AnnotatedKnitContent,
38
38
    KnitContent,
39
39
    KnitCorrupt,
49
49
    _KnitKeyAccess,
50
50
    make_file_factory,
51
51
    )
52
 
from .. import (
 
52
from ..bzr import (
53
53
    knitpack_repo,
54
54
    pack_repo,
55
55
    )
56
 
from ...tests import (
 
56
from . import (
57
57
    TestCase,
58
58
    TestCaseWithMemoryTransport,
59
59
    TestCaseWithTransport,
60
60
    TestNotApplicable,
61
61
    )
62
 
from ..versionedfile import (
 
62
from ..bzr.versionedfile import (
63
63
    AbsentContentFactory,
64
64
    ConstantMapper,
65
65
    network_bytes_to_kind_and_offset,
66
66
    RecordingVersionedFilesDecorator,
67
67
    )
68
 
from ...tests import (
 
68
from . import (
69
69
    features,
70
70
    )
71
71
 
938
938
 
939
939
    @property
940
940
    def _load_data(self):
941
 
        from .._knit_load_data_py import _load_data_py
 
941
        from ..bzr._knit_load_data_py import _load_data_py
942
942
        return _load_data_py
943
943
 
944
944
    def get_knit_index(self, transport, name, mode):
1331
1331
 
1332
1332
    @property
1333
1333
    def _load_data(self):
1334
 
        from .._knit_load_data_pyx import _load_data_c
 
1334
        from ..bzr._knit_load_data_pyx import _load_data_c
1335
1335
        return _load_data_c
1336
1336
 
1337
1337