/breezy/unstable

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/unstable

« back to all changes in this revision

Viewing changes to breezy/repofmt/knitrepo.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-24 01:39:33 UTC
  • mfrom: (3815.3776.6)
  • Revision ID: jelmer@jelmer.uk-20170524013933-ir4y4tqtrsiz2ka2
New upstream snapshot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
16
16
 
17
17
from __future__ import absolute_import
18
18
 
19
 
from bzrlib.lazy_import import lazy_import
 
19
from ..lazy_import import lazy_import
20
20
lazy_import(globals(), """
21
21
import itertools
22
22
 
23
 
from bzrlib import (
 
23
from breezy import (
24
24
    controldir,
25
25
    errors,
26
26
    knit as _mod_knit,
36
36
    xml7,
37
37
    )
38
38
""")
39
 
from bzrlib.decorators import needs_read_lock, needs_write_lock
40
 
from bzrlib.repository import (
 
39
from ..decorators import needs_read_lock, needs_write_lock
 
40
from ..repository import (
41
41
    InterRepository,
42
42
    IsInWriteGroupError,
43
43
    RepositoryFormatMetaDir,
44
44
    )
45
 
from bzrlib.vf_repository import (
 
45
from ..vf_repository import (
46
46
    InterSameDataRepository,
47
47
    MetaDirVersionedFileRepository,
48
48
    MetaDirVersionedFileRepositoryFormat,
49
49
    VersionedFileCommitBuilder,
50
50
    VersionedFileRootCommitBuilder,
51
51
    )
52
 
from bzrlib import symbol_versioning
 
52
from .. import symbol_versioning
53
53
 
54
54
 
55
55
class _KnitParentsProvider(object):
205
205
    @needs_write_lock
206
206
    def reconcile(self, other=None, thorough=False):
207
207
        """Reconcile this repository."""
208
 
        from bzrlib.reconcile import KnitReconciler
 
208
        from breezy.reconcile import KnitReconciler
209
209
        reconciler = KnitReconciler(self, thorough=thorough)
210
210
        reconciler.reconcile()
211
211
        return reconciler