← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Robert Collins
  • Date: 2010-01-28 18:05:44 UTC
  • mto: (4797.2.5 2.1)
  • mto: This revision was merged to the branch mainline in revision 4989.
  • Revision ID: robertc@robertcollins.net-20100128180544-6l8x7o7obaq7b51x
Tweak ConfigurableFileMerger to use class variables rather than requiring __init__ wrapping as future proofing for helper functions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
100
100
    classes should implement ``merge_text``.
101
101
 
102
102
    :ivar affected_files: The configured file paths to merge.
103
 
    :ivar name_prefix: The prefix to use when looking up configuration
 
103
    :cvar name_prefix: The prefix to use when looking up configuration
104
104
        details.
105
 
    :ivar default_files: The default file paths to merge when no configuration
 
105
    :cvar default_files: The default file paths to merge when no configuration
106
106
        is present.
107
107
    """
108
108
 
109
 
    def __init__(self, merger, name_prefix, default_files=None):
 
109
    name_prefix = None
 
110
    default_files = None
 
111
 
 
112
    def __init__(self, merger):
110
113
        super(ConfigurableFileMerger, self).__init__(merger)
111
114
        self.affected_files = None
112
 
        self.default_files = default_files or []
113
 
        self.name_prefix = name_prefix
 
115
        self.default_files = self.__class__.default_files or []
 
116
        self.name_prefix = self.__class__.name_prefix
 
117
        if self.name_prefix is None:
 
118
            raise ValueError("name_prefix must be set.")
114
119
 
115
120
    def filename_matches_config(self, params):
116
121
        affected_files = self.affected_files