← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/rules.py

  • Committer: Andrew Bennetts
  • Date: 2010-06-25 06:47:40 UTC
  • mto: (5050.3.16 2.2)
  • mto: This revision was merged to the branch mainline in revision 5365.
  • Revision ID: andrew.bennetts@canonical.com-20100625064740-k93ngat248kdcqdm
Remove merge_into_helper for now, as it currently has no callers.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/rules.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Rule-based definition of preferences for selected files in selected branches.
18
18
 
21
21
 
22
22
from bzrlib import (
23
23
    config,
24
 
    commands,
 
24
    cmdline,
25
25
    errors,
26
26
    globbing,
27
27
    osutils,
36
36
FILE_PREFS_PREFIX = 'name '
37
37
FILE_PREFS_PREFIX_LEN = len(FILE_PREFS_PREFIX)
38
38
 
 
39
# The object providing default rules
 
40
_per_user_searcher = None
 
41
 
39
42
 
40
43
class _RulesSearcher(object):
41
44
    """An object that provides rule-based preferences."""
78
81
        self.pattern_to_section = {}
79
82
        for s in sections:
80
83
            if s.startswith(FILE_PREFS_PREFIX):
81
 
                file_patterns = commands.shlex_split_unicode(
82
 
                    s[FILE_PREFS_PREFIX_LEN:])
 
84
                file_patterns = cmdline.split(s[FILE_PREFS_PREFIX_LEN:])
83
85
                patterns.extend(file_patterns)
84
86
                for fp in file_patterns:
85
87
                    self.pattern_to_section[fp] = s
146
148
    return osutils.pathjoin(config.config_dir(), 'rules')
147
149
 
148
150
 
149
 
# The object providing default rules
150
 
_per_user_searcher = _IniBasedRulesSearcher(rules_filename())
 
151
def reset_rules():
 
152
    global _per_user_searcher
 
153
    _per_user_searcher = _IniBasedRulesSearcher(rules_filename())
 
154
 
 
155
reset_rules()