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

  • Committer: Breezy landing bot
  • Author(s): Gustav Hartvigsson
  • Date: 2021-01-10 18:46:30 UTC
  • mfrom: (7526.1.1 brz-removed-api-doc)
  • mto: This revision was merged to the branch mainline in revision 7532.
  • Revision ID: breezy.the.bot@gmail.com-20210110184630-dxu0g9dqq020uiw6
Drop documentation for removed API API.

Merged from https://code.launchpad.net/~gustav-hartvigsson/brz/removed-api-doc/+merge/396033

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/config.py
90
90
import stat
91
91
 
92
92
from breezy import (
93
 
    atomicfile,
94
93
    cmdline,
95
94
    controldir,
96
95
    debug,
530
529
 
531
530
        Something similar to 'Martin Pool <mbp@sourcefrog.net>'
532
531
 
533
 
        $BRZ_EMAIL can be set to override this, then
 
532
        $BRZ_EMAIL or $BZR_EMAIL can be set to override this, then
534
533
        the concrete policy type is checked, and finally
535
534
        $EMAIL is examined.
536
535
        If no username can be found, NoWhoami exception is raised.
537
536
        """
538
 
        v = os.environ.get('BRZ_EMAIL')
 
537
        v = os.environ.get('BRZ_EMAIL') or os.environ.get('BZR_EMAIL')
539
538
        if v:
540
539
            return v
541
540
        v = self._get_user_id()
903
902
    def _write_config_file(self):
904
903
        if self.file_name is None:
905
904
            raise AssertionError('We cannot save, self.file_name is None')
 
905
        from . import atomicfile
906
906
        conf_dir = os.path.dirname(self.file_name)
907
907
        bedding.ensure_config_dir_exists(conf_dir)
908
908
        with atomicfile.AtomicFile(self.file_name) as atomic_file:
2514
2514
    Option('editor',
2515
2515
           help='The command called to launch an editor to enter a message.'))
2516
2516
option_registry.register(
2517
 
    Option('email', override_from_env=['BRZ_EMAIL'],
 
2517
    Option('email', override_from_env=['BRZ_EMAIL', 'BZR_EMAIL'],
2518
2518
           default=bedding.default_email, help='The users identity'))
2519
2519
option_registry.register(
2520
2520
    Option('gpg_signing_key',
2902
2902
            try:
2903
2903
                name, value = over.split('=', 1)
2904
2904
            except ValueError:
2905
 
                raise errors.BzrCommandError(
 
2905
                raise errors.CommandError(
2906
2906
                    gettext("Invalid '%s', should be of the form 'name=value'")
2907
2907
                    % (over,))
2908
2908
            self.options[name] = value
4003
4003
 
4004
4004
    def _remove_config_option(self, name, directory, scope):
4005
4005
        if name is None:
4006
 
            raise errors.BzrCommandError(
 
4006
            raise errors.CommandError(
4007
4007
                '--remove expects an option to remove.')
4008
4008
        conf = self._get_stack(directory, scope, write_access=True)
4009
4009
        try: