Merge lp:~jelmer/brz/breezy-conf into lp:brz

[Jelmer Vernooij]

Rename bazaar.conf to breezy.conf (when in ~/.config/breezy).

Rename bazaar.conf to breezy.conf (when in ~/.config/breezy).

[Martin Packman (gz)]

Looks good, thanks!

review: Approve

=== modified file 'apport/source_brz.py'
--- apport/source_brz.py	2017-05-21 12:41:27 +0000
+++ apport/source_brz.py	2017-07-30 17:00:52 +0000
@@ -8,7 +8,7 @@
 import os
 
 brz_log = os.path.expanduser('~/.brz.log')
-dot_brz = os.path.expanduser('~/.bazaar')
+dot_brz = os.path.expanduser('~/.config/breezy')
 
 def _add_log_tail(report):
     # may have already been added in-process
@@ -45,7 +45,7 @@
     # TODO: strip that out and attach the rest
 
     #attach_file_if_exists(report,
-    #	os.path.join(dot_brz, 'bazaar.conf', 'BrzConfig')
+    #	os.path.join(dot_brz, 'breezy.conf', 'BrzConfig')
     #attach_file_if_exists(report,
     #	os.path.join(dot_brz, 'locations.conf', 'BrzLocations')
 

=== modified file 'breezy/bugtracker.py'
--- breezy/bugtracker.py	2017-07-10 20:12:25 +0000
+++ breezy/bugtracker.py	2017-07-30 17:00:52 +0000
@@ -84,7 +84,7 @@
 
 If you use Bugzilla or Trac, then you only need to set a configuration
 variable which contains the base URL of the bug tracker. These options
-can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific
+can go into ``breezy.conf``, ``branch.conf`` or into a branch-specific
 configuration section in ``locations.conf``.  You can set up these values
 for each of the projects you work on.
 

=== modified file 'breezy/builtins.py'
--- breezy/builtins.py	2017-07-24 01:07:36 +0000
+++ breezy/builtins.py	2017-07-30 17:00:52 +0000
@@ -2612,7 +2612,7 @@
       Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/> and
       <http://wiki.bazaar.canonical.com/IDEIntegration>.  
 
-      You may find it useful to add the aliases below to ``bazaar.conf``::
+      You may find it useful to add the aliases below to ``breezy.conf``::
 
         [ALIASES]
         tip = log -r-1

=== modified file 'breezy/config.py'
--- breezy/config.py	2017-07-21 13:20:17 +0000
+++ breezy/config.py	2017-07-30 17:00:52 +0000
@@ -18,10 +18,13 @@
 
 """Configuration that affects the behaviour of Bazaar.
 
-Currently this configuration resides in ~/.bazaar/bazaar.conf
-and ~/.bazaar/locations.conf, which is written to by brz.
-
-In bazaar.conf the following options may be set:
+Currently this configuration resides in ~/.config/breezy/breezy.conf
+and ~/.config/breezy/locations.conf, which is written to by brz.
+
+If the first location doesn't exist, then brz falls back to reading
+Bazaar configuration files in ~/.bazaar or ~/.config/bazaar.
+
+In breezy.conf the following options may be set:
 [DEFAULT]
 editor=name-of-program
 email=Your Name <[e-mail]>
@@ -34,7 +37,7 @@
 
 in locations.conf, you specify the url of a branch and options for it.
 Wildcards may be used - * and ? as normal in shell completion. Options
-set in both bazaar.conf and locations.conf are overridden by the locations.conf
+set in both breezy.conf and locations.conf are overridden by the locations.conf
 setting.
 [/home/robertc/source]
 recurse=False|True(default)
@@ -62,7 +65,7 @@
 acceptable_keys - comma separated list of key patterns acceptable for
                   verify-signatures command
 
-In bazaar.conf you can also define aliases in the ALIASES sections, example
+In breezy.conf you can also define aliases in the ALIASES sections, example
 
 [ALIASES]
 lastlog=log --line -r-10..-1
@@ -1474,15 +1477,14 @@
     return osutils.pathjoin(base, ".bazaar")
 
 
-def config_dir():
+def _config_dir():
     """Return per-user configuration directory as unicode string
 
     By default this is %APPDATA%/breezy on Windows, $XDG_CONFIG_HOME/breezy on
     Mac OS X and Linux. If the breezy config directory doesn't exist but
     the bazaar one (see bazaar_config_dir()) does, use that instead.
-
-    TODO: Global option --config-dir to override this.
     """
+    # TODO: Global option --config-dir to override this.
     base = osutils.path_from_environ('BRZ_HOME')
     if sys.platform == 'win32':
         if base is None:
@@ -1497,19 +1499,33 @@
             base = osutils.pathjoin(osutils._get_home_dir(), ".config")
     breezy_dir = osutils.pathjoin(base, 'breezy')
     if osutils.isdir(breezy_dir):
-        return breezy_dir
+        return (breezy_dir, 'breezy')
     # If the breezy directory doesn't exist, but the bazaar one does, use that:
     bazaar_dir = bazaar_config_dir()
     if osutils.isdir(bazaar_dir):
         trace.mutter(
             "Using Bazaar configuration directory (%s)", bazaar_dir)
-        return bazaar_dir
-    return breezy_dir
+        return (bazaar_dir, 'bazaar')
+    return (breezy_dir, 'breezy')
+
+
+def config_dir():
+    """Return per-user configuration directory as unicode string
+
+    By default this is %APPDATA%/breezy on Windows, $XDG_CONFIG_HOME/breezy on
+    Mac OS X and Linux. If the breezy config directory doesn't exist but
+    the bazaar one (see bazaar_config_dir()) does, use that instead.
+    """
+    return _config_dir()[0]
 
 
 def config_filename():
     """Return per-user configuration ini file filename."""
-    return osutils.pathjoin(config_dir(), 'bazaar.conf')
+    path, kind = _config_dir()
+    if kind == 'bazaar':
+        return osutils.pathjoin(path, 'bazaar.conf')
+    else:
+        return osutils.pathjoin(path, 'breezy.conf')
 
 
 def locations_config_filename():

=== modified file 'breezy/crash.py'
--- breezy/crash.py	2017-06-11 13:48:12 +0000
+++ breezy/crash.py	2017-07-30 17:00:52 +0000
@@ -207,7 +207,7 @@
     # TODO: strip that out and attach the rest
     #
     #attach_file_if_exists(report,
-    #   os.path.join(dot_brz, 'bazaar.conf', 'BrzConfig')
+    #   os.path.join(dot_brz, 'breezy.conf', 'BrzConfig')
     #attach_file_if_exists(report,
     #   os.path.join(dot_brz, 'locations.conf', 'BrzLocations')
 

=== modified file 'breezy/debug.py'
--- breezy/debug.py	2017-05-21 18:10:28 +0000
+++ breezy/debug.py	2017-07-30 17:00:52 +0000
@@ -17,7 +17,7 @@
 """Set of flags that enable different debug behaviour.
 
 These are set with eg ``-Dlock`` on the bzr command line or in
