← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/config.py

  • Committer: Erik Bågfors
  • Date: 2006-02-10 21:23:29 UTC
  • mto: (1185.50.77 bzr-jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1554.
  • Revision ID: erik@bagfors.nu-20060210212329-0b949820c96ebe15
log_formatter => log_format for "named" formatters
The name of a formatter is now called log_format and is exposed
as "log-format" and not "log-formatter" to the user for more consitency

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/config.py
27
27
check_signatures=require|ignore|check-available(default)
28
28
create_signatures=always|never|when-required(default)
29
29
gpg_signing_command=name-of-program
30
 
log_formatter=name-of-format
 
30
log_format=name-of-format
31
31
 
32
32
in branches.conf, you specify the url of a branch and options for it.
33
33
Wildcards may be used - * and ? as normal in shell completion. Options
123
123
        """See gpg_signing_command()."""
124
124
        return None
125
125
 
126
 
    def log_formatter(self):
127
 
        """What log formatter should be used"""
128
 
        result = self._log_formatter()
 
126
    def log_format(self):
 
127
        """What log format should be used"""
 
128
        result = self._log_format()
129
129
        if result is None:
130
130
            result = "long"
131
131
        return result
132
132
 
133
 
    def _log_formatter(self):
134
 
        """See log_formatter()."""
 
133
    def _log_format(self):
 
134
        """See log_format()."""
135
135
        return None
136
136
 
137
137
    def __init__(self):
240
240
        """See Config.gpg_signing_command."""
241
241
        return self._get_user_option('gpg_signing_command')
242
242
 
243
 
    def _log_formatter(self):
244
 
        """See Config.log_formatter."""
245
 
        return self._get_user_option('log_formatter')
 
243
    def _log_format(self):
 
244
        """See Config.log_format."""
 
245
        return self._get_user_option('log_format')
246
246
 
247
247
    def __init__(self, get_filename):
248
248
        super(IniBasedConfig, self).__init__()
336
336
            return command
337
337
        return self._get_global_config()._gpg_signing_command()
338
338
 
339
 
    def _log_formatter(self):
340
 
        """See Config.log_formatter."""
341
 
        command = super(LocationConfig, self)._log_formatter()
 
339
    def _log_format(self):
 
340
        """See Config.log_format."""
 
341
        command = super(LocationConfig, self)._log_format()
342
342
        if command is not None:
343
343
            return command
344
 
        return self._get_global_config()._log_formatter()
 
344
        return self._get_global_config()._log_format()
345
345
 
346
346
    def _get_user_id(self):
347
347
        user_id = super(LocationConfig, self)._get_user_id()
434
434
        """See Config.post_commit."""
435
435
        return self._get_location_config()._post_commit()
436
436
 
437
 
    def _log_formatter(self):
438
 
        """See Config.log_formatter."""
439
 
        return self._get_location_config()._log_formatter()
 
437
    def _log_format(self):
 
438
        """See Config.log_format."""
 
439
        return self._get_location_config()._log_format()
440
440
 
441
441
def ensure_config_dir_exists(path=None):
442
442
    """Make sure a configuration directory exists.