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

  • Committer: Jelmer Vernooij
  • Date: 2019-06-03 23:48:08 UTC
  • mfrom: (7316 work)
  • mto: This revision was merged to the branch mainline in revision 7328.
  • Revision ID: jelmer@jelmer.uk-20190603234808-15yk5c7054tj8e2b
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/rules.py
24
24
import configobj
25
25
 
26
26
from . import (
27
 
    bedding,
 
27
    config,
28
28
    cmdline,
29
29
    errors,
30
30
    globbing,
162
162
        return ()
163
163
 
164
164
 
165
 
def rules_path():
166
 
    """Return the default rules file path."""
167
 
    return osutils.pathjoin(bedding.config_dir(), 'rules')
 
165
def rules_filename():
 
166
    """Return the default rules filename."""
 
167
    return osutils.pathjoin(config.config_dir(), 'rules')
168
168
 
169
169
 
170
170
def reset_rules():
171
171
    global _per_user_searcher
172
 
    _per_user_searcher = _IniBasedRulesSearcher(rules_path())
 
172
    _per_user_searcher = _IniBasedRulesSearcher(rules_filename())
173
173
 
174
174
 
175
175
reset_rules()