Merge lp:~jelmer/brz/init-shared-repo into lp:brz

Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: 7388
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/init-shared-repo
Merge into: lp:brz
Diff against target: 769 lines (+103/-77)
33 files modified
breezy/builtins.py (+4/-4)
breezy/errors.py (+7/-0)
breezy/git/dir.py (+3/-0)
breezy/git/tests/test_dir.py (+8/-0)
breezy/help_topics/__init__.py (+8/-8)
breezy/plugins/bash_completion/tests/test_bashcomp.py (+5/-3)
breezy/plugins/weave_fmt/test_repository.py (+1/-1)
breezy/tests/blackbox/test_branches.py (+2/-2)
breezy/tests/blackbox/test_push.py (+1/-1)
breezy/tests/blackbox/test_reconfigure.py (+2/-2)
breezy/tests/blackbox/test_revision_history.py (+3/-3)
breezy/tests/blackbox/test_shared_repository.py (+20/-20)
breezy/tests/blackbox/test_switch.py (+1/-1)
breezy/tests/blackbox/test_upgrade.py (+1/-1)
breezy/tests/commands/test_init_repository.py (+3/-3)
doc/developers/HACKING.txt (+1/-1)
doc/developers/contribution-quickstart.txt (+1/-1)
doc/developers/development-repo.txt (+3/-3)
doc/developers/packrepo.txt (+3/-3)
doc/en/admin-guide/advanced.txt (+1/-1)
doc/en/admin-guide/simple-setups.txt (+1/-1)
doc/en/mini-tutorial/index.txt (+2/-2)
doc/en/release-notes/brz-3.1.txt (+5/-0)
doc/en/tutorials/centralized_workflow.txt (+2/-2)
doc/en/user-guide/branching_a_project.txt (+1/-1)
doc/en/user-guide/organizing_branches.txt (+1/-1)
doc/en/user-guide/organizing_your_workspace.txt (+2/-2)
doc/en/user-guide/publishing_a_branch.txt (+3/-3)
doc/en/user-guide/reusing_a_checkout.txt (+1/-1)
doc/en/user-guide/shared_repository_layouts.txt (+1/-1)
doc/en/user-guide/starting_a_project.txt (+2/-2)
doc/en/user-guide/svn_plugin.txt (+2/-2)
tools/win32/build_release.py (+2/-1)
To merge this branch: bzr merge lp:~jelmer/brz/init-shared-repo
Reviewer Review Type Date Requested Status
Martin Packman Approve
Review via email: mp+372116@code.launchpad.net

Commit message

Rename init-repo to init-shared-repo.

Description of the change

Rename init-repo to init-shared-repo.

(but leave an alias in place)

This should make it clearer that this command only creates a specific kind of repositories.

To post a comment you must log in.
Revision history for this message
Martin Packman (gz) wrote :

Okay, makes sense to me.

review: Approve
Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :
lp:~jelmer/brz/init-shared-repo updated
7388. By Jelmer Vernooij