-~/.bazaar/bazaar.conf debug_flags.
+~/.config/breezy/breezy.conf debug_flags.
 
 See `bzr help debug-flags` or `breezy/help_topics/en/debug-flags.txt`
 for a list of the available options.

=== modified file 'breezy/doc_generate/autodoc_man.py'
--- breezy/doc_generate/autodoc_man.py	2017-06-02 21:28:05 +0000
+++ breezy/doc_generate/autodoc_man.py	2017-07-30 17:00:52 +0000
@@ -225,7 +225,7 @@
 man_foot = """\
 .SH "FILES"
 .TP
-.I "~/.bazaar/bazaar.conf"
+.I "~/.config/breezy/breezy.conf"
 Contains the user's default configuration. The section
 .B [DEFAULT]
 is used to define general configuration that will be applied everywhere.

=== modified file 'breezy/help_topics/__init__.py'
--- breezy/help_topics/__init__.py	2017-06-15 00:39:26 +0000
+++ breezy/help_topics/__init__.py	2017-07-30 17:00:52 +0000
@@ -604,8 +604,8 @@
     ("BRZ_PLUGIN_PATH", "Paths where brz should look for plugins."),
     ("BRZ_DISABLE_PLUGINS", "Plugins that brz should not load."),
     ("BRZ_PLUGINS_AT", "Plugins to load from a directory not in BRZ_PLUGIN_PATH."),
-    ("BRZ_HOME", "Directory holding .bazaar config dir. Overrides HOME."),
-    ("BRZ_HOME (Win32)", "Directory holding bazaar config dir. Overrides APPDATA and HOME."),
+    ("BRZ_HOME", "Directory holding breezy config dir. Overrides HOME."),
+    ("BRZ_HOME (Win32)", "Directory holding breezy config dir. Overrides APPDATA and HOME."),
     ("BZR_REMOTE_PATH", "Full name of remote 'brz' command (for brz+ssh:// URLs)."),
     ("BRZ_SSH", "Path to SSH client, or one of paramiko, openssh, sshcorp, plink or lsh."),
     ("BRZ_LOG", "Location of .brz.log (use '/dev/null' to suppress log)."),
@@ -636,8 +636,8 @@
 _files = \
 r"""Files
 
-:On Unix:   ~/.bazaar/bazaar.conf
-:On Windows: C:\\Documents and Settings\\username\\Application Data\\bazaar\\2.0\\bazaar.conf
+:On Unix:   ~/.config/breezy/breezy.conf
+:On Windows: C:\\Documents and Settings\\username\\Application Data\\bazaar\\2.0\\breezy.conf
 
 Contains the user's default configuration. The section ``[DEFAULT]`` is
 used to define general configuration that will be applied everywhere.

=== modified file 'breezy/help_topics/en/configuration.txt'
--- breezy/help_topics/en/configuration.txt	2017-07-04 20:03:11 +0000
+++ breezy/help_topics/en/configuration.txt	2017-07-30 17:00:52 +0000
@@ -203,7 +203,7 @@
 
 There are three primary configuration files in this location:
 
-* ``bazaar.conf`` describes default configuration options,
+* ``breezy.conf`` describes default configuration options,
 
 * ``locations.conf`` describes configuration information for
   specific branch locations,
@@ -238,7 +238,7 @@
 
     [DEFAULT]
 
-The only valid section headers for bazaar.conf currently are [DEFAULT] and
+The only valid section headers for breezy.conf currently are [DEFAULT] and
 [ALIASES].  Section headers are case sensitive. The default section provides for
 setting options which can be overridden with the branch config file.
 
@@ -350,15 +350,15 @@
 ``Store``.
 
 
-The main configuration file, bazaar.conf
+The main configuration file, breezy.conf
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.
+``breezy.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.
 The default section contains the default
 configuration options for all branches. The default section can be
 overriden by providing a branch-specific section in ``locations.conf``.
 
-A typical ``bazaar.conf`` section often looks like the following::
+A typical ``breezy.conf`` section often looks like the following::
 
     [DEFAULT]
     email             = John Doe <[e-mail]>
@@ -371,7 +371,7 @@
 
 ``locations.conf`` allows one to specify overriding settings for
 a specific branch. The format is almost identical to the default section in
-bazaar.conf with one significant change: The section header, instead of saying
+breezy.conf with one significant change: The section header, instead of saying
 default, will be the path to a branch that you wish to override a value
 for. The '?' and '*' wildcards are supported::
 
@@ -618,7 +618,7 @@
 These options apply only to branches that use the ``dirstate-tags`` or
 later format.  They
 are usually set in ``.bzr/branch/branch.conf`` automatically, but may be
-manually set in ``locations.conf`` or ``bazaar.conf``.
+manually set in ``locations.conf`` or ``breezy.conf``.
 
 append_revisions_only
 ~~~~~~~~~~~~~~~~~~~~~

=== modified file 'breezy/help_topics/en/debug-flags.txt'
--- breezy/help_topics/en/debug-flags.txt	2017-05-21 14:47:52 +0000
+++ breezy/help_topics/en/debug-flags.txt	2017-07-30 17:00:52 +0000
@@ -2,7 +2,7 @@
 ===========
 
 These flags can be passed on the brz command line or (without the ``-D``
-prefix) put in the ``debug_flags`` variable in ``bazaar.conf``.
+prefix) put in the ``debug_flags`` variable in ``breezy.conf``.
 
 -Dauth            Trace authentication sections used.
 -Dbytes           Print out how many bytes were transferred

