/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/git/workingtree.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-06-23 01:17:33 UTC
  • mfrom: (7516.1.1 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200623011733-ohfy5ukvyehd2kpf
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/386223

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/workingtree.py
53
53
    errors,
54
54
    controldir as _mod_controldir,
55
55
    globbing,
56
 
    ignores,
57
56
    lock,
58
57
    merge,
59
58
    osutils,
628
627
        be ignored, otherwise None.  So this can simply be used as a
629
628
        boolean if desired."""
630
629
        if getattr(self, '_global_ignoreglobster', None) is None:
 
630
            from breezy import ignores
631
631
            ignore_globs = set()
632
632
            ignore_globs.update(ignores.get_runtime_ignores())
633
633
            ignore_globs.update(ignores.get_user_ignores())