Merge lp:~jelmer/brz/homedir-location into lp:brz/3.0

Proposed by Jelmer Vernooij on 2019-02-27
Status: Merged
Approved by: Jelmer Vernooij on 2019-03-03
Approved revision: 7291
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/homedir-location
Merge into: lp:brz/3.0
Diff against target: 269 lines (+36/-33)
10 files modified
breezy/builtins.py (+19/-18)
breezy/globbing.py (+3/-1)
breezy/ignores.py (+1/-1)
doc/developers/apport.txt (+1/-1)
doc/developers/contribution-quickstart.txt (+1/-1)
doc/developers/plugin-development.txt (+1/-1)
doc/en/admin-guide/hooks-plugins.txt (+4/-4)
doc/en/admin-guide/migration.txt (+1/-1)
doc/en/user-guide/controlling_registration.txt (+3/-3)
doc/en/user-guide/plugins.txt (+2/-2)
To merge this branch: bzr merge lp:~jelmer/brz/homedir-location
Reviewer Review Type Date Requested Status
Martin Packman 2019-02-27 Approve on 2019-03-03
Review via email: mp+363701@code.launchpad.net

Commit message

Update references to home location.

Description of the change

Update references to home location.

~/.config/breezy rather than ~/.bazaar.

To post a comment you must log in.
Martin Packman (gz) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/builtins.py'
2--- breezy/builtins.py 2019-02-09 03:23:20 +0000
3+++ breezy/builtins.py 2019-02-27 01:45:35 +0000
4@@ -348,7 +348,7 @@
5 Not versioned and not matching an ignore pattern.
6
7 Additionally for directories, symlinks and files with a changed
8- executable bit, Bazaar indicates their type using a trailing
9+ executable bit, Breezy indicates their type using a trailing
10 character: '/', '@' or '*' respectively. These decorations can be
11 disabled using the '--no-classify' option.
12
13@@ -1728,7 +1728,7 @@
14 If the tree's branch is bound to a master branch, brz will also update
15 the branch from the master.
16
17- You cannot update just a single file or directory, because each Bazaar
18+ You cannot update just a single file or directory, because each Breezy
19 working tree has just a single basis revision. If you want to restore a
20 file that has been removed locally, use 'brz revert' instead of 'brz
21 update'. If you want to restore a file to its state in a previous
22@@ -1871,11 +1871,11 @@
23 class cmd_remove(Command):
24 __doc__ = """Remove files or directories.
25
26- This makes Bazaar stop tracking changes to the specified files. Bazaar will
27+ This makes Breezy stop tracking changes to the specified files. Breezy will
28 delete them if they can easily be recovered using revert otherwise they
29 will be backed up (adding an extension of the form .~#~). If no options or
30- parameters are given Bazaar will scan for files that are being tracked by
31- Bazaar but missing in your tree and stop tracking them for you.
32+ parameters are given Breezy will scan for files that are being tracked by
33+ Breezy but missing in your tree and stop tracking them for you.
34 """
35 takes_args = ['file*']
36 takes_options = ['verbose',
37@@ -3091,9 +3091,10 @@
38 using this command or directly by using an editor, be sure to commit
39 it.
40
41- Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
42- the global ignore file can be found in the application data directory as
43- C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
44+ Breezy also supports a global ignore file ~/.config/breezy/ignore. On
45+ Windows the global ignore file can be found in the application data
46+ directory as
47+ C:\\Documents and Settings\\<user>\\Application Data\\Breezy\\3.0\\ignore.
48 Global ignores are not touched by this command. The global ignore file
49 can be edited directly using an editor.
50
51@@ -3732,7 +3733,7 @@
52 unreferenced ancestors
53 Texts that are ancestors of other texts, but
54 are not properly referenced by the revision ancestry. This is a
55- subtle problem that Bazaar can work around.
56+ subtle problem that Breezy can work around.
57
58 unique file texts
59 This is the total number of unique file contents
60@@ -3744,7 +3745,7 @@
61 entries are modified, but the file contents are not. It does not
62 indicate a problem.
63
64- If no restrictions are specified, all Bazaar data that is found at the given
65+ If no restrictions are specified, all data that is found at the given
66 location will be checked.
67
68 :Examples:
69@@ -3786,10 +3787,10 @@
70 __doc__ = """Upgrade a repository, branch or working tree to a newer format.
71
72 When the default format has changed after a major new release of
73- Bazaar, you may be informed during certain operations that you
74+ Bazaar/Breezy, you may be informed during certain operations that you
75 should upgrade. Upgrading to a newer format may improve performance
76 or make new features available. It may however limit interoperability
77- with older repositories or with older versions of Bazaar.
78+ with older repositories or with older versions of Bazaar or Breezy.
79
80 If you wish to upgrade to a particular format rather than the
81 current default, that can be specified using the --format option.
82@@ -3811,7 +3812,7 @@
83 If the conversion of a branch fails, remaining branches are still
84 tried.
85
86- For more information on upgrades, see the Bazaar Upgrade Guide,
87+ For more information on upgrades, see the Breezy Upgrade Guide,
88 https://www.breezy-vcs.org/doc/en/upgrade-guide/.
89 """
90
91@@ -4312,7 +4313,7 @@
92 through OTHER, excluding BASE but including OTHER, will be merged. If this
93 causes some revisions to be skipped, i.e. if the destination branch does
94 not already contain revision BASE, such a merge is commonly referred to as
95- a "cherrypick". Unlike a normal merge, Bazaar does not currently track
96+ a "cherrypick". Unlike a normal merge, Breezy does not currently track
97 cherrypicks. The changes look like a normal commit, and the history of the
98 changes from the other branch is not stored in the commit.
99
100@@ -5133,8 +5134,8 @@
101
102 --verbose shows the path where each plugin is located.
103
104- A plugin is an external component for Bazaar that extends the
105- revision control system, by adding or replacing code in Bazaar.
106+ A plugin is an external component for Breezy that extends the
107+ revision control system, by adding or replacing code in Breezy.
108 Plugins can do a variety of things, including overriding commands,
109 adding new commands, providing additional network transports and
110 customizing log output.
111@@ -5498,7 +5499,7 @@
112 :Examples:
113 brz break-lock
114 brz break-lock brz+ssh://example.com/brz/foo
115- brz break-lock --conf ~/.bazaar
116+ brz break-lock --conf ~/.config/breezy
117 """
118
119 takes_args = ['location?']
120@@ -5789,7 +5790,7 @@
121 branch containing submit_branch in its ancestory without needing access to
122 the source branch.
123
124- If --no-bundle is specified, then Bazaar doesn't send the contents of the
125+ If --no-bundle is specified, then Breezy doesn't send the contents of the
126 revisions, but only a structured request to merge from the
127 public_location. In that case the public_branch is needed and it must be
128 up-to-date and accessible to the recipient. The public_branch is always
129
130=== modified file 'breezy/globbing.py'
131--- breezy/globbing.py 2018-11-18 19:48:57 +0000
132+++ breezy/globbing.py 2019-02-27 01:45:35 +0000
133@@ -248,7 +248,9 @@
134 # the combined pattern we sent to regex. Instead we indicate to
135 # the user that an ignore file needs fixing.
136 mutter('Invalid pattern found in regex: %s.', e.msg)
137- e.msg = "File ~/.bazaar/ignore or .bzrignore contains error(s)."
138+ e.msg = (
139+ "File ~/.config/breezy/ignore or "
140+ ".bzrignore contains error(s).")
141 bad_patterns = ''
142 for _, patterns in self._regex_patterns:
143 for p in patterns:
144
145=== modified file 'breezy/ignores.py'
146--- breezy/ignores.py 2018-11-12 01:41:38 +0000
147+++ breezy/ignores.py 2019-02-27 01:45:35 +0000
148@@ -33,7 +33,7 @@
149 )
150 """)
151
152-# ~/.bazaar/ignore will be filled out using
153+# ~/.config/breezy/ignore will be filled out using
154 # this ignore list, if it does not exist
155 # please keep these sorted (in C locale order) to aid merging
156 USER_DEFAULTS = [
157
158=== modified file 'doc/developers/apport.txt'
159--- doc/developers/apport.txt 2009-12-02 20:34:07 +0000
160+++ doc/developers/apport.txt 2019-02-27 01:45:35 +0000
161@@ -41,7 +41,7 @@
162
163 #. An exception reaches the top-level handler.
164
165-#. We log it in apport-format to a file in ~/.bazaar/crash.
166+#. We log it in apport-format to a file in ~/.config/breezy/crash.
167
168 #. We tell the user where that file is, and invite them to file a bug
169 report.
170
171=== modified file 'doc/developers/contribution-quickstart.txt'
172--- doc/developers/contribution-quickstart.txt 2019-01-01 21:38:07 +0000
173+++ doc/developers/contribution-quickstart.txt 2019-02-27 01:45:35 +0000
174@@ -46,7 +46,7 @@
175 closely-related cluster of bugs per branch, to make reviews and merges
176 flow more smoothly.
177
178-You probably want this configuration in ``~/.bazaar/locations.conf``::
179+You probably want this configuration in ``~/.config/breezy/locations.conf``::
180
181 [/home/USER/brz]
182 push_location = lp:~LAUNCHPAD_USER/brz/{branchname}
183
184=== modified file 'doc/developers/plugin-development.txt'
185--- doc/developers/plugin-development.txt 2018-11-22 02:23:26 +0000
186+++ doc/developers/plugin-development.txt 2019-02-27 01:45:35 +0000
187@@ -31,7 +31,7 @@
188 To ensure your plugin under development is available to Breezy, set
189 the ``BRZ_PLUGIN_PATH`` environment variable to its parent directory.
190 Alternatively, you may wish to develop your plugin within a directory
191-under your personal plugins area (``~/.bazaar/plugins`` on GNU/Linux)
192+under your personal plugins area (``~/.config/breezy/plugins`` on GNU/Linux)
193 or put a symbolic link in that area pointing to your plugin under
194 test. Finally you can use ``BRZ_PLUGINS_AT`` to point to a specific
195 directory for a specific plugin (separated by your platform's value of
196
197=== modified file 'doc/en/admin-guide/hooks-plugins.txt'
198--- doc/en/admin-guide/hooks-plugins.txt 2018-11-18 13:20:01 +0000
199+++ doc/en/admin-guide/hooks-plugins.txt 2019-02-27 01:45:35 +0000
200@@ -25,10 +25,10 @@
201 http://doc.bazaar.canonical.com/plugins/en/. For purposes of installation,
202 plugins are simply python packages. They can be installed alongside Bazaar in
203 the ``bzrlib.plugins`` package using each plugin's ``setup.py``. They can
204-also be installed in the plugin path which is the user's ``~/.bazaar/plugins``
205-directory or can be specified with the ``BZR_PLUGIN_PATH`` environment
206-variable. See ``bzr help configuration`` for more on specifying the location
207-of plugins.
208+also be installed in the plugin path which is the user's
209+``~/.config/breezy/plugins`` directory or can be specified with the
210+``BZR_PLUGIN_PATH`` environment variable. See ``bzr help configuration`` for
211+more on specifying the location of plugins.
212
213
214 Email Notification
215
216=== modified file 'doc/en/admin-guide/migration.txt'
217--- doc/en/admin-guide/migration.txt 2018-11-18 13:20:01 +0000
218+++ doc/en/admin-guide/migration.txt 2019-02-27 01:45:35 +0000
219@@ -56,7 +56,7 @@
220 This command has flexible ways to specify what paths within the Subversion
221 repository contain branches and which contain tags. For example, the
222 recommended layout for Subversion projects (called ``trunk`` by the svn
223-plugin) could be specified in ``~/.bazaar/subversion.conf`` as
224+plugin) could be specified in ``~/.config/breezy/subversion.conf`` as
225
226 ::
227
228
229=== modified file 'doc/en/user-guide/controlling_registration.txt'
230--- doc/en/user-guide/controlling_registration.txt 2017-05-21 13:41:54 +0000
231+++ doc/en/user-guide/controlling_registration.txt 2019-02-27 01:45:35 +0000
232@@ -95,12 +95,12 @@
233 There are some ignored files which are not project specific, but more user
234 specific. Things like editor temporary files, or personal temporary files.
235 Rather than add these ignores to every project, brz supports a global
236-ignore file in ``~/.bazaar/ignore`` [#]_. It has the same syntax as the
237+ignore file in ``~/.config/breezy/ignore`` [#]_. It has the same syntax as the
238 per-project ignore file.
239
240 .. [#] On Windows, the users configuration files can be found in the
241- application data directory. So instead of ``~/.bazaar/branch.conf``
242+ application data directory. So instead of ``~/.config/breezy/branch.conf``
243 the configuration file can be found as:
244- ``C:\Documents and Settings\<username>\Application Data\Breezy\2.0\branch.conf``.
245+ ``C:\Documents and Settings\<username>\Application Data\Breezy\3.0\branch.conf``.
246 The same is true for ``locations.conf``, ``ignore``, and the
247 ``plugins`` directory.
248
249=== modified file 'doc/en/user-guide/plugins.txt'
250--- doc/en/user-guide/plugins.txt 2017-05-21 13:41:54 +0000
251+++ doc/en/user-guide/plugins.txt 2019-02-27 01:45:35 +0000
252@@ -35,7 +35,7 @@
253
254 Installing a plugin is very easy! If not already created, create a
255 ``plugins`` directory under your Breezy configuration directory,
256-``~/.bazaar/`` on Unix and
257+``~/.config/breezy/`` on Unix and
258 ``C:\Documents and Settings\<username>\Application Data\Breezy\2.0\``
259 on Windows. Within this directory (referred to as $BZR_HOME below),
260 each plugin is placed in its own subdirectory.
261@@ -45,7 +45,7 @@
262 one can perform the following::
263
264 brz branch http://panoramicfeedback.com/opensource/brz/brztools
265- ~/.bazaar/plugins/brztools
266+ ~/.config/breezy/plugins/brztools
267
268 When installing plugins, the directories that you install them in must
269 be valid python identifiers. This means that they can only contain

Subscribers

People subscribed via source and target branches