/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/tree.py

  • Committer: Jelmer Vernooij
  • Date: 2020-07-04 12:29:00 UTC
  • mfrom: (7490.40.42 work)
  • mto: (7490.40.48 work)
  • mto: This revision was merged to the branch mainline in revision 7519.
  • Revision ID: jelmer@jelmer.uk-20200704122900-o0y82e758ci5jie4
Merge lp:brz/3.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tree.py
21
21
 
22
22
from .lazy_import import lazy_import
23
23
lazy_import(globals(), """
24
 
 
25
 
from breezy import (
26
 
    conflicts as _mod_conflicts,
27
 
    debug,
28
 
    delta,
29
 
    filters,
30
 
    revision as _mod_revision,
31
 
    rules,
32
 
    )
33
24
from breezy.i18n import gettext
34
25
""")
35
26
 
37
28
    errors,
38
29
    lock,
39
30
    osutils,
 
31
    revision as _mod_revision,
40
32
    trace,
41
33
    )
42
34
from .inter import InterObject
270
262
 
271
263
        Each conflict is an instance of breezy.conflicts.Conflict.
272
264
        """
 
265
        from . import conflicts as _mod_conflicts
273
266
        return _mod_conflicts.ConflictList()
274
267
 
275
268
    def extras(self):
689
682
            or None if unknown
690
683
        :return: the list of filters - [] if there are none
691
684
        """
 
685
        from . import debug, filters
692
686
        filter_pref_names = filters._get_registered_names()
693
687
        if len(filter_pref_names) == 0:
694
688
            return []
723
717
        :return: an iterator of tuple sequences, one per path-name.
724
718
          See _RulesSearcher.get_items for details on the tuple sequence.
725
719
        """
 
720
        from . import rules
726
721
        if _default_searcher is None:
727
722
            _default_searcher = rules._per_user_searcher
728
723
        searcher = self._get_rules_searcher(_default_searcher)
760
755
        return (kind in ('file', 'directory', 'symlink', 'tree-reference'))
761
756
 
762
757
    def preview_transform(self, pb=None):
763
 
        """Create a preview transform.
764
 
        """
 
758
        """Obtain a transform object."""
765
759
        raise NotImplementedError(self.preview_transform)
766
760
 
767
761
 
809
803
            a PathsNotVersionedError will be thrown.
810
804
        :param want_unversioned: Scan for unversioned paths.
811
805
        """
 
806
        from . import delta
812
807
        trees = (self.source,)
813
808
        if extra_trees is not None:
814
809
            trees = trees + tuple(extra_trees)