Fix import.

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-09-27 01:02:32 +0000
3+++ breezy/builtins.py 2019-10-13 18:08:15 +0000
4@@ -2033,7 +2033,7 @@
5 brz commit -m "imported project"
6 """
7
8- _see_also = ['init-repository', 'branch', 'checkout']
9+ _see_also = ['init-shared-repository', 'branch', 'checkout']
10 takes_args = ['location?']
11 takes_options = [
12 Option('create-prefix',
13@@ -2131,7 +2131,7 @@
14 self.outf.write(gettext("Using shared repository: %s\n") % url)
15
16
17-class cmd_init_repository(Command):
18+class cmd_init_shared_repository(Command):
19 __doc__ = """Create a shared repository for branches to share storage space.
20
21 New branches created under the repository directory will store their
22@@ -2149,7 +2149,7 @@
23 :Examples:
24 Create a shared repository holding just branches::
25
26- brz init-repo --no-trees repo
27+ brz init-shared-repo --no-trees repo
28 brz init repo/trunk
29
30 Make a lightweight checkout elsewhere::
31@@ -2173,7 +2173,7 @@
32 help='Branches in the repository will default to'
33 ' not having a working tree.'),
34 ]
35- aliases = ["init-repo"]
36+ aliases = ["init-shared-repo", "init-repo"]
37
38 def run(self, location, format=None, no_trees=False):
39 if format is None:
40
41=== modified file 'breezy/errors.py'
42--- breezy/errors.py 2019-06-18 11:21:15 +0000
43+++ breezy/errors.py 2019-10-13 18:08:15 +0000
44@@ -1872,6 +1872,13 @@
45 """
46
47
48+class SharedRepositoriesUnsupported(UnsupportedOperation):
49+ _fmt = "Shared repositories are not supported by %(format)r."
50+
51+ def __init__(self, format):
52+ BzrError.__init__(self, format=format)
53+
54+
55 class GhostTagsNotSupported(BzrError):
56
57 _fmt = "Ghost tags not supported by format %(format)r."
58
59=== modified file 'breezy/git/dir.py'
60--- breezy/git/dir.py 2019-08-11 16:27:38 +0000
61+++ breezy/git/dir.py 2019-10-13 18:08:15 +0000
62@@ -381,6 +381,9 @@
63 stack_on_pwd=None, repo_format_name=None,
64 make_working_trees=None,
65 shared_repo=False, vfs_only=False):
66+ if shared_repo:
67+ raise brz_errors.SharedRepositoriesUnsupported(self)
68+
69 def make_directory(transport):
70 transport.mkdir('.')
71 return transport
72
73=== modified file 'breezy/git/tests/test_dir.py'
74--- breezy/git/tests/test_dir.py 2018-11-11 04:08:32 +0000
75+++ breezy/git/tests/test_dir.py 2019-10-13 18:08:15 +0000
76@@ -27,6 +27,7 @@
77 errors,
78 urlutils,
79 )
80+from ...transport import get_transport
81 from ...tests import TestSkipped
82
83 from .. import (
84@@ -76,6 +77,13 @@
85 self.assertEqual(gd.control_url.rstrip('/'),
86 urlutils.local_path_to_url(os.path.abspath(gitrepo.controldir())))
87
88+ def test_shared_repository(self):
89+ t = get_transport('.')
90+ self.assertRaises(
91+ errors.SharedRepositoriesUnsupported,
92+ dir.LocalGitControlDirFormat().initialize_on_transport_ex, t,
93+ shared_repo=True)
94+
95
96 class TestGitDirFormat(tests.TestCase):
97
98
99=== modified file 'breezy/help_topics/__init__.py'
100--- breezy/help_topics/__init__.py 2019-06-16 19:53:27 +0000
101+++ breezy/help_topics/__init__.py 2019-10-13 18:08:15 +0000
102@@ -453,11 +453,11 @@
103 generally a large space saving. For some operations (e.g. branching
104 within the repository) this translates in to a large time saving.
105
106-To create a shared repository use the init-repository command (or the alias
107-init-repo). This command takes the location of the repository to create. This
108-means that 'brz init-repository repo' will create a directory named 'repo',
109-which contains a shared repository. Any new branches that are created in this
110-directory will then use it for storage.
111+To create a shared repository use the init-shared-repository command (or the
112+alias init-shared-repo). This command takes the location of the repository to
113+create. This means that 'brz init-shared-repository repo' will create a
114+directory named 'repo', which contains a shared repository. Any new branches
115+that are created in this directory will then use it for storage.
116
117 It is a good idea to create a repository whenever you might create more
118 than one branch of a project. This is true for both working areas where you
119@@ -466,12 +466,12 @@
120 trees. Since the files in the branch will not be edited directly there is no
121 need to use up disk space for a working tree. To create a repository in which
122 the branches will not have working trees pass the '--no-trees' option to
123-'init-repository'.
124+'init-shared-repository'.
125
126 Related commands::
127
128- init-repository Create a shared repository. Use --no-trees to create one
129- in which new branches won't get a working tree.
130+ init-shared-repository Create a shared repository. Use --no-trees to create
131+ one in which new branches won't get a working tree.
132 """
133
134
135
136=== modified file 'breezy/plugins/bash_completion/tests/test_bashcomp.py'
137--- breezy/plugins/bash_completion/tests/test_bashcomp.py 2018-11-11 04:08:32 +0000
138+++ breezy/plugins/bash_completion/tests/test_bashcomp.py 2019-10-13 18:08:15 +0000
139@@ -117,7 +117,8 @@
140
141 def test_cmd_ini(self):
142 self.complete(['brz', 'ini'])
143- self.assertCompletionContains('init', 'init-repo', 'init-repository')
144+ self.assertCompletionContains(
145+ 'init', 'init-shared-repo', 'init-shared-repository')
146 self.assertCompletionOmits('commit')
147
148 def test_init_opts(self):
149@@ -297,8 +298,9 @@
150 def test_commands(self):
151 dc = DataCollector()
152 dc.commands()
153- self.assertSubset(['init', 'init-repo', 'init-repository'],
154- dc.data.all_command_aliases())
155+ self.assertSubset(
156+ ['init', 'init-shared-repo', 'init-shared-repository'],
157+ dc.data.all_command_aliases())
158
159 def test_commands_from_plugins(self):
160 dc = DataCollector()
161
162=== modified file 'breezy/plugins/weave_fmt/test_repository.py'
163--- breezy/plugins/weave_fmt/test_repository.py 2019-06-29 19:54:32 +0000
164+++ breezy/plugins/weave_fmt/test_repository.py 2019-10-13 18:08:15 +0000
165@@ -257,7 +257,7 @@
166 class TestInterWeaveRepo(TestCaseWithTransport):
167
168 def test_make_repository(self):
169- out, err = self.run_bzr("init-repository --format=weave a")
170+ out, err = self.run_bzr("init-shared-repository --format=weave a")
171 self.assertEqual(out,
172 """Standalone tree (format: weave)
173 Location:
174
175=== modified file 'breezy/tests/blackbox/test_branches.py'
176--- breezy/tests/blackbox/test_branches.py 2018-07-07 15:06:42 +0000
177+++ breezy/tests/blackbox/test_branches.py 2019-10-13 18:08:15 +0000
178@@ -32,14 +32,14 @@
179
180 def test_no_branch(self):
181 # Listing the branches in a control directory without branches.
182- self.run_bzr('init-repo a')
183+ self.run_bzr('init-shared-repo a')
184 out, err = self.run_bzr('branches a')
185 self.assertEqual(out, "")
186
187 def test_default_current_dir(self):
188 # "brz branches" list the branches in the current directory
189 # if no location was specified.
190- self.run_bzr('init-repo a')
191+ self.run_bzr('init-shared-repo a')
192 out, err = self.run_bzr('branches', working_dir='a')
193 self.assertEqual(out, "")
194
195
196=== modified file 'breezy/tests/blackbox/test_push.py'
197--- breezy/tests/blackbox/test_push.py 2019-02-16 04:57:50 +0000
198+++ breezy/tests/blackbox/test_push.py 2019-10-13 18:08:15 +0000
199@@ -949,7 +949,7 @@
200
201 def test_push_with_revspec(self):
202 self.run_script("""
203- $ brz init-repo .
204+ $ brz init-shared-repo .
205 Shared repository with trees (format: 2a)
206 Location:
207 shared repository: .
208
209=== modified file 'breezy/tests/blackbox/test_reconfigure.py'
210--- breezy/tests/blackbox/test_reconfigure.py 2018-11-11 04:08:32 +0000
211+++ breezy/tests/blackbox/test_reconfigure.py 2019-10-13 18:08:15 +0000
212@@ -190,7 +190,7 @@
213 $ echo foo > branch/foo
214 $ brz add -q branch/foo
215 $ brz commit -q -m msg branch
216-$ brz init-repo -q .
217+$ brz init-shared-repo -q .
218 $ brz reconfigure --branch --use-shared branch
219 $ brz info branch
220 Repository branch (format: ...)
221@@ -205,7 +205,7 @@
222 $ echo foo > branch/foo
223 $ brz add -q branch/foo
224 $ brz commit -q -m msg branch
225-$ brz init-repo -q .
226+$ brz init-shared-repo -q .
227 $ brz reconfigure --use-shared --branch branch
228 $ brz info branch
229 Repository branch (format: ...)
230
231=== modified file 'breezy/tests/blackbox/test_revision_history.py'
232--- breezy/tests/blackbox/test_revision_history.py 2018-07-07 15:06:42 +0000
233+++ breezy/tests/blackbox/test_revision_history.py 2019-10-13 18:08:15 +0000
234@@ -55,14 +55,14 @@
235 def test_revision_history_with_repo_branch(self):
236 """With a repository branch location."""
237 self._build_branch()
238- self.run_bzr('init-repo repo')
239+ self.run_bzr('init-shared-repo repo')
240 self.run_bzr('branch test repo/test')
241 self._check_revision_history('repo/test')
242
243 def test_revision_history_with_checkout(self):
244 """With a repository branch checkout location."""
245 self._build_branch()
246- self.run_bzr('init-repo repo')
247+ self.run_bzr('init-shared-repo repo')
248 self.run_bzr('branch test repo/test')
249 self.run_bzr('checkout repo/test test-checkout')
250 self._check_revision_history('test-checkout')
251@@ -70,7 +70,7 @@
252 def test_revision_history_with_lightweight_checkout(self):
253 """With a repository branch lightweight checkout location."""
254 self._build_branch()
255- self.run_bzr('init-repo repo')
256+ self.run_bzr('init-shared-repo repo')
257 self.run_bzr('branch test repo/test')
258 self.run_bzr('checkout --lightweight repo/test test-checkout')
259 self._check_revision_history('test-checkout')
260
261=== modified file 'breezy/tests/blackbox/test_shared_repository.py'
262--- breezy/tests/blackbox/test_shared_repository.py 2018-11-11 04:08:32 +0000
263+++ breezy/tests/blackbox/test_shared_repository.py 2019-10-13 18:08:15 +0000
264@@ -28,7 +28,7 @@
265 class TestSharedRepo(TestCaseInTempDir):
266
267 def test_make_repository(self):
268- out, err = self.run_bzr("init-repository a")
269+ out, err = self.run_bzr("init-shared-repository a")
270 self.assertEqual(out,
271 """Shared repository with trees (format: 2a)
272 Location:
273@@ -41,7 +41,7 @@
274 self.assertRaises(errors.NoWorkingTree, dir.open_workingtree)
275
276 def test_make_repository_quiet(self):
277- out, err = self.run_bzr("init-repository a -q")
278+ out, err = self.run_bzr("init-shared-repository a -q")
279 self.assertEqual(out, "")
280 self.assertEqual(err, "")
281 dir = ControlDir.open('a')
282@@ -54,12 +54,12 @@
283
284 (Malone #38331)
285 """
286- out, err = self.run_bzr("init-repository .")
287+ out, err = self.run_bzr("init-shared-repository .")
288 dir = ControlDir.open('.')
289 self.assertTrue(dir.open_repository())
290
291 def test_init(self):
292- self.run_bzr("init-repo a")
293+ self.run_bzr("init-shared-repo a")
294 self.run_bzr("init --format=default a/b")
295 dir = ControlDir.open('a')
296 self.assertIs(dir.open_repository().is_shared(), True)
297@@ -71,7 +71,7 @@
298 wt = bdir.open_workingtree()
299
300 def test_branch(self):
301- self.run_bzr("init-repo a")
302+ self.run_bzr("init-shared-repo a")
303 self.run_bzr("init --format=default a/b")
304 self.run_bzr('branch a/b a/c')
305 cdir = ControlDir.open('a/c')
306@@ -80,7 +80,7 @@
307 cdir.open_workingtree()
308
309 def test_branch_tree(self):
310- self.run_bzr("init-repo --trees a")
311+ self.run_bzr("init-shared-repo --trees a")
312 self.run_bzr("init --format=default b")
313 with open('b/hello', 'wt') as f:
314 f.write('bar')
315@@ -96,28 +96,28 @@
316
317 def test_trees_default(self):
318 # 0.15 switched to trees by default
319- self.run_bzr("init-repo repo")
320+ self.run_bzr("init-shared-repo repo")
321 repo = ControlDir.open("repo").open_repository()
322 self.assertEqual(True, repo.make_working_trees())
323
324 def test_trees_argument(self):
325 # Supplying the --trees argument should be harmless,
326 # as it was previously non-default we need to get it right.
327- self.run_bzr("init-repo --trees trees")
328+ self.run_bzr("init-shared-repo --trees trees")
329 repo = ControlDir.open("trees").open_repository()
330 self.assertEqual(True, repo.make_working_trees())
331
332 def test_no_trees_argument(self):
333 # --no-trees should make it so that there is no working tree
334- self.run_bzr("init-repo --no-trees notrees")
335+ self.run_bzr("init-shared-repo --no-trees notrees")
336 repo = ControlDir.open("notrees").open_repository()
337 self.assertEqual(False, repo.make_working_trees())
338
339 def test_init_repo_smart_acceptance(self):
340- # The amount of hpss calls made on init-repo to a smart server should
341- # be fixed.
342+ # The amount of hpss calls made on init-shared-repo to a smart server
343+ # should be fixed.
344 self.setup_smart_server_with_call_log()
345- self.run_bzr(['init-repo', self.get_url('repo')])
346+ self.run_bzr(['init-shared-repo', self.get_url('repo')])
347 # This figure represent the amount of work to perform this use case. It
348 # is entirely ok to reduce this number if a test fails due to rpc_count
349 # being too low. If rpc_count increases, more network roundtrips have
350@@ -128,7 +128,7 @@
351 self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
352
353 def test_notification_on_branch_from_repository(self):
354- out, err = self.run_bzr("init-repository -q a")
355+ out, err = self.run_bzr("init-shared-repository -q a")
356 self.assertEqual(out, "")
357 self.assertEqual(err, "")
358 dir = ControlDir.open('a')
359@@ -150,19 +150,19 @@
360 ControlDir.hooks.install_named_hook(
361 'post_repo_init', calls.append, None)
362 self.assertLength(0, calls)
363- self.run_bzr("init-repository a")
364+ self.run_bzr("init-shared-repository a")
365 self.assertLength(1, calls)
366
367 def test_init_repo_without_username(self):
368- """Ensure init-repo works if username is not set.
369+ """Ensure init-shared-repo works if username is not set.
370 """
371 # brz makes user specified whoami mandatory for operations
372- # like commit as whoami is recorded. init-repo however is not so final
373- # and uses whoami only in a lock file. Without whoami the login name
374- # is used. This test is to ensure that init-repo passes even when whoami
375- # is not available.
376+ # like commit as whoami is recorded. init-shared-repo however is not so
377+ # final and uses whoami only in a lock file. Without whoami the login name
378+ # is used. This test is to ensure that init-shared-repo passes even
379+ # when whoami is not available.
380 self.overrideEnv('EMAIL', None)
381 self.overrideEnv('BRZ_EMAIL', None)
382- out, err = self.run_bzr(['init-repo', 'foo'])
383+ out, err = self.run_bzr(['init-shared-repo', 'foo'])
384 self.assertEqual(err, '')
385 self.assertTrue(os.path.exists('foo'))
386
387=== modified file 'breezy/tests/blackbox/test_switch.py'
388--- breezy/tests/blackbox/test_switch.py 2019-02-09 02:59:15 +0000
389+++ breezy/tests/blackbox/test_switch.py 2019-10-13 18:08:15 +0000
390@@ -407,7 +407,7 @@
391 super(TestSwitchParentLocationBase, self).setUp()
392 self.script_runner = script.ScriptRunner()
393 self.script_runner.run_script(self, '''
394- $ brz init-repo --no-trees repo
395+ $ brz init-shared-repo --no-trees repo
396 Shared repository...
397 Location:
398 shared repository: repo
399
400=== modified file 'breezy/tests/blackbox/test_upgrade.py'
401--- breezy/tests/blackbox/test_upgrade.py 2018-11-11 04:08:32 +0000
402+++ breezy/tests/blackbox/test_upgrade.py 2019-10-13 18:08:15 +0000
403@@ -189,7 +189,7 @@
404 RepositoryFormatKnitPack1))
405
406 def test_upgrade_repo(self):
407- self.run_bzr('init-repository --format=pack-0.92 repo')
408+ self.run_bzr('init-shared-repository --format=pack-0.92 repo')
409 self.run_bzr('upgrade --format=2a repo')
410
411 def assertLegalOption(self, option_str):
412
413=== modified file 'breezy/tests/commands/test_init_repository.py'
414--- breezy/tests/commands/test_init_repository.py 2018-11-11 04:08:32 +0000
415+++ breezy/tests/commands/test_init_repository.py 2019-10-13 18:08:15 +0000
416@@ -14,7 +14,7 @@
417 # along with this program; if not, write to the Free Software
418 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
419
420-from ...builtins import cmd_init_repository
421+from ...builtins import cmd_init_shared_repository
422 from .. import (
423 transport_util,
424 ui_testing,
425@@ -27,8 +27,8 @@
426 super(TestInitRepository, self).setUp()
427 self.start_logging_connections()
428
429- def test_init_repository(self):
430- cmd = cmd_init_repository()
431+ def test_init_shared_repository(self):
432+ cmd = cmd_init_shared_repository()
433 # We don't care about the ouput but 'outf' should be defined
434 cmd.outf = ui_testing.StringIOWithEncoding()
435 cmd.run(self.get_url())
436
437=== modified file 'doc/developers/HACKING.txt'
438--- doc/developers/HACKING.txt 2018-11-26 00:07:02 +0000
439+++ doc/developers/HACKING.txt 2019-10-13 18:08:15 +0000
440@@ -87,7 +87,7 @@
441 copy of bzr.dev?`_.)
442 ::
443
444- $ brz init-repo ~/bzr
445+ $ brz init-shared-repo ~/bzr
446 $ cd ~/bzr
447 $ brz branch lp:brz bzr.dev
448
449
450=== modified file 'doc/developers/contribution-quickstart.txt'
451--- doc/developers/contribution-quickstart.txt 2019-02-15 17:41:17 +0000
452+++ doc/developers/contribution-quickstart.txt 2019-10-13 18:08:15 +0000
453@@ -33,7 +33,7 @@
454 First, get a local copy of Bazaar::
455
456 $ cd $HOME
457- $ brz init-repo brz
458+ $ brz init-shared-repo brz
459 $ cd brz
460 $ brz branch lp:brz brz.dev
461
462
463=== modified file 'doc/developers/development-repo.txt'
464--- doc/developers/development-repo.txt 2019-02-14 03:30:18 +0000
465+++ doc/developers/development-repo.txt 2019-10-13 18:08:15 +0000
466@@ -89,14 +89,14 @@
467 for branches, you can make it a ``development`` repository like this::
468
469 cd my-repo
470- bzr init-repo --development .
471+ bzr init-shared-repo --development .
472 cd my-stuff
473 bzr init
474 bzr add
475 bzr commit -m "initial import"
476
477 In other words, use the normal sequence of commands but add the
478-``--development`` option to the ``init-repo`` command.
479+``--development`` option to the ``init-shared-repo`` command.
480
481 Upgrading an existing branch or repository to development
482 ---------------------------------------------------------
483@@ -141,7 +141,7 @@
484 Here are the commands for the shared repository approach::
485
486 cd my-repo
487- bzr init-repo --development .
488+ bzr init-shared-repo --development .
489 bzr branch my-source-branch my-new-branch
490 cd my-new-branch
491
492
493=== modified file 'doc/developers/packrepo.txt'
494--- doc/developers/packrepo.txt 2018-11-18 13:43:04 +0000
495+++ doc/developers/packrepo.txt 2019-10-13 18:08:15 +0000
496@@ -58,14 +58,14 @@
497 for branches, you can make it a ``knitpack`` repository like this::
498
499 cd my-repo
500- bzr init-repo --pack-0.92 .
501+ bzr init-shared-repo --pack-0.92 .
502 cd my-stuff
503 bzr init
504 bzr add
505 bzr commit -m "initial import"
506
507 In other words, use the normal sequence of commands but add the
508-``--pack-0.92`` option to the ``init-repo`` command.
509+``--pack-0.92`` option to the ``init-shared-repo`` command.
510
511 Upgrading an existing branch or repository to knitpack format
512 -------------------------------------------------------------
513@@ -110,7 +110,7 @@
514 Here are the commands for the shared repository approach::
515
516 cd my-repo
517- bzr init-repo --pack-0.92 .
518+ bzr init-shared-repo --pack-0.92 .
519 bzr branch my-source-branch my-new-branch
520 cd my-new-branch
521
522
523=== modified file 'doc/en/admin-guide/advanced.txt'
524--- doc/en/admin-guide/advanced.txt 2009-12-22 05:22:53 +0000
525+++ doc/en/admin-guide/advanced.txt 2019-10-13 18:08:15 +0000
526@@ -61,7 +61,7 @@
527
528 $ mkdir -p /srv/bzr
529 $ cd /srv/bzr
530- $ bzr init-repo --no-trees projectx
531+ $ bzr init-shared-repo --no-trees projectx
532 $ cd projectx
533 $ bzr branch bzr+ssh://server.example.com/srv/bzr/trunk
534 $ bzr branch trunk australia-integration
535
536=== modified file 'doc/en/admin-guide/simple-setups.txt'
537--- doc/en/admin-guide/simple-setups.txt 2018-11-18 13:20:01 +0000
538+++ doc/en/admin-guide/simple-setups.txt 2019-10-13 18:08:15 +0000
539@@ -55,7 +55,7 @@
540 shared repository to hold all of the branches. To set this up, do::
541
542 $ cd /srv/bzr
543- $ brz init-repo --no-trees projectx
544+ $ brz init-shared-repo --no-trees projectx
545
546 The ``--no-trees`` option saves space by not creating a copy of the working
547 files on the server's filesystem. Then, any branch created under
548
549=== modified file 'doc/en/mini-tutorial/index.txt'
550--- doc/en/mini-tutorial/index.txt 2017-06-19 19:47:45 +0000
551+++ doc/en/mini-tutorial/index.txt 2019-10-13 18:08:15 +0000
552@@ -65,7 +65,7 @@
553
554 ::
555
556- $ brz init-repo sample
557+ $ brz init-shared-repo sample
558 Shared repository with trees (format: 2a)
559 Location:
560 shared repository: sample
561@@ -193,7 +193,7 @@
562 To work with someone else's code, you can make your own copy of their
563 branch. Let's take a real-world example, Breezy's GTK interface::
564
565- $ brz init-repo ~/brz-gtk
566+ $ brz init-shared-repo ~/brz-gtk
567 $ brz branch lp:~brz/brz-gtk/trunk ~/brz-gtk/john
568 Branched 292 revision(s).
569
570
571=== modified file 'doc/en/release-notes/brz-3.1.txt'
572--- doc/en/release-notes/brz-3.1.txt 2019-10-13 14:28:07 +0000
573+++ doc/en/release-notes/brz-3.1.txt 2019-10-13 18:08:15 +0000
574@@ -16,6 +16,11 @@
575
576 .. These may require users to change the way they use Breezy.
577
578+ * The ``brz init-repo`` command has been renamed to
579+ ``brz init-shared-repo`` to emphasize that it creates
580+ shared repositories rather than just any kind of repository.
581+ (Jelmer Vernooń≥)
582+
583 New Features
584 ************
585
586
587=== modified file 'doc/en/tutorials/centralized_workflow.txt'
588--- doc/en/tutorials/centralized_workflow.txt 2018-11-18 17:15:39 +0000
589+++ doc/en/tutorials/centralized_workflow.txt 2019-10-13 18:08:15 +0000
590@@ -60,7 +60,7 @@
591
592 ::
593
594- % brz init-repo --trees ~
595+ % brz init-shared-repo --trees ~
596
597
598 Setting up a remote Repository
599@@ -80,7 +80,7 @@
600
601 ::
602
603- % brz init-repo --no-trees brz+ssh://centralhost/srv/brz/
604+ % brz init-shared-repo --no-trees brz+ssh://centralhost/srv/brz/
605
606 You can think of this step as similar to setting up a new cvsroot, or
607 subversion repository. The ``--no-trees`` option tells brz to not
608
609=== modified file 'doc/en/user-guide/branching_a_project.txt'
610--- doc/en/user-guide/branching_a_project.txt 2017-05-21 13:41:54 +0000
611+++ doc/en/user-guide/branching_a_project.txt 2019-10-13 18:08:15 +0000
612@@ -60,7 +60,7 @@
613 `Organizing your workspace <organizing_your_workspace.html>`_
614 for a commonly used layout.) For example::
615
616- brz init-repo my-repo
617+ brz init-shared-repo my-repo
618 cd my-repo
619
620 You are now ready to grab a branch from someone else and
621
622=== modified file 'doc/en/user-guide/organizing_branches.txt'
623--- doc/en/user-guide/organizing_branches.txt 2017-05-21 13:41:54 +0000
624+++ doc/en/user-guide/organizing_branches.txt 2019-10-13 18:08:15 +0000
625@@ -14,7 +14,7 @@
626 (or ``checkout``) command to create the mirror.
627 For example::
628
629- brz init-repo PROJECT
630+ brz init-shared-repo PROJECT
631 cd PROJECT
632 brz branch bzr+ssh://centralhost/srv/brz/PROJECT/trunk
633
634
635=== modified file 'doc/en/user-guide/organizing_your_workspace.txt'
636--- doc/en/user-guide/organizing_your_workspace.txt 2017-05-21 13:41:54 +0000
637+++ doc/en/user-guide/organizing_your_workspace.txt 2019-10-13 18:08:15 +0000
638@@ -105,7 +105,7 @@
639
640 To set up::
641
642- brz init-repo project
643+ brz init-shared-repo project
644 cd project
645 brz branch URL trunk
646
647@@ -149,7 +149,7 @@
648
649 To set up::
650
651- brz init-repo --no-trees project
652+ brz init-shared-repo --no-trees project
653 cd project
654 brz branch URL trunk
655 brz checkout --lightweight trunk sandbox
656
657=== modified file 'doc/en/user-guide/publishing_a_branch.txt'
658--- doc/en/user-guide/publishing_a_branch.txt 2017-05-21 13:35:49 +0000
659+++ doc/en/user-guide/publishing_a_branch.txt 2019-10-13 18:08:15 +0000
660@@ -16,7 +16,7 @@
661 store history, not working copies of files, so their enclosing
662 repository is usually creating using the ``no-trees`` option, e.g.::
663
664- brz init-repo --no-trees bzr+ssh://centralhost/srv/brz/PROJECT
665+ brz init-shared-repo --no-trees bzr+ssh://centralhost/srv/brz/PROJECT
666
667 You can think of this step as similar to setting up a new cvsroot or
668 Subversion repository. However, Breezy gives you more flexibility
669@@ -36,7 +36,7 @@
670
671 Here is an example of the first way::
672
673- brz init-repo PROJECT (prepare local repository)
674+ brz init-shared-repo PROJECT (prepare local repository)
675 brz init PROJECT/trunk
676 cd PROJECT/trunk
677 (copy development files)
678@@ -48,7 +48,7 @@
679
680 Here is an example of the second way::
681
682- brz init-repo PROJECT (prepare local repository)
683+ brz init-shared-repo PROJECT (prepare local repository)
684 cd PROJECT
685 brz init bzr+ssh://centralhost/srv/brz/PROJECT/trunk
686 brz checkout bzr+ssh://centralhost/srv/brz/PROJECT/trunk
687
688=== modified file 'doc/en/user-guide/reusing_a_checkout.txt'
689--- doc/en/user-guide/reusing_a_checkout.txt 2017-05-21 13:41:54 +0000
690+++ doc/en/user-guide/reusing_a_checkout.txt 2019-10-13 18:08:15 +0000
691@@ -61,7 +61,7 @@
692 with a local tree-less repository. This lets you switch what you
693 are working on with ease. For example::
694
695- brz init-repo --no-trees PROJECT
696+ brz init-shared-repo --no-trees PROJECT
697 cd PROJECT
698 brz branch bzr+ssh://centralhost/srv/brz/PROJECT/trunk
699 brz checkout --lightweight trunk my-sandbox
700
701=== modified file 'doc/en/user-guide/shared_repository_layouts.txt'
702--- doc/en/user-guide/shared_repository_layouts.txt 2017-05-21 14:47:52 +0000
703+++ doc/en/user-guide/shared_repository_layouts.txt 2019-10-13 18:08:15 +0000
704@@ -54,7 +54,7 @@
705
706 This also works with Breezy.
707 However, with Breezy repositories are cheap to create
708-(a simple ``brz init-repo`` away), and their primary benefit is when the
709+(a simple ``brz init-shared-repo`` away), and their primary benefit is when the
710 branches share a common ancestry.
711
712 So the preferred way for Breezy would be::
713
714=== modified file 'doc/en/user-guide/starting_a_project.txt'
715--- doc/en/user-guide/starting_a_project.txt 2017-05-21 13:41:54 +0000
716+++ doc/en/user-guide/starting_a_project.txt 2019-10-13 18:08:15 +0000
717@@ -39,7 +39,7 @@
718 idea to create a repository for the project at the top level and to nest
719 a *main* branch within it like this::
720
721- brz init-repo my.repo
722+ brz init-shared-repo my.repo
723 cd my.repo
724 brz init my.main
725 cd my.main
726@@ -50,6 +50,6 @@
727 Some users prefer a name like *trunk* or *dev* to *main*. Choose
728 whichever name makes the most sense to you.
729
730-Note that the ``init-repo`` and ``init`` commands both take a path as an
731+Note that the ``init-shared-repo`` and ``init`` commands both take a path as an
732 argument and will create that path if it doesn't already exist.
733
734
735=== modified file 'doc/en/user-guide/svn_plugin.txt'
736--- doc/en/user-guide/svn_plugin.txt 2017-05-21 13:41:54 +0000
737+++ doc/en/user-guide/svn_plugin.txt 2019-10-13 18:08:15 +0000
738@@ -30,7 +30,7 @@
739 GNOME project like **beagle**. Firstly, setup a local shared repository
740 for storing your branches in and checkout the trunk::
741
742- brz init-repo beagle-repo
743+ brz init-shared-repo beagle-repo
744 cd beagle-repo
745 brz checkout svn+ssh://svn.gnome.org/svn/beagle/trunk beagle-trunk
746
747@@ -69,7 +69,7 @@
748
749 Here's the recipe from above updated to use a central Breezy mirror::
750
751- brz init-repo beagle-repo
752+ brz init-shared-repo beagle-repo
753 cd beagle-repo
754 brz branch bzr+ssh://brz.gnome.org/beagle.brz/trunk beagle-trunk
755 brz branch beagle-trunk beagle-feature1
756
757=== modified file 'tools/win32/build_release.py'
758--- tools/win32/build_release.py 2018-11-16 13:02:50 +0000
759+++ tools/win32/build_release.py 2019-10-13 18:08:15 +0000
760@@ -136,7 +136,8 @@
761 if not os.path.isdir(plugin_name):
762 if plugin_name in ('bzr-svn', 'bzr-rewrite'):
763 # bzr-svn uses a different repo format
764- call_or_fail([brz(), 'init-repo', '--rich-root-pack', plugin_name])
765+ call_or_fail(
766+ [brz(), 'init-shared-repo', '--rich-root-pack', plugin_name])
767 else:
768 os.mkdir(plugin_name)
769 if os.path.isdir(release_dir):

Subscribers

People subscribed via source and target branches