← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/rules.py

  • Committer: Vincent Ladeuil
  • Date: 2010-02-10 15:46:03 UTC
  • mfrom: (4985.3.21 update)
  • mto: This revision was merged to the branch mainline in revision 5021.
  • Revision ID: v.ladeuil+lp@free.fr-20100210154603-k4no1gvfuqpzrw7p
https://launchpad.net/bugs/113809
Update performs two merges in a more logical order but stop on conflicts

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
 
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."""
146
149
    return osutils.pathjoin(config.config_dir(), 'rules')
147
150
 
148
151
 
149
 
# The object providing default rules
150
 
_per_user_searcher = _IniBasedRulesSearcher(rules_filename())
 
152
def reset_rules():
 
153
    global _per_user_searcher
 
154
    _per_user_searcher = _IniBasedRulesSearcher(rules_filename())
 
155
 
 
156
reset_rules()