=== modified file 'breezy/help_topics/en/log-formats.txt'
--- breezy/help_topics/en/log-formats.txt	2011-08-31 11:39:56 +0000
+++ breezy/help_topics/en/log-formats.txt	2017-07-30 17:00:52 +0000
@@ -22,7 +22,7 @@
   digital signature       optional       -             -
 
 The default format is ``long``. To change this, define the ``log_format``
-setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::
+setting in the ``[DEFAULT]`` section of ``breezy.conf`` like this (say)::
 
   [DEFAULT]
   log_format = short

=== modified file 'breezy/help_topics/en/missing-extensions.txt'
--- breezy/help_topics/en/missing-extensions.txt	2017-06-15 00:50:22 +0000
+++ breezy/help_topics/en/missing-extensions.txt	2017-07-30 17:00:52 +0000
@@ -17,7 +17,7 @@
 including make, a C compiler, and the Python header files.
 
 3. If you can't or don't want to build the extensions, add this line to
-bazaar.conf (whose location is shown by 'brz --version')::
+breezy.conf (whose location is shown by 'brz --version')::
 
   suppress_warnings=missing_extensions
 

=== modified file 'breezy/merge.py'
--- breezy/merge.py	2017-06-24 13:32:35 +0000
+++ breezy/merge.py	2017-07-30 17:00:52 +0000
@@ -207,7 +207,7 @@
             config = self.merger.this_branch.get_config()
             # Until bzr provides a better policy for caching the config, we
             # just add the part we're interested in to the params to avoid
-            # reading the config files repeatedly (bazaar.conf, location.conf,
+            # reading the config files repeatedly (breezy.conf, location.conf,
             # branch.conf).
             config_key = self.name_prefix + '_merge_files'
             affected_files = config.get_user_option_as_list(config_key)

=== modified file 'breezy/plugins/email/__init__.py'
--- breezy/plugins/email/__init__.py	2017-06-10 00:35:59 +0000
+++ breezy/plugins/email/__init__.py	2017-07-30 17:00:52 +0000
@@ -1,4 +1,3 @@
-# Copyright (C) 2005, 2006, 2007 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -33,7 +32,7 @@
 
 If you are using a bzr release from before 0.15, you need to manually tell
 bzr about the commit action, by setting
-post_commit=breezy.plugins.email.post_commit in bazaar.conf or locations.conf.
+post_commit=breezy.plugins.email.post_commit in breezy.conf or locations.conf.
 
 The URL of the branch is determined from the following checks (in order):
  - If the configuration value 'post_commit_url' is set, it is used.

=== modified file 'breezy/plugins/grep/NEWS'
--- breezy/plugins/grep/NEWS	2012-06-29 08:22:38 +0000
+++ breezy/plugins/grep/NEWS	2017-07-30 17:00:52 +0000
@@ -6,7 +6,7 @@
 * ``bzr grep`` now supports ``--diff|-p`` option to search through
   changesets. (Parth Malwankar, #540705)
 
-* Option ``grep_color`` can be set in ``bazaar.conf`` instead of using
+* Option ``grep_color`` can be set in ``breezy.conf`` instead of using
   the option ``--color`` from the command line. (Johan Dahlin)
 
 bzr-grep 0.4.0-final - 08-Jun-2010

=== modified file 'breezy/plugins/launchpad/account.py'
--- breezy/plugins/launchpad/account.py	2017-05-22 00:56:52 +0000
+++ breezy/plugins/launchpad/account.py	2017-07-30 17:00:52 +0000
@@ -44,14 +44,14 @@
 
 class MismatchedUsernames(errors.BzrError):
 
-    _fmt = ('bazaar.conf and authentication.conf disagree about launchpad'
+    _fmt = ('breezy.conf and authentication.conf disagree about launchpad'
             ' account name.  Please re-run launchpad-login.')
 
 
 def get_lp_login(_config=None):
     """Return the user's Launchpad username.
 
-    :raises: MismatchedUsername if authentication.conf and bazaar.conf
+    :raises: MismatchedUsername if authentication.conf and breezy.conf
         disagree about username.
     """
     if _config is None:

=== modified file 'breezy/plugins/launchpad/test_account.py'
--- breezy/plugins/launchpad/test_account.py	2017-05-22 00:56:52 +0000
+++ breezy/plugins/launchpad/test_account.py	2017-07-30 17:00:52 +0000
@@ -92,7 +92,7 @@
         account._set_global_option('bar')
         e = self.assertRaises(account.MismatchedUsernames,
                               account.get_lp_login)
-        self.assertEqual('bazaar.conf and authentication.conf disagree about'
+        self.assertEqual('breezy.conf and authentication.conf disagree about'
             ' launchpad account name.  Please re-run launchpad-login.', str(e))
 
 

=== modified file 'breezy/plugins/upload/__init__.py'
--- breezy/plugins/upload/__init__.py	2017-06-02 00:04:01 +0000
+++ breezy/plugins/upload/__init__.py	2017-07-30 17:00:52 +0000
@@ -73,7 +73,7 @@
 Since the auto hook is triggered automatically, you can't use the --quiet
 option available for the upload command. Instead, you can set the
 'upload_auto_quiet' configuration variable to True or False in either
-bazaar.conf, locations.conf or branch.conf.
+breezy.conf, locations.conf or branch.conf.
 
 
 Storing the '.bzr-upload.revid' file

=== modified file 'breezy/tests/blackbox/test_whoami.py'
--- breezy/tests/blackbox/test_whoami.py	2017-07-21 13:20:17 +0000
+++ breezy/tests/blackbox/test_whoami.py	2017-07-30 17:00:52 +0000
@@ -136,7 +136,7 @@
         c = branch.Branch.open(url).get_config_stack()
         self.assertEqual('Changed Identity <[e-mail]>',
                           c.get('email'))
-        # Ensuring that the value does not come from the bazaar.conf file
+        # Ensuring that the value does not come from the breezy.conf file
         # itself requires some isolation setup
         self.overrideEnv('BRZ_EMAIL', None)
         self.overrideEnv('EMAIL', None)

=== modified file 'breezy/tests/test_config.py'
--- breezy/tests/test_config.py	2017-07-15 15:58:12 +0000
+++ breezy/tests/test_config.py	2017-07-30 17:00:52 +0000
@@ -253,7 +253,7 @@
 
     - locations_config : A LocationConfig for the associated branch
 
-    - bazaar_config: A GlobalConfig.
+    - breezy_config: A GlobalConfig.
 
     The tree and branch are created in a 'tree' subdirectory so the tests can
     still use the test directory to stay outside of the branch.
@@ -262,7 +262,7 @@
     test.tree = tree
     test.branch_config = config.BranchConfig(tree.branch)
     test.locations_config = config.LocationConfig(tree.basedir)
-    test.bazaar_config = config.GlobalConfig()
+    test.breezy_config = config.GlobalConfig()
 
 
 def create_configs_with_file_option(test):
@@ -272,7 +272,7 @@
     configuration with a value which allows identifying the configuration file.
     """
     create_configs(test)
-    test.bazaar_config.set_user_option('file', 'bazaar')
+    test.breezy_config.set_user_option('file', 'bazaar')
     test.locations_config.set_user_option('file', 'locations')
     test.branch_config.set_user_option('file', 'branch')
 
@@ -525,7 +525,7 @@
 
     def test_config_filename(self):
         self.assertEqual(config.config_filename(),
-                         self.brz_home + '/bazaar.conf')
+                         self.brz_home + '/breezy.conf')
 
     def test_locations_config_filename(self):
         self.assertEqual(config.locations_config_filename(),
@@ -540,6 +540,38 @@
             '/home/bogus/.cache')
 
 
+class TestConfigPathFallback(tests.TestCaseInTempDir):
+
+    def setUp(self):
+        super(TestConfigPathFallback, self).setUp()
+        self.overrideEnv('HOME', self.test_dir)
+        self.overrideEnv('XDG_CACHE_HOME', '')
+        self.bzr_home = os.path.join(self.test_dir, '.bazaar')
+        os.mkdir(self.bzr_home)
+
+    def test_config_dir(self):
+        self.assertEqual(config.config_dir(), self.bzr_home)
+
+    def test_config_dir_is_unicode(self):
+        self.assertIsInstance(config.config_dir(), unicode)
+
+    def test_config_filename(self):
+        self.assertEqual(config.config_filename(),
+                         self.bzr_home + '/breezy.conf')
+
+    def test_locations_config_filename(self):
+        self.assertEqual(config.locations_config_filename(),
+                         self.bzr_home + '/locations.conf')
+
+    def test_authentication_config_filename(self):
+        self.assertEqual(config.authentication_config_filename(),
+                         self.bzr_home + '/authentication.conf')
+
+    def test_xdg_cache_dir(self):
+        self.assertEqual(config.xdg_cache_dir(),
+            os.path.join(self.test_dir, '.cache'))
+
+
 class TestXDGConfigDir(tests.TestCaseInTempDir):
     # must be in temp dir because config tests for the existence of the bazaar
     # subdirectory of $XDG_CONFIG_HOME
@@ -1686,7 +1718,7 @@
         self.assertEqual((conf, name, value), calls[0])
 
     def test_get_hook_bazaar(self):
-        self.assertGetHook(self.bazaar_config, 'file', 'bazaar')
+        self.assertGetHook(self.breezy_config, 'file', 'bazaar')
 
     def test_get_hook_locations(self):
         self.assertGetHook(self.locations_config, 'file', 'locations')
@@ -1712,7 +1744,7 @@
         self.assertEqual((name, value), calls[0][1:])
 
     def test_set_hook_bazaar(self):
-        self.assertSetHook(self.bazaar_config, 'foo', 'bazaar')
+        self.assertSetHook(self.breezy_config, 'foo', 'bazaar')
 
     def test_set_hook_locations(self):
         self.assertSetHook(self.locations_config, 'foo', 'locations')
@@ -1736,7 +1768,7 @@
         self.assertEqual((name,), calls[0][1:])
 
     def test_remove_hook_bazaar(self):
-        self.assertRemoveHook(self.bazaar_config, 'file')
+        self.assertRemoveHook(self.breezy_config, 'file')
 
     def test_remove_hook_locations(self):
         self.assertRemoveHook(self.locations_config, 'file',
@@ -1783,7 +1815,7 @@
         # Since we can't assert about conf, we just use the number of calls ;-/
 
     def test_save_hook_bazaar(self):
-        self.assertSaveHook(self.bazaar_config)
+        self.assertSaveHook(self.breezy_config)
 
     def test_save_hook_locations(self):
         self.assertSaveHook(self.locations_config)
@@ -3964,9 +3996,9 @@
         self.assertOptions([], self.branch_config)
 
     def test_option_in_bazaar(self):
-        self.bazaar_config.set_user_option('file', 'bazaar')
+        self.breezy_config.set_user_option('file', 'bazaar')
         self.assertOptions([('file', 'bazaar', 'DEFAULT', 'bazaar')],
-                           self.bazaar_config)
+                           self.breezy_config)
 
     def test_option_in_locations(self):
         self.locations_config.set_user_option('file', 'locations')
@@ -3980,7 +4012,7 @@
                            self.branch_config)
 
     def test_option_in_bazaar_and_branch(self):
-        self.bazaar_config.set_user_option('file', 'bazaar')
+        self.breezy_config.set_user_option('file', 'bazaar')
         self.branch_config.set_user_option('file', 'branch')
         self.assertOptions([('file', 'branch', 'DEFAULT', 'branch'),
                             ('file', 'bazaar', 'DEFAULT', 'bazaar'),],
@@ -3996,7 +4028,7 @@
             self.branch_config)
 
     def test_option_in_bazaar_locations_and_branch(self):
-        self.bazaar_config.set_user_option('file', 'bazaar')
+        self.breezy_config.set_user_option('file', 'bazaar')
         self.locations_config.set_user_option('file', 'locations')
         self.branch_config.set_user_option('file', 'branch')
         self.assertOptions(
@@ -4027,7 +4059,7 @@
             self.branch_config)
 
     def test_remove_in_bazaar(self):
-        self.bazaar_config.remove_user_option('file')
+        self.breezy_config.remove_user_option('file')
         self.assertOptions(
             [('file', 'locations', self.tree.basedir, 'locations'),
              ('file', 'branch', 'DEFAULT', 'branch'),],
@@ -4057,7 +4089,7 @@
         self.assertEqual(expected, [n for n, _, _ in sections])
 
     def test_bazaar_default_section(self):
-        self.assertSectionNames(['DEFAULT'], self.bazaar_config)
+        self.assertSectionNames(['DEFAULT'], self.breezy_config)
 
     def test_locations_default_section(self):
         # No sections are defined in an empty file
@@ -4100,13 +4132,13 @@
     def test_bazaar_named_section(self):
         # We need to cheat as the API doesn't give direct access to sections
         # other than DEFAULT.
-        self.bazaar_config.set_alias('bazaar', 'bzr')
-        self.assertSectionNames(['ALIASES'], self.bazaar_config, 'ALIASES')
+        self.breezy_config.set_alias('bazaar', 'bzr')
+        self.assertSectionNames(['ALIASES'], self.breezy_config, 'ALIASES')
 
 
 class TestSharedStores(tests.TestCaseInTempDir):
 
-    def test_bazaar_conf_shared(self):
+    def test_breezy_conf_shared(self):
         g1 = config.GlobalStack()
         g2 = config.GlobalStack()
         # The two stacks share the same store

=== modified file 'doc/developers/HACKING.txt'
--- doc/developers/HACKING.txt	2017-06-06 01:10:48 +0000
+++ doc/developers/HACKING.txt	2017-07-30 17:00:52 +0000
@@ -457,10 +457,11 @@
 Run ``bzr help global-options`` to see them all.
 
 These flags may also be set as a comma-separated list in the
-``debug_flags`` option in e.g.  ``~/.bazaar/bazaar.conf``.  (Note that it
-must be in this global file, not in the branch or location configuration,
-because it's currently only loaded at startup time.)  For instance you may
-want to always record hpss traces and to see full error tracebacks::
+``debug_flags`` option in e.g.  ``~/.config/breezy/breezy.conf``.  (Note
+that it must be in this global file, not in the branch or location
+configuration, because it's currently only loaded at startup time.)  For
+instance you may want to always record hpss traces and to see full error
+tracebacks::
 
     debug_flags = hpss, error
 
@@ -605,7 +606,7 @@
 energy by emailing the **bazaar-commits** list implicitly. To do this,
 install and configure the Email plugin. One way to do this is add these
 configuration settings to your central configuration file (e.g.
-``~/.bazaar/bazaar.conf``)::
+``~/.config/breezy/breezy.conf``)::
 
   [DEFAULT]
   email = Joe Smith <[e-mail]>

=== modified file 'doc/developers/authentication-ring.txt'
--- doc/developers/authentication-ring.txt	2012-04-03 14:49:22 +0000
+++ doc/developers/authentication-ring.txt	2017-07-30 17:00:52 +0000
@@ -50,8 +50,8 @@
 hazard (see `bug #34685
 <https://launchpad.net/products/bzr/+bug/34685>`_).
 
-Storing passwords in ``~/.bazaar/bazaar.conf`` or ``~/.bazaar/locations.conf``
-is also a security risk.
+Storing passwords in ``~/.config/breezy/breezy.conf`` or
+``~/.config/breezy/locations.conf`` is also a security risk.
 
 Typing user and passwords is error-prone and boring.
 
@@ -179,9 +179,10 @@
 File format
 -----------
 
-Even if ``~/.bazaar/bazaar.conf`` and ``~/.bazaar/locations.conf`` seems to
-provide most of the needed infrastructure, we choose to use a dedicated file
-for the authentication info ``~/.bazaar/authentication.conf`` for the following
+Even if ``~/.config/breezy/breezy.conf`` and
+``~/.config/breezy/locations.conf`` seems to provide most of the needed
+infrastructure, we choose to use a dedicated file
+for the authentication info ``~/.config/breezy/authentication.conf`` for the following
 reasons:
 
   * allow the user to protect the content of one file only, relaxing security
@@ -192,8 +193,8 @@
     generally servers. The same authentification definition can even be used
     for several schemes for servers providing those schemes.
 
-``~/.bazaar/authentication.conf`` will use the same file format as
-``~/.bazaar/bazaar.conf``.
+``~/.config/breezy//authentication.conf`` will use the same file format as
+``~/.config/breezy/breezy.conf``.
 
 Each section describes an authentication definition.
 
@@ -324,13 +325,13 @@
 
 2. ``user`` given in the URL.
 
-  Get a password from ``~/.bazaar/authentication.conf`` or prompt
+  Get a password from ``~/.config/breezy/authentication.conf`` or prompt
   for one if none is found.
 
 3. No ``user`` given in the URL (and no ``password``).
 
-  Get a user from ``~/.bazaar/authentication.conf`` or prompt for one if none is
-  found. Continue as 2. (Not implemented yet)
+  Get a user from ``~/.config/breezy/authentication.conf`` or prompt for one if
+  none is found. Continue as 2. (Not implemented yet)
 
 Note: A user will be queried only if the server requires it for ``HTTP`` or
 ``HTTPS``, other protocols always require a user.

=== modified file 'doc/developers/configuration.txt'
--- doc/developers/configuration.txt	2017-05-21 18:10:28 +0000
+++ doc/developers/configuration.txt	2017-07-30 17:00:52 +0000
@@ -1,10 +1,10 @@
-Configuring Bazaar
+Configuring Breezy
 ==================
 
 .. contents::
    :depth: 2
 
-As a Bazaar developer there are a few things you need to know about
+As a Breezy developer there are a few things you need to know about
 configuration:
 
 * how to add a new option,
@@ -63,7 +63,7 @@
 
 But before doing that, you must be sure that the stack you're using have a
 writable section (this is true for ``GlobalStack`` which uses the
-``DEFAULT`` section in ``bazaar.conf`` and for ``BranchStack``which uses the
+``DEFAULT`` section in ``breezy.conf`` and for ``BranchStack``which uses the
 no-name section in ``branch.conf``).
 
 Old and new configuration code
@@ -112,7 +112,7 @@
 associated levels of generality and query them in the appropriate order
 returning the first definition found. For example, the
 ``append_revisions_only`` option may be declared for all branches of a user
-in ``bazaar.conf``, or for a hierarchy of branches in ``locations.conf`` or
+in ``breezy.conf``, or for a hierarchy of branches in ``locations.conf`` or
 in a single branch in ``branch.conf``.
 
 Defining a new stack means you need a new way to expose these levels to the
@@ -138,7 +138,7 @@
 The following stores are used by ``brz`` in ways that illustrate various
 uses of sections.
 
-bazaar.conf
+breezy.conf
 ===========
 
 ``brz`` itself defines two sections here:
@@ -261,7 +261,7 @@
 to implement a locking mechanism. ``LockableIniFileStore`` implements such a
 mechanism for ``IniFileStore`` based stores.
 
-Classes are provided for the usual Bazaar configuration files and could be
+Classes are provided for the usual Breezy configuration files and could be
 used as examples to define new ones if needed. The associated tests provides a
 basis for new classes which only need to register themselves in the right
 places to inherit from the existing basic tests and add their own specific

=== modified file 'doc/developers/new-config-rationale.txt'
--- doc/developers/new-config-rationale.txt	2011-12-14 16:30:09 +0000
+++ doc/developers/new-config-rationale.txt	2017-07-30 17:00:52 +0000
@@ -1,5 +1,5 @@
 ================================
-Simplifying Bazaar Configuration
+Simplifying Breezy Configuration
 ================================
 
 Goal
@@ -49,10 +49,10 @@
   approximated today by *not* defining these options in ``branch.conf`` but
   in ``locations.conf`` instead. This workaround doesn't allow a user to
   define defaults in ``locations.conf`` and override them in
-  ``branch.conf``. (Allowing sections in 'bazaar.conf' (or introducing a new
+  ``branch.conf``. (Allowing sections in 'breezy.conf' (or introducing a new
   defaults.conf' allowing sections) can now address that. Defining and using
   a new file is easier as it avoids handling a migration path for
-  bazaar.conf and doesn't require banning the use of sections for special
+  breezy.conf and doesn't require banning the use of sections for special
   purpose needs (ALIASES and BOOKMARKS for example)).
 
 * Defining a new option requires adding a new method in the ``Config``
@@ -88,10 +88,10 @@
 
 * Rules for configuration options are not clearly defined for remote
   branches (they may differ between dumb and smart servers the former will
-  use the local ``bazaar.conf`` and ``locations.conf`` files while the later
+  use the local ``breezy.conf`` and ``locations.conf`` files while the later
   will use (or ignore ?) the remote ones).
 
-* The features offered by the Bazaar configuration files should be easily
+* The features offered by the Breezy configuration files should be easily
   accessible to plugin authors either by supporting plugin configuration
   options in the configuration files or allowing the plugins to define their
   own configuration files. (Separating Section, Store and Stack starts
@@ -102,7 +102,7 @@
   mutually exclusive ways that make it impossible to offer the same set of
   features to all configuration files:
 
-  * ``bazaar.conf`` use arbitrary names for sections. ``DEFAULT`` is used
+  * ``breezy.conf`` use arbitrary names for sections. ``DEFAULT`` is used
     for global options, ``ALIASES`` are used to define command aliases,
     plugins can define their own sections, some plugins do that
     (``bzr-bookmarks`` use ``BOOKMARKS`` for example), some other define
@@ -118,7 +118,7 @@
 
   This is addressed by defining different stacks selecting the relevant
   sections from the stores involved. ``ALIASES`` for example can define a
-  stack that select only the ``ALIASES`` section from ``bazaar.conf``.
+  stack that select only the ``ALIASES`` section from ``breezy.conf``.
 
 * There is no easy way to get configuration options for a given repository
   or an arbitrary path. Working trees and branches are generally organized
@@ -147,7 +147,7 @@
   them. See also http://pad.lv/832046 asking for a less magical section
   matcher).
 
-* Internally, configuration files (and their fallbacks, ``bazaar.conf`` and
+* Internally, configuration files (and their fallbacks, ``breezy.conf`` and
   ``locations.conf`` for ``branch.conf``) are read every time *one* option is
   queried. Likewise, setting or deleting a configuration option implies
   writing the configuration file *immediately* after re-reading the file to
@@ -187,7 +187,7 @@
 
 While of course configurations files can be versioned they are not intended
 to be accessed in sync with the files they refer to (one can imagine
-handling versioned properties this way but this is *not* what the bazaar
+handling versioned properties this way but this is *not* what the breezy
 configuration files are targeted at). ``bzr`` will always refer to
 configuration files as they exist on disk when an option is queried or set.
 
@@ -199,7 +199,7 @@
 ------
 
 Option names are organized into a name space for a given stack. One such set
-includes ``bazaar.conf``, ``locations.conf``, ``branch.conf``, etc. Plugins
+includes ``breezy.conf``, ``locations.conf``, ``branch.conf``, etc. Plugins
 can define their own sets for their own needs. While it is conceivable that
 the same option name can be used in unrelated configuration stacks, it seems
 better to define a single name space for all options if only to avoid
@@ -294,7 +294,7 @@
 This allows list values to refer to the definition in the less specific
 configurations::
 
-  bazaar.conf:
+  breezy.conf:
     debug_flags = hpss
 
   branch.conf for mybranch:
@@ -324,7 +324,7 @@
 between a given context and the sections it applies to is defined by the
 config file.
 
-So far, Bazaar uses a glob in ``locations.conf`` and select the sections
+So far, Breezy uses a glob in ``locations.conf`` and select the sections
 that apply to a given url (or a local path).
 
 The subset is defined by the common leading path or a glob.
@@ -394,10 +394,10 @@
 The context here is a local path, absolute or relative. If the path is
 relative it is interpreted from the file base directory.
 
-Note that 'base directory' for configuration files in Bazaar directories is
+Note that 'base directory' for configuration files in Breezy directories is
 really:
 
-* the home directory for files under ``~/.bazaar``,
+* the home directory for files under ``~/.breezy``,
 
 * the ``.bzr`` base directory for files under ``.bzr``.
 
@@ -501,7 +501,7 @@
 configuration files. Note that providing a working tree object also
 implicitly provides the associated branch and repository object so only one
 of them is required (or none for configuration files specific to the user
-like ``bazaar.conf``).
+like ``breezy.conf``).
 
 Getting an option value
 ~~~~~~~~~~~~~~~~~~~~~~~
@@ -517,7 +517,7 @@
 * command-line
   ``-Ooption=value`` see http://pad.lv/491196.
 
-* ``~/.bazaar/locations.conf``
+* ``~/.config/breezy/locations.conf``
 
   When an option is set in ``locations.conf`` it overrides any other
   configuration file. This should be used with care as it allows setting a
@@ -564,10 +564,10 @@
 
   The options common to all users of a system (may be /etc/bzr/defaults
   or /usr/local/etc/bzr/defaults or
-  /Library/Preferences/com.canonical.defaults  or c:\windows\bazaar.conf
+  /Library/Preferences/com.canonical.defaults  or c:\windows\breezy.conf
   (someone fix this one please ;) depending on the OS).
 
-* ``bazaar.conf``
+* ``breezy.conf``
 
   The options the user has selected for the host he is using.
 
@@ -605,7 +605,7 @@
   sharing is implemented, we may want to use an attribute for the stack and
   deprecate both ``get_config`` and ``get_config_stack``.
 
-* Sections names in ``bazaar.conf`` are arbitrary (except ``DEFAULT``) so
+* Sections names in ``breezy.conf`` are arbitrary (except ``DEFAULT``) so
   it's easier to leave the file untouched and let plugin authors and users
   migrate away (or not) from them. For ``bzr`` itself, that means
   ``DEFAULT`` is the only section used for most of the options and provides
@@ -668,7 +668,7 @@
 ~~~~~~
 
 * list of allowed Config IDs (this allows a list of possible config files in
-  bazaar.conf only option and use it while bootstrapping the config
+  breezy.conf only option and use it while bootstrapping the config
   creations). 
 
 * blacklist of config IDs (some options *can't* be stored (modified) by the
@@ -712,9 +712,9 @@
 store examples:
 ~~~~~~~~~~~~~~~
 
-* ConfigObj (bazaar.conf)
+* ConfigObj (breezy.conf)
 
-* DB (<scheme>://bazaar.launchpad.net/bazaar.conf)
+* DB (<scheme>://breezy.launchpad.net/breezy.conf)
 
 
 Why and when locking config files matter

=== modified file 'doc/developers/testing.txt'
--- doc/developers/testing.txt	2017-05-21 18:10:28 +0000
+++ doc/developers/testing.txt	2017-07-30 17:00:52 +0000
@@ -120,7 +120,7 @@
 least because a test failed if for no other reason.
 
 Therefore you should probably add ``debug_flags = no_apport`` to your
-``bazaar.conf`` file (in ``~/.bazaar/`` on Unix), so that failures just
+``breezy.conf`` file (in ``~/.config/breezy/`` on Unix), so that failures just
 print a traceback rather than writing a crash file.
 
 .. _apport: https://launchpad.net/apport/

=== modified file 'doc/en/tutorials/tutorial.txt'
--- doc/en/tutorials/tutorial.txt	2017-05-21 13:35:49 +0000
+++ doc/en/tutorials/tutorial.txt	2017-07-30 17:00:52 +0000
@@ -121,7 +121,7 @@
 
    % brz whoami --branch "Your Name <[e-mail]>"
 
-#. Setting the email address in the ``~/.bazaar/bazaar.conf`` [1]_ by
+#. Setting the email address in the ``~/.config/breezy/breezy.conf`` [1]_ by
    adding the following lines.  Please note that  ``[DEFAULT]`` is case
    sensitive::
 
@@ -129,7 +129,7 @@
        email=Your Name <[e-mail]>
 
    As above, you can override this settings on a branch by branch basis
-   by creating a branch section in ``~/.bazaar/locations.conf`` and
+   by creating a branch section in ``~/.config/breezy/locations.conf`` and
    adding the following lines::
 
        [/the/path/to/the/branch]
@@ -141,9 +141,9 @@
    precedence) to your full email address.
 
 .. [1] On Windows, the users configuration files can be found in the
-   application data directory. So instead of ``~/.bazaar/branch.conf``
+   application data directory. So instead of ``~/.config/breezy/breezy.conf``
    the configuration file can be found as:
-   ``C:\Documents and Settings\<username>\Application Data\Breezy\2.0\branch.conf``.
+   ``C:\Documents and Settings\<username>\Application Data\Breezy\2.0\breezy.conf``.
    The same is true for ``locations.conf``, ``ignore``, and the
    ``plugins`` directory.
 
@@ -308,8 +308,8 @@
 If you use neither the ``-m`` nor the ``-F`` option then brz will open an
 editor for you to enter a message.  The editor to run is controlled by
 your ``$VISUAL`` or ``$EDITOR`` environment variable, which can be overridden
-by the ``editor`` setting in ``~/.bazaar/bazaar.conf``; ``$brz_EDITOR`` will
-override either of the above mentioned editor options.  If you quit the
+by the ``editor`` setting in ``~/.config/breezy/breezy.conf``; ``$BRZ_EDITOR``
+will override either of the above mentioned editor options.  If you quit the
 editor without making any changes, the commit will be cancelled.
 
 The file that is opened in the editor contains a horizontal line. The part
@@ -449,7 +449,7 @@
 There are some ignored files which are not project specific, but more user
 specific. Things like editor temporary files, or personal temporary files.
 Rather than add these ignores to every project, brz supports a global
-ignore file in ``~/.bazaar/ignore`` [1]_. It has the same syntax as the
+ignore file in ``~/.config/breezy/ignore`` [1]_. It has the same syntax as the
 per-project ignore file.
 
 

=== modified file 'doc/en/user-guide/configuring_bazaar.txt'
--- doc/en/user-guide/configuring_bazaar.txt	2017-05-21 13:41:54 +0000
+++ doc/en/user-guide/configuring_bazaar.txt	2017-07-30 17:00:52 +0000
@@ -59,11 +59,11 @@
 Configuration files
 -------------------
 
-Configuration files are located in ``$HOME/.bazaar`` on Unix and
+Configuration files are located in ``$HOME/.config/breezy`` on Unix and
 ``C:\Documents and Settings\<username>\Application Data\Breezy\2.0`` on
 Windows. There are three primary configuration files in this location:
 
-* ``bazaar.conf`` describes default configuration options,
+* ``breezy.conf`` describes default configuration options,
 
 * ``locations.conf`` describes configuration information for
   specific branch locations,
@@ -77,7 +77,7 @@
 override one of the values for a branch with a setting that is specific to you,
 then you can do so in ``locations.conf``.
 
-Here is sample content of ``bazaar.conf`` after setting an email address using
+Here is sample content of ``breezy.conf`` after setting an email address using
 the ``whoami`` command::
 
   [DEFAULT]
@@ -107,7 +107,7 @@
 
   * the current ``branch.conf`` is searched next,
 
-  * ``bazaar.conf`` is searched next,
+  * ``breezy.conf`` is searched next,
 
   * finally, some options can have default values generally defined in the
     code itself and not displayed by ``brz config`` (see `Configuration
@@ -123,7 +123,7 @@
     parent_location = bzr+ssh://bazaar.launchpad.net/+branch/brz/
     nickname = config-modify
     push_location = bzr+ssh://bazaar.launchpad.net/~vila/brz/config-modify/
-  bazaar:
+  breezy:
     debug_flags = hpss,
 
 Each configuration file is associated with a given scope whose name is
@@ -157,7 +157,7 @@
 
   brz config --all .*opt
 
-  bazaar:
+  breezy:
     [DEFAULT]
     opt = {other_opt}/subdir
     other_opt = root

=== modified file 'doc/en/user-guide/gpg_signatures.txt'
--- doc/en/user-guide/gpg_signatures.txt	2017-05-21 13:41:54 +0000
+++ doc/en/user-guide/gpg_signatures.txt	2017-07-30 17:00:52 +0000
@@ -28,7 +28,7 @@
 ---------------
 
 To sign commits as they are made turn on the ``create_signatures``
-configuration option in your ``bazaar.conf`` or ``locations.conf`` file::
+configuration option in your ``breezy.conf`` or ``locations.conf`` file::
 
   create_signatures = always
 
@@ -55,7 +55,7 @@
 
 By default Breezy will tell GnuPG to use a key with the same user
 identity as the one set with ``whoami``.  To override this set
-``gpg_signing_key`` in bazaar.conf or locations.conf.
+``gpg_signing_key`` in breezy.conf or locations.conf.
 
   ``gpg_signing_key=DD4D5088``
 

=== modified file 'doc/en/user-guide/recording_changes.txt'
--- doc/en/user-guide/recording_changes.txt	2017-05-21 13:41:54 +0000
+++ doc/en/user-guide/recording_changes.txt	2017-07-30 17:00:52 +0000
@@ -29,8 +29,8 @@
 If you use neither the ``-m`` nor the ``-F`` option then brz will open an
 editor for you to enter a message.  The editor to run is controlled by
 your ``$VISUAL`` or ``$EDITOR`` environment variable, which can be overridden
-by the ``editor`` setting in ``~/.bazaar/bazaar.conf``; ``$BZR_EDITOR`` will
-override either of the above mentioned editor options.  If you quit the
+by the ``editor`` setting in ``~/.config/breezy/breezy.conf``; ``$BZR_EDITOR``
+will override either of the above mentioned editor options.  If you quit the
 editor without making any changes, the commit will be cancelled.
 
 The file that is opened in the editor contains a horizontal line. The part

=== modified file 'doc/en/user-guide/resolving_conflicts.txt'
--- doc/en/user-guide/resolving_conflicts.txt	2017-05-21 13:41:54 +0000
+++ doc/en/user-guide/resolving_conflicts.txt	2017-07-30 17:00:52 +0000
@@ -77,7 +77,7 @@
 specify all conflicted files.
 
 The ``extmerge`` command uses the tool specified by the
-``external_merge`` setting in your ``bazaar.conf`` file.
+``external_merge`` setting in your ``breezy.conf`` file.
 If not set, it will look for some popular merge tools such
 as ``kdiff3`` or ``opendiff``, the latter being a command
 line interface to the FileMerge utility in OS X.

=== modified file 'doc/en/user-guide/setting_up_email.txt'
--- doc/en/user-guide/setting_up_email.txt	2017-05-21 13:41:54 +0000
+++ doc/en/user-guide/setting_up_email.txt	2017-07-30 17:00:52 +0000
@@ -21,7 +21,7 @@
 ways exist to tell Breezy what email to use:
 
 You can set your email in one of several configuration files.  Like
-other configuration values, you can set it in ``bazaar.conf`` as a
+other configuration values, you can set it in ``breezy.conf`` as a
 general setting.  If you want to override the value for a particular
 branch, or set of branches, you can use ``locations.conf``.
 ``.brz/branch/branch.conf`` will also work, but will cause all commits
@@ -35,7 +35,7 @@
     file.
  #. If an email is set four your current branch in the
     ``.brz/branch/branch.conf`` file.
- #. If an email is set in the ``bazaar.conf`` default configuration file.
+ #. If an email is set in the ``breezy.conf`` default configuration file.
  #. If the `EMAIL` environment variable is set.
  #. Breezy will try to guess based on your username and the hostname.
 
@@ -56,13 +56,13 @@
 
     % brz whoami --branch "Joe Cool <[e-mail]>"
 
-These modify your global ``bazaar.conf`` or branch ``branch.conf`` file, respectively.
+These modify your global ``breezy.conf`` or branch ``branch.conf`` file, respectively.
 
 Setting email via default configuration file
 --------------------------------------------
 
-To use the default ini file, create or edit the ``bazaar.conf`` file (in
-``~/.bazaar/`` on Unix and in ``%APPDATA%\bazaar\2.0\`` in Windows)
+To use the default ini file, create or edit the ``breezy.conf`` file (in
+``~/.config/breezy/`` on Unix and in ``%APPDATA%\breezy\2.0\`` in Windows)
 and set an email address as shown below.  Please note that the word DEFAULT
 is case sensitive, and must be in upper-case.
 ::
@@ -86,7 +86,7 @@
     email=Your Name <[e-mail]>
 
 This will set your email address in the branch at ``/some/branch/location``,
-overriding the default specified in the ``bazaar.conf`` above.
+overriding the default specified in the ``breezy.conf`` above.
 
 Setting email via environment variable
 --------------------------------------

=== modified file 'doc/en/user-guide/using_aliases.txt'
--- doc/en/user-guide/using_aliases.txt	2017-05-21 13:41:54 +0000
+++ doc/en/user-guide/using_aliases.txt	2017-07-30 17:00:52 +0000
@@ -11,7 +11,7 @@
 ----------------
 
 Command aliases can be defined in the ``[ALIASES]`` section of your
-``bazaar.conf`` file. Aliases start with the alias name, then an
+``breezy.conf`` file. Aliases start with the alias name, then an
 equal sign, then a command fragment.  Here's an example ALIASES section::
 
     [ALIASES]