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
=== modified file 'breezy/builtins.py'
--- breezy/builtins.py 2019-09-27 01:02:32 +0000
+++ breezy/builtins.py 2019-10-13 18:08:15 +0000
@@ -2033,7 +2033,7 @@
2033 brz commit -m "imported project"2033 brz commit -m "imported project"
2034 """2034 """
20352035
2036 _see_also = ['init-repository', 'branch', 'checkout']2036 _see_also = ['init-shared-repository', 'branch', 'checkout']
2037 takes_args = ['location?']2037 takes_args = ['location?']
2038 takes_options = [2038 takes_options = [
2039 Option('create-prefix',2039 Option('create-prefix',
@@ -2131,7 +2131,7 @@
2131 self.outf.write(gettext("Using shared repository: %s\n") % url)2131 self.outf.write(gettext("Using shared repository: %s\n") % url)
21322132
21332133
2134class cmd_init_repository(Command):2134class cmd_init_shared_repository(Command):
2135 __doc__ = """Create a shared repository for branches to share storage space.2135 __doc__ = """Create a shared repository for branches to share storage space.
21362136
2137 New branches created under the repository directory will store their2137 New branches created under the repository directory will store their
@@ -2149,7 +2149,7 @@
2149 :Examples:2149 :Examples:
2150 Create a shared repository holding just branches::2150 Create a shared repository holding just branches::
21512151
2152 brz init-repo --no-trees repo2152 brz init-shared-repo --no-trees repo
2153 brz init repo/trunk2153 brz init repo/trunk
21542154
2155 Make a lightweight checkout elsewhere::2155 Make a lightweight checkout elsewhere::
@@ -2173,7 +2173,7 @@
2173 help='Branches in the repository will default to'2173 help='Branches in the repository will default to'
2174 ' not having a working tree.'),2174 ' not having a working tree.'),
2175 ]2175 ]
2176 aliases = ["init-repo"]2176 aliases = ["init-shared-repo", "init-repo"]
21772177
2178 def run(self, location, format=None, no_trees=False):2178 def run(self, location, format=None, no_trees=False):
2179 if format is None:2179 if format is None:
21802180
=== modified file 'breezy/errors.py'
--- breezy/errors.py 2019-06-18 11:21:15 +0000
+++ breezy/errors.py 2019-10-13 18:08:15 +0000
@@ -1872,6 +1872,13 @@
1872 """1872 """
18731873
18741874
1875class SharedRepositoriesUnsupported(UnsupportedOperation):
1876 _fmt = "Shared repositories are not supported by %(format)r."
1877
1878 def __init__(self, format):
1879 BzrError.__init__(self, format=format)
1880
1881
1875class GhostTagsNotSupported(BzrError):1882class GhostTagsNotSupported(BzrError):
18761883
1877 _fmt = "Ghost tags not supported by format %(format)r."1884 _fmt = "Ghost tags not supported by format %(format)r."
18781885
=== modified file 'breezy/git/dir.py'
--- breezy/git/dir.py 2019-08-11 16:27:38 +0000
+++ breezy/git/dir.py 2019-10-13 18:08:15 +0000
@@ -381,6 +381,9 @@
381 stack_on_pwd=None, repo_format_name=None,381 stack_on_pwd=None, repo_format_name=None,
382 make_working_trees=None,382 make_working_trees=None,
383 shared_repo=False, vfs_only=False):383 shared_repo=False, vfs_only=False):
384 if shared_repo:
385 raise brz_errors.SharedRepositoriesUnsupported(self)
386
384 def make_directory(transport):387 def make_directory(transport):
385 transport.mkdir('.')388 transport.mkdir('.')
386 return transport389 return transport
387390
=== modified file 'breezy/git/tests/test_dir.py'
--- breezy/git/tests/test_dir.py 2018-11-11 04:08:32 +0000
+++ breezy/git/tests/test_dir.py 2019-10-13 18:08:15 +0000
@@ -27,6 +27,7 @@
27 errors,27 errors,
28 urlutils,28 urlutils,
29 )29 )
30from ...transport import get_transport
30from ...tests import TestSkipped31from ...tests import TestSkipped
3132
32from .. import (33from .. import (
@@ -76,6 +77,13 @@
76 self.assertEqual(gd.control_url.rstrip('/'),77 self.assertEqual(gd.control_url.rstrip('/'),
77 urlutils.local_path_to_url(os.path.abspath(gitrepo.controldir())))78 urlutils.local_path_to_url(os.path.abspath(gitrepo.controldir())))
7879
80 def test_shared_repository(self):
81 t = get_transport('.')
82 self.assertRaises(
83 errors.SharedRepositoriesUnsupported,
84 dir.LocalGitControlDirFormat().initialize_on_transport_ex, t,
85 shared_repo=True)
86
7987
80class TestGitDirFormat(tests.TestCase):88class TestGitDirFormat(tests.TestCase):
8189
8290
=== modified file 'breezy/help_topics/__init__.py'
--- breezy/help_topics/__init__.py 2019-06-16 19:53:27 +0000
+++ breezy/help_topics/__init__.py 2019-10-13 18:08:15 +0000
@@ -453,11 +453,11 @@
453generally a large space saving. For some operations (e.g. branching453generally a large space saving. For some operations (e.g. branching
454within the repository) this translates in to a large time saving.454within the repository) this translates in to a large time saving.
455455
456To create a shared repository use the init-repository command (or the alias456To create a shared repository use the init-shared-repository command (or the
457init-repo). This command takes the location of the repository to create. This457alias init-shared-repo). This command takes the location of the repository to
458means that 'brz init-repository repo' will create a directory named 'repo',458create. This means that 'brz init-shared-repository repo' will create a
459which contains a shared repository. Any new branches that are created in this459directory named 'repo', which contains a shared repository. Any new branches
460directory will then use it for storage.460that are created in this directory will then use it for storage.
461461
462It is a good idea to create a repository whenever you might create more462It is a good idea to create a repository whenever you might create more
463than one branch of a project. This is true for both working areas where you463than one branch of a project. This is true for both working areas where you
@@ -466,12 +466,12 @@
466trees. Since the files in the branch will not be edited directly there is no466trees. Since the files in the branch will not be edited directly there is no
467need to use up disk space for a working tree. To create a repository in which467need to use up disk space for a working tree. To create a repository in which
468the branches will not have working trees pass the '--no-trees' option to468the branches will not have working trees pass the '--no-trees' option to
469'init-repository'.469'init-shared-repository'.
470470
471Related commands::471Related commands::
472472
473 init-repository Create a shared repository. Use --no-trees to create one473 init-shared-repository Create a shared repository. Use --no-trees to create
474 in which new branches won't get a working tree.474 one in which new branches won't get a working tree.
475"""475"""
476476
477477
478478
=== modified file 'breezy/plugins/bash_completion/tests/test_bashcomp.py'
--- breezy/plugins/bash_completion/tests/test_bashcomp.py 2018-11-11 04:08:32 +0000
+++ breezy/plugins/bash_completion/tests/test_bashcomp.py 2019-10-13 18:08:15 +0000
@@ -117,7 +117,8 @@
117117
118 def test_cmd_ini(self):118 def test_cmd_ini(self):
119 self.complete(['brz', 'ini'])119 self.complete(['brz', 'ini'])
120 self.assertCompletionContains('init', 'init-repo', 'init-repository')120 self.assertCompletionContains(
121 'init', 'init-shared-repo', 'init-shared-repository')
121 self.assertCompletionOmits('commit')122 self.assertCompletionOmits('commit')
122123
123 def test_init_opts(self):124 def test_init_opts(self):
@@ -297,8 +298,9 @@
297 def test_commands(self):298 def test_commands(self):
298 dc = DataCollector()299 dc = DataCollector()
299 dc.commands()300 dc.commands()
300 self.assertSubset(['init', 'init-repo', 'init-repository'],301 self.assertSubset(
301 dc.data.all_command_aliases())302 ['init', 'init-shared-repo', 'init-shared-repository'],
303 dc.data.all_command_aliases())
302304
303 def test_commands_from_plugins(self):305 def test_commands_from_plugins(self):
304 dc = DataCollector()306 dc = DataCollector()
305307
=== modified file 'breezy/plugins/weave_fmt/test_repository.py'
--- breezy/plugins/weave_fmt/test_repository.py 2019-06-29 19:54:32 +0000
+++ breezy/plugins/weave_fmt/test_repository.py 2019-10-13 18:08:15 +0000
@@ -257,7 +257,7 @@
257class TestInterWeaveRepo(TestCaseWithTransport):257class TestInterWeaveRepo(TestCaseWithTransport):
258258
259 def test_make_repository(self):259 def test_make_repository(self):
260 out, err = self.run_bzr("init-repository --format=weave a")260 out, err = self.run_bzr("init-shared-repository --format=weave a")
261 self.assertEqual(out,261 self.assertEqual(out,
262 """Standalone tree (format: weave)262 """Standalone tree (format: weave)
263Location:263Location:
264264
=== modified file 'breezy/tests/blackbox/test_branches.py'
--- breezy/tests/blackbox/test_branches.py 2018-07-07 15:06:42 +0000
+++ breezy/tests/blackbox/test_branches.py 2019-10-13 18:08:15 +0000
@@ -32,14 +32,14 @@
3232
33 def test_no_branch(self):33 def test_no_branch(self):
34 # Listing the branches in a control directory without branches.34 # Listing the branches in a control directory without branches.
35 self.run_bzr('init-repo a')35 self.run_bzr('init-shared-repo a')
36 out, err = self.run_bzr('branches a')36 out, err = self.run_bzr('branches a')
37 self.assertEqual(out, "")37 self.assertEqual(out, "")
3838
39 def test_default_current_dir(self):39 def test_default_current_dir(self):
40 # "brz branches" list the branches in the current directory40 # "brz branches" list the branches in the current directory
41 # if no location was specified.41 # if no location was specified.
42 self.run_bzr('init-repo a')42 self.run_bzr('init-shared-repo a')
43 out, err = self.run_bzr('branches', working_dir='a')43 out, err = self.run_bzr('branches', working_dir='a')
44 self.assertEqual(out, "")44 self.assertEqual(out, "")
4545
4646
=== modified file 'breezy/tests/blackbox/test_push.py'
--- breezy/tests/blackbox/test_push.py 2019-02-16 04:57:50 +0000
+++ breezy/tests/blackbox/test_push.py 2019-10-13 18:08:15 +0000
@@ -949,7 +949,7 @@
949949
950 def test_push_with_revspec(self):950 def test_push_with_revspec(self):
951 self.run_script("""951 self.run_script("""
952 $ brz init-repo .952 $ brz init-shared-repo .
953 Shared repository with trees (format: 2a)953 Shared repository with trees (format: 2a)
954 Location:954 Location:
955 shared repository: .955 shared repository: .
956956
=== modified file 'breezy/tests/blackbox/test_reconfigure.py'
--- breezy/tests/blackbox/test_reconfigure.py 2018-11-11 04:08:32 +0000
+++ breezy/tests/blackbox/test_reconfigure.py 2019-10-13 18:08:15 +0000
@@ -190,7 +190,7 @@
190$ echo foo > branch/foo190$ echo foo > branch/foo
191$ brz add -q branch/foo191$ brz add -q branch/foo
192$ brz commit -q -m msg branch192$ brz commit -q -m msg branch
193$ brz init-repo -q .193$ brz init-shared-repo -q .
194$ brz reconfigure --branch --use-shared branch194$ brz reconfigure --branch --use-shared branch
195$ brz info branch195$ brz info branch
196Repository branch (format: ...)196Repository branch (format: ...)
@@ -205,7 +205,7 @@
205$ echo foo > branch/foo205$ echo foo > branch/foo
206$ brz add -q branch/foo206$ brz add -q branch/foo
207$ brz commit -q -m msg branch207$ brz commit -q -m msg branch
208$ brz init-repo -q .208$ brz init-shared-repo -q .
209$ brz reconfigure --use-shared --branch branch209$ brz reconfigure --use-shared --branch branch
210$ brz info branch210$ brz info branch
211Repository branch (format: ...)211Repository branch (format: ...)
212212
=== modified file 'breezy/tests/blackbox/test_revision_history.py'
--- breezy/tests/blackbox/test_revision_history.py 2018-07-07 15:06:42 +0000
+++ breezy/tests/blackbox/test_revision_history.py 2019-10-13 18:08:15 +0000
@@ -55,14 +55,14 @@
55 def test_revision_history_with_repo_branch(self):55 def test_revision_history_with_repo_branch(self):
56 """With a repository branch location."""56 """With a repository branch location."""
57 self._build_branch()57 self._build_branch()
58 self.run_bzr('init-repo repo')58 self.run_bzr('init-shared-repo repo')
59 self.run_bzr('branch test repo/test')59 self.run_bzr('branch test repo/test')
60 self._check_revision_history('repo/test')60 self._check_revision_history('repo/test')
6161
62 def test_revision_history_with_checkout(self):62 def test_revision_history_with_checkout(self):
63 """With a repository branch checkout location."""63 """With a repository branch checkout location."""
64 self._build_branch()64 self._build_branch()
65 self.run_bzr('init-repo repo')65 self.run_bzr('init-shared-repo repo')
66 self.run_bzr('branch test repo/test')66 self.run_bzr('branch test repo/test')
67 self.run_bzr('checkout repo/test test-checkout')67 self.run_bzr('checkout repo/test test-checkout')
68 self._check_revision_history('test-checkout')68 self._check_revision_history('test-checkout')
@@ -70,7 +70,7 @@
70 def test_revision_history_with_lightweight_checkout(self):70 def test_revision_history_with_lightweight_checkout(self):
71 """With a repository branch lightweight checkout location."""71 """With a repository branch lightweight checkout location."""
72 self._build_branch()72 self._build_branch()
73 self.run_bzr('init-repo repo')73 self.run_bzr('init-shared-repo repo')
74 self.run_bzr('branch test repo/test')74 self.run_bzr('branch test repo/test')
75 self.run_bzr('checkout --lightweight repo/test test-checkout')75 self.run_bzr('checkout --lightweight repo/test test-checkout')
76 self._check_revision_history('test-checkout')76 self._check_revision_history('test-checkout')
7777
=== modified file 'breezy/tests/blackbox/test_shared_repository.py'
--- breezy/tests/blackbox/test_shared_repository.py 2018-11-11 04:08:32 +0000
+++ breezy/tests/blackbox/test_shared_repository.py 2019-10-13 18:08:15 +0000
@@ -28,7 +28,7 @@
28class TestSharedRepo(TestCaseInTempDir):28class TestSharedRepo(TestCaseInTempDir):
2929
30 def test_make_repository(self):30 def test_make_repository(self):
31 out, err = self.run_bzr("init-repository a")31 out, err = self.run_bzr("init-shared-repository a")
32 self.assertEqual(out,32 self.assertEqual(out,
33 """Shared repository with trees (format: 2a)33 """Shared repository with trees (format: 2a)
34Location:34Location:
@@ -41,7 +41,7 @@
41 self.assertRaises(errors.NoWorkingTree, dir.open_workingtree)41 self.assertRaises(errors.NoWorkingTree, dir.open_workingtree)
4242
43 def test_make_repository_quiet(self):43 def test_make_repository_quiet(self):
44 out, err = self.run_bzr("init-repository a -q")44 out, err = self.run_bzr("init-shared-repository a -q")
45 self.assertEqual(out, "")45 self.assertEqual(out, "")
46 self.assertEqual(err, "")46 self.assertEqual(err, "")
47 dir = ControlDir.open('a')47 dir = ControlDir.open('a')
@@ -54,12 +54,12 @@
5454
55 (Malone #38331)55 (Malone #38331)
56 """56 """
57 out, err = self.run_bzr("init-repository .")57 out, err = self.run_bzr("init-shared-repository .")
58 dir = ControlDir.open('.')58 dir = ControlDir.open('.')
59 self.assertTrue(dir.open_repository())59 self.assertTrue(dir.open_repository())
6060
61 def test_init(self):61 def test_init(self):
62 self.run_bzr("init-repo a")62 self.run_bzr("init-shared-repo a")
63 self.run_bzr("init --format=default a/b")63 self.run_bzr("init --format=default a/b")
64 dir = ControlDir.open('a')64 dir = ControlDir.open('a')
65 self.assertIs(dir.open_repository().is_shared(), True)65 self.assertIs(dir.open_repository().is_shared(), True)
@@ -71,7 +71,7 @@
71 wt = bdir.open_workingtree()71 wt = bdir.open_workingtree()
7272
73 def test_branch(self):73 def test_branch(self):
74 self.run_bzr("init-repo a")74 self.run_bzr("init-shared-repo a")
75 self.run_bzr("init --format=default a/b")75 self.run_bzr("init --format=default a/b")
76 self.run_bzr('branch a/b a/c')76 self.run_bzr('branch a/b a/c')
77 cdir = ControlDir.open('a/c')77 cdir = ControlDir.open('a/c')
@@ -80,7 +80,7 @@
80 cdir.open_workingtree()80 cdir.open_workingtree()
8181
82 def test_branch_tree(self):82 def test_branch_tree(self):
83 self.run_bzr("init-repo --trees a")83 self.run_bzr("init-shared-repo --trees a")
84 self.run_bzr("init --format=default b")84 self.run_bzr("init --format=default b")
85 with open('b/hello', 'wt') as f:85 with open('b/hello', 'wt') as f:
86 f.write('bar')86 f.write('bar')
@@ -96,28 +96,28 @@
9696
97 def test_trees_default(self):97 def test_trees_default(self):
98 # 0.15 switched to trees by default98 # 0.15 switched to trees by default
99 self.run_bzr("init-repo repo")99 self.run_bzr("init-shared-repo repo")
100 repo = ControlDir.open("repo").open_repository()100 repo = ControlDir.open("repo").open_repository()
101 self.assertEqual(True, repo.make_working_trees())101 self.assertEqual(True, repo.make_working_trees())
102102
103 def test_trees_argument(self):103 def test_trees_argument(self):
104 # Supplying the --trees argument should be harmless,104 # Supplying the --trees argument should be harmless,
105 # as it was previously non-default we need to get it right.105 # as it was previously non-default we need to get it right.
106 self.run_bzr("init-repo --trees trees")106 self.run_bzr("init-shared-repo --trees trees")
107 repo = ControlDir.open("trees").open_repository()107 repo = ControlDir.open("trees").open_repository()
108 self.assertEqual(True, repo.make_working_trees())108 self.assertEqual(True, repo.make_working_trees())
109109
110 def test_no_trees_argument(self):110 def test_no_trees_argument(self):
111 # --no-trees should make it so that there is no working tree111 # --no-trees should make it so that there is no working tree
112 self.run_bzr("init-repo --no-trees notrees")112 self.run_bzr("init-shared-repo --no-trees notrees")
113 repo = ControlDir.open("notrees").open_repository()113 repo = ControlDir.open("notrees").open_repository()
114 self.assertEqual(False, repo.make_working_trees())114 self.assertEqual(False, repo.make_working_trees())
115115
116 def test_init_repo_smart_acceptance(self):116 def test_init_repo_smart_acceptance(self):
117 # The amount of hpss calls made on init-repo to a smart server should117 # The amount of hpss calls made on init-shared-repo to a smart server
118 # be fixed.118 # should be fixed.
119 self.setup_smart_server_with_call_log()119 self.setup_smart_server_with_call_log()
120 self.run_bzr(['init-repo', self.get_url('repo')])120 self.run_bzr(['init-shared-repo', self.get_url('repo')])
121 # This figure represent the amount of work to perform this use case. It121 # This figure represent the amount of work to perform this use case. It
122 # is entirely ok to reduce this number if a test fails due to rpc_count122 # is entirely ok to reduce this number if a test fails due to rpc_count
123 # being too low. If rpc_count increases, more network roundtrips have123 # being too low. If rpc_count increases, more network roundtrips have
@@ -128,7 +128,7 @@
128 self.assertThat(self.hpss_calls, ContainsNoVfsCalls)128 self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
129129
130 def test_notification_on_branch_from_repository(self):130 def test_notification_on_branch_from_repository(self):
131 out, err = self.run_bzr("init-repository -q a")131 out, err = self.run_bzr("init-shared-repository -q a")
132 self.assertEqual(out, "")132 self.assertEqual(out, "")
133 self.assertEqual(err, "")133 self.assertEqual(err, "")
134 dir = ControlDir.open('a')134 dir = ControlDir.open('a')
@@ -150,19 +150,19 @@
150 ControlDir.hooks.install_named_hook(150 ControlDir.hooks.install_named_hook(
151 'post_repo_init', calls.append, None)151 'post_repo_init', calls.append, None)
152 self.assertLength(0, calls)152 self.assertLength(0, calls)
153 self.run_bzr("init-repository a")153 self.run_bzr("init-shared-repository a")
154 self.assertLength(1, calls)154 self.assertLength(1, calls)
155155
156 def test_init_repo_without_username(self):156 def test_init_repo_without_username(self):
157 """Ensure init-repo works if username is not set.157 """Ensure init-shared-repo works if username is not set.
158 """158 """
159 # brz makes user specified whoami mandatory for operations159 # brz makes user specified whoami mandatory for operations
160 # like commit as whoami is recorded. init-repo however is not so final160 # like commit as whoami is recorded. init-shared-repo however is not so
161 # and uses whoami only in a lock file. Without whoami the login name161 # final and uses whoami only in a lock file. Without whoami the login name
162 # is used. This test is to ensure that init-repo passes even when whoami162 # is used. This test is to ensure that init-shared-repo passes even
163 # is not available.163 # when whoami is not available.
164 self.overrideEnv('EMAIL', None)164 self.overrideEnv('EMAIL', None)
165 self.overrideEnv('BRZ_EMAIL', None)165 self.overrideEnv('BRZ_EMAIL', None)
166 out, err = self.run_bzr(['init-repo', 'foo'])166 out, err = self.run_bzr(['init-shared-repo', 'foo'])
167 self.assertEqual(err, '')167 self.assertEqual(err, '')
168 self.assertTrue(os.path.exists('foo'))168 self.assertTrue(os.path.exists('foo'))
169169
=== modified file 'breezy/tests/blackbox/test_switch.py'
--- breezy/tests/blackbox/test_switch.py 2019-02-09 02:59:15 +0000
+++ breezy/tests/blackbox/test_switch.py 2019-10-13 18:08:15 +0000
@@ -407,7 +407,7 @@
407 super(TestSwitchParentLocationBase, self).setUp()407 super(TestSwitchParentLocationBase, self).setUp()
408 self.script_runner = script.ScriptRunner()408 self.script_runner = script.ScriptRunner()
409 self.script_runner.run_script(self, '''409 self.script_runner.run_script(self, '''
410 $ brz init-repo --no-trees repo410 $ brz init-shared-repo --no-trees repo
411 Shared repository...411 Shared repository...
412 Location:412 Location:
413 shared repository: repo413 shared repository: repo
414414
=== modified file 'breezy/tests/blackbox/test_upgrade.py'
--- breezy/tests/blackbox/test_upgrade.py 2018-11-11 04:08:32 +0000
+++ breezy/tests/blackbox/test_upgrade.py 2019-10-13 18:08:15 +0000
@@ -189,7 +189,7 @@
189 RepositoryFormatKnitPack1))189 RepositoryFormatKnitPack1))
190190
191 def test_upgrade_repo(self):191 def test_upgrade_repo(self):
192 self.run_bzr('init-repository --format=pack-0.92 repo')192 self.run_bzr('init-shared-repository --format=pack-0.92 repo')
193 self.run_bzr('upgrade --format=2a repo')193 self.run_bzr('upgrade --format=2a repo')
194194
195 def assertLegalOption(self, option_str):195 def assertLegalOption(self, option_str):
196196
=== modified file 'breezy/tests/commands/test_init_repository.py'
--- breezy/tests/commands/test_init_repository.py 2018-11-11 04:08:32 +0000
+++ breezy/tests/commands/test_init_repository.py 2019-10-13 18:08:15 +0000
@@ -14,7 +14,7 @@
14# along with this program; if not, write to the Free Software14# along with this program; if not, write to the Free Software
15# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA15# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1616
17from ...builtins import cmd_init_repository17from ...builtins import cmd_init_shared_repository
18from .. import (18from .. import (
19 transport_util,19 transport_util,
20 ui_testing,20 ui_testing,
@@ -27,8 +27,8 @@
27 super(TestInitRepository, self).setUp()27 super(TestInitRepository, self).setUp()
28 self.start_logging_connections()28 self.start_logging_connections()
2929
30 def test_init_repository(self):30 def test_init_shared_repository(self):
31 cmd = cmd_init_repository()31 cmd = cmd_init_shared_repository()
32 # We don't care about the ouput but 'outf' should be defined32 # We don't care about the ouput but 'outf' should be defined
33 cmd.outf = ui_testing.StringIOWithEncoding()33 cmd.outf = ui_testing.StringIOWithEncoding()
34 cmd.run(self.get_url())34 cmd.run(self.get_url())
3535
=== modified file 'doc/developers/HACKING.txt'
--- doc/developers/HACKING.txt 2018-11-26 00:07:02 +0000
+++ doc/developers/HACKING.txt 2019-10-13 18:08:15 +0000
@@ -87,7 +87,7 @@
87copy of bzr.dev?`_.)87copy of bzr.dev?`_.)
88::88::
8989
90 $ brz init-repo ~/bzr90 $ brz init-shared-repo ~/bzr
91 $ cd ~/bzr91 $ cd ~/bzr
92 $ brz branch lp:brz bzr.dev92 $ brz branch lp:brz bzr.dev
9393
9494
=== modified file 'doc/developers/contribution-quickstart.txt'
--- doc/developers/contribution-quickstart.txt 2019-02-15 17:41:17 +0000
+++ doc/developers/contribution-quickstart.txt 2019-10-13 18:08:15 +0000
@@ -33,7 +33,7 @@
33First, get a local copy of Bazaar::33First, get a local copy of Bazaar::
3434
35 $ cd $HOME35 $ cd $HOME
36 $ brz init-repo brz36 $ brz init-shared-repo brz
37 $ cd brz37 $ cd brz
38 $ brz branch lp:brz brz.dev38 $ brz branch lp:brz brz.dev
3939
4040
=== modified file 'doc/developers/development-repo.txt'
--- doc/developers/development-repo.txt 2019-02-14 03:30:18 +0000
+++ doc/developers/development-repo.txt 2019-10-13 18:08:15 +0000
@@ -89,14 +89,14 @@
89for branches, you can make it a ``development`` repository like this::89for branches, you can make it a ``development`` repository like this::
9090
91 cd my-repo91 cd my-repo
92 bzr init-repo --development .92 bzr init-shared-repo --development .
93 cd my-stuff93 cd my-stuff
94 bzr init94 bzr init
95 bzr add95 bzr add
96 bzr commit -m "initial import"96 bzr commit -m "initial import"
9797
98In other words, use the normal sequence of commands but add the98In other words, use the normal sequence of commands but add the
99``--development`` option to the ``init-repo`` command.99``--development`` option to the ``init-shared-repo`` command.
100100
101Upgrading an existing branch or repository to development101Upgrading an existing branch or repository to development
102---------------------------------------------------------102---------------------------------------------------------
@@ -141,7 +141,7 @@
141Here are the commands for the shared repository approach::141Here are the commands for the shared repository approach::
142142
143 cd my-repo143 cd my-repo
144 bzr init-repo --development .144 bzr init-shared-repo --development .
145 bzr branch my-source-branch my-new-branch145 bzr branch my-source-branch my-new-branch
146 cd my-new-branch146 cd my-new-branch
147147
148148
=== modified file 'doc/developers/packrepo.txt'
--- doc/developers/packrepo.txt 2018-11-18 13:43:04 +0000
+++ doc/developers/packrepo.txt 2019-10-13 18:08:15 +0000
@@ -58,14 +58,14 @@
58for branches, you can make it a ``knitpack`` repository like this::58for branches, you can make it a ``knitpack`` repository like this::
5959
60 cd my-repo60 cd my-repo
61 bzr init-repo --pack-0.92 .61 bzr init-shared-repo --pack-0.92 .
62 cd my-stuff62 cd my-stuff
63 bzr init63 bzr init
64 bzr add64 bzr add
65 bzr commit -m "initial import"65 bzr commit -m "initial import"
6666
67In other words, use the normal sequence of commands but add the67In other words, use the normal sequence of commands but add the
68``--pack-0.92`` option to the ``init-repo`` command.68``--pack-0.92`` option to the ``init-shared-repo`` command.
6969
70Upgrading an existing branch or repository to knitpack format70Upgrading an existing branch or repository to knitpack format
71-------------------------------------------------------------71-------------------------------------------------------------
@@ -110,7 +110,7 @@
110Here are the commands for the shared repository approach::110Here are the commands for the shared repository approach::
111111
112 cd my-repo112 cd my-repo
113 bzr init-repo --pack-0.92 .113 bzr init-shared-repo --pack-0.92 .
114 bzr branch my-source-branch my-new-branch114 bzr branch my-source-branch my-new-branch
115 cd my-new-branch115 cd my-new-branch
116116
117117
=== modified file 'doc/en/admin-guide/advanced.txt'
--- doc/en/admin-guide/advanced.txt 2009-12-22 05:22:53 +0000
+++ doc/en/admin-guide/advanced.txt 2019-10-13 18:08:15 +0000
@@ -61,7 +61,7 @@
6161
62 $ mkdir -p /srv/bzr62 $ mkdir -p /srv/bzr
63 $ cd /srv/bzr63 $ cd /srv/bzr
64 $ bzr init-repo --no-trees projectx64 $ bzr init-shared-repo --no-trees projectx
65 $ cd projectx65 $ cd projectx
66 $ bzr branch bzr+ssh://server.example.com/srv/bzr/trunk66 $ bzr branch bzr+ssh://server.example.com/srv/bzr/trunk
67 $ bzr branch trunk australia-integration67 $ bzr branch trunk australia-integration
6868
=== modified file 'doc/en/admin-guide/simple-setups.txt'
--- doc/en/admin-guide/simple-setups.txt 2018-11-18 13:20:01 +0000
+++ doc/en/admin-guide/simple-setups.txt 2019-10-13 18:08:15 +0000
@@ -55,7 +55,7 @@
55shared repository to hold all of the branches. To set this up, do::55shared repository to hold all of the branches. To set this up, do::
5656
57 $ cd /srv/bzr57 $ cd /srv/bzr
58 $ brz init-repo --no-trees projectx58 $ brz init-shared-repo --no-trees projectx
5959
60The ``--no-trees`` option saves space by not creating a copy of the working60The ``--no-trees`` option saves space by not creating a copy of the working
61files on the server's filesystem. Then, any branch created under61files on the server's filesystem. Then, any branch created under
6262
=== modified file 'doc/en/mini-tutorial/index.txt'
--- doc/en/mini-tutorial/index.txt 2017-06-19 19:47:45 +0000
+++ doc/en/mini-tutorial/index.txt 2019-10-13 18:08:15 +0000
@@ -65,7 +65,7 @@
6565
66::66::
6767
68 $ brz init-repo sample68 $ brz init-shared-repo sample
69 Shared repository with trees (format: 2a)69 Shared repository with trees (format: 2a)
70 Location:70 Location:
71 shared repository: sample71 shared repository: sample
@@ -193,7 +193,7 @@
193To work with someone else's code, you can make your own copy of their193To work with someone else's code, you can make your own copy of their
194branch. Let's take a real-world example, Breezy's GTK interface::194branch. Let's take a real-world example, Breezy's GTK interface::
195195
196 $ brz init-repo ~/brz-gtk196 $ brz init-shared-repo ~/brz-gtk
197 $ brz branch lp:~brz/brz-gtk/trunk ~/brz-gtk/john197 $ brz branch lp:~brz/brz-gtk/trunk ~/brz-gtk/john
198 Branched 292 revision(s).198 Branched 292 revision(s).
199199
200200
=== modified file 'doc/en/release-notes/brz-3.1.txt'
--- doc/en/release-notes/brz-3.1.txt 2019-10-13 14:28:07 +0000
+++ doc/en/release-notes/brz-3.1.txt 2019-10-13 18:08:15 +0000
@@ -16,6 +16,11 @@
1616
17.. These may require users to change the way they use Breezy.17.. These may require users to change the way they use Breezy.
1818
19 * The ``brz init-repo`` command has been renamed to
20 ``brz init-shared-repo`` to emphasize that it creates
21 shared repositories rather than just any kind of repository.
22 (Jelmer Vernooń≥)
23
19New Features24New Features
20************25************
2126
2227
=== modified file 'doc/en/tutorials/centralized_workflow.txt'
--- doc/en/tutorials/centralized_workflow.txt 2018-11-18 17:15:39 +0000
+++ doc/en/tutorials/centralized_workflow.txt 2019-10-13 18:08:15 +0000
@@ -60,7 +60,7 @@
6060
61::61::
6262
63 % brz init-repo --trees ~63 % brz init-shared-repo --trees ~
6464
6565
66Setting up a remote Repository66Setting up a remote Repository
@@ -80,7 +80,7 @@
8080
81::81::
8282
83 % brz init-repo --no-trees brz+ssh://centralhost/srv/brz/83 % brz init-shared-repo --no-trees brz+ssh://centralhost/srv/brz/
8484
85You can think of this step as similar to setting up a new cvsroot, or85You can think of this step as similar to setting up a new cvsroot, or
86subversion repository. The ``--no-trees`` option tells brz to not86subversion repository. The ``--no-trees`` option tells brz to not
8787
=== modified file 'doc/en/user-guide/branching_a_project.txt'
--- doc/en/user-guide/branching_a_project.txt 2017-05-21 13:41:54 +0000
+++ doc/en/user-guide/branching_a_project.txt 2019-10-13 18:08:15 +0000
@@ -60,7 +60,7 @@
60`Organizing your workspace <organizing_your_workspace.html>`_60`Organizing your workspace <organizing_your_workspace.html>`_
61for a commonly used layout.) For example::61for a commonly used layout.) For example::
6262
63 brz init-repo my-repo63 brz init-shared-repo my-repo
64 cd my-repo64 cd my-repo
6565
66You are now ready to grab a branch from someone else and66You are now ready to grab a branch from someone else and
6767
=== modified file 'doc/en/user-guide/organizing_branches.txt'
--- doc/en/user-guide/organizing_branches.txt 2017-05-21 13:41:54 +0000
+++ doc/en/user-guide/organizing_branches.txt 2019-10-13 18:08:15 +0000
@@ -14,7 +14,7 @@
14(or ``checkout``) command to create the mirror.14(or ``checkout``) command to create the mirror.
15For example::15For example::
1616
17 brz init-repo PROJECT17 brz init-shared-repo PROJECT
18 cd PROJECT18 cd PROJECT
19 brz branch bzr+ssh://centralhost/srv/brz/PROJECT/trunk19 brz branch bzr+ssh://centralhost/srv/brz/PROJECT/trunk
2020
2121
=== modified file 'doc/en/user-guide/organizing_your_workspace.txt'
--- doc/en/user-guide/organizing_your_workspace.txt 2017-05-21 13:41:54 +0000
+++ doc/en/user-guide/organizing_your_workspace.txt 2019-10-13 18:08:15 +0000
@@ -105,7 +105,7 @@
105105
106To set up::106To set up::
107107
108 brz init-repo project108 brz init-shared-repo project
109 cd project109 cd project
110 brz branch URL trunk110 brz branch URL trunk
111111
@@ -149,7 +149,7 @@
149149
150To set up::150To set up::
151151
152 brz init-repo --no-trees project152 brz init-shared-repo --no-trees project
153 cd project153 cd project
154 brz branch URL trunk154 brz branch URL trunk
155 brz checkout --lightweight trunk sandbox155 brz checkout --lightweight trunk sandbox
156156
=== modified file 'doc/en/user-guide/publishing_a_branch.txt'
--- doc/en/user-guide/publishing_a_branch.txt 2017-05-21 13:35:49 +0000
+++ doc/en/user-guide/publishing_a_branch.txt 2019-10-13 18:08:15 +0000
@@ -16,7 +16,7 @@
16store history, not working copies of files, so their enclosing16store history, not working copies of files, so their enclosing
17repository is usually creating using the ``no-trees`` option, e.g.::17repository is usually creating using the ``no-trees`` option, e.g.::
1818
19 brz init-repo --no-trees bzr+ssh://centralhost/srv/brz/PROJECT19 brz init-shared-repo --no-trees bzr+ssh://centralhost/srv/brz/PROJECT
2020
21You can think of this step as similar to setting up a new cvsroot or21You can think of this step as similar to setting up a new cvsroot or
22Subversion repository. However, Breezy gives you more flexibility22Subversion repository. However, Breezy gives you more flexibility
@@ -36,7 +36,7 @@
3636
37Here is an example of the first way::37Here is an example of the first way::
3838
39 brz init-repo PROJECT (prepare local repository)39 brz init-shared-repo PROJECT (prepare local repository)
40 brz init PROJECT/trunk40 brz init PROJECT/trunk
41 cd PROJECT/trunk41 cd PROJECT/trunk
42 (copy development files)42 (copy development files)
@@ -48,7 +48,7 @@
4848
49Here is an example of the second way::49Here is an example of the second way::
5050
51 brz init-repo PROJECT (prepare local repository)51 brz init-shared-repo PROJECT (prepare local repository)
52 cd PROJECT52 cd PROJECT
53 brz init bzr+ssh://centralhost/srv/brz/PROJECT/trunk53 brz init bzr+ssh://centralhost/srv/brz/PROJECT/trunk
54 brz checkout bzr+ssh://centralhost/srv/brz/PROJECT/trunk54 brz checkout bzr+ssh://centralhost/srv/brz/PROJECT/trunk
5555
=== modified file 'doc/en/user-guide/reusing_a_checkout.txt'
--- doc/en/user-guide/reusing_a_checkout.txt 2017-05-21 13:41:54 +0000
+++ doc/en/user-guide/reusing_a_checkout.txt 2019-10-13 18:08:15 +0000
@@ -61,7 +61,7 @@
61with a local tree-less repository. This lets you switch what you61with a local tree-less repository. This lets you switch what you
62are working on with ease. For example::62are working on with ease. For example::
6363
64 brz init-repo --no-trees PROJECT64 brz init-shared-repo --no-trees PROJECT
65 cd PROJECT65 cd PROJECT
66 brz branch bzr+ssh://centralhost/srv/brz/PROJECT/trunk66 brz branch bzr+ssh://centralhost/srv/brz/PROJECT/trunk
67 brz checkout --lightweight trunk my-sandbox67 brz checkout --lightweight trunk my-sandbox
6868
=== modified file 'doc/en/user-guide/shared_repository_layouts.txt'
--- doc/en/user-guide/shared_repository_layouts.txt 2017-05-21 14:47:52 +0000
+++ doc/en/user-guide/shared_repository_layouts.txt 2019-10-13 18:08:15 +0000
@@ -54,7 +54,7 @@
5454
55This also works with Breezy.55This also works with Breezy.
56However, with Breezy repositories are cheap to create56However, with Breezy repositories are cheap to create
57(a simple ``brz init-repo`` away), and their primary benefit is when the57(a simple ``brz init-shared-repo`` away), and their primary benefit is when the
58branches share a common ancestry.58branches share a common ancestry.
5959
60So the preferred way for Breezy would be::60So the preferred way for Breezy would be::
6161
=== modified file 'doc/en/user-guide/starting_a_project.txt'
--- doc/en/user-guide/starting_a_project.txt 2017-05-21 13:41:54 +0000
+++ doc/en/user-guide/starting_a_project.txt 2019-10-13 18:08:15 +0000
@@ -39,7 +39,7 @@
39idea to create a repository for the project at the top level and to nest39idea to create a repository for the project at the top level and to nest
40a *main* branch within it like this::40a *main* branch within it like this::
4141
42 brz init-repo my.repo42 brz init-shared-repo my.repo
43 cd my.repo43 cd my.repo
44 brz init my.main44 brz init my.main
45 cd my.main45 cd my.main
@@ -50,6 +50,6 @@
50Some users prefer a name like *trunk* or *dev* to *main*. Choose50Some users prefer a name like *trunk* or *dev* to *main*. Choose
51whichever name makes the most sense to you.51whichever name makes the most sense to you.
5252
53Note that the ``init-repo`` and ``init`` commands both take a path as an53Note that the ``init-shared-repo`` and ``init`` commands both take a path as an
54argument and will create that path if it doesn't already exist.54argument and will create that path if it doesn't already exist.
5555
5656
=== modified file 'doc/en/user-guide/svn_plugin.txt'
--- doc/en/user-guide/svn_plugin.txt 2017-05-21 13:41:54 +0000
+++ doc/en/user-guide/svn_plugin.txt 2019-10-13 18:08:15 +0000
@@ -30,7 +30,7 @@
30GNOME project like **beagle**. Firstly, setup a local shared repository30GNOME project like **beagle**. Firstly, setup a local shared repository
31for storing your branches in and checkout the trunk::31for storing your branches in and checkout the trunk::
3232
33 brz init-repo beagle-repo33 brz init-shared-repo beagle-repo
34 cd beagle-repo34 cd beagle-repo
35 brz checkout svn+ssh://svn.gnome.org/svn/beagle/trunk beagle-trunk35 brz checkout svn+ssh://svn.gnome.org/svn/beagle/trunk beagle-trunk
3636
@@ -69,7 +69,7 @@
6969
70Here's the recipe from above updated to use a central Breezy mirror::70Here's the recipe from above updated to use a central Breezy mirror::
7171
72 brz init-repo beagle-repo72 brz init-shared-repo beagle-repo
73 cd beagle-repo73 cd beagle-repo
74 brz branch bzr+ssh://brz.gnome.org/beagle.brz/trunk beagle-trunk74 brz branch bzr+ssh://brz.gnome.org/beagle.brz/trunk beagle-trunk
75 brz branch beagle-trunk beagle-feature175 brz branch beagle-trunk beagle-feature1
7676
=== modified file 'tools/win32/build_release.py'
--- tools/win32/build_release.py 2018-11-16 13:02:50 +0000
+++ tools/win32/build_release.py 2019-10-13 18:08:15 +0000
@@ -136,7 +136,8 @@
136 if not os.path.isdir(plugin_name):136 if not os.path.isdir(plugin_name):
137 if plugin_name in ('bzr-svn', 'bzr-rewrite'):137 if plugin_name in ('bzr-svn', 'bzr-rewrite'):
138 # bzr-svn uses a different repo format138 # bzr-svn uses a different repo format
139 call_or_fail([brz(), 'init-repo', '--rich-root-pack', plugin_name])139 call_or_fail(
140 [brz(), 'init-shared-repo', '--rich-root-pack', plugin_name])
140 else:141 else:
141 os.mkdir(plugin_name)142 os.mkdir(plugin_name)
142 if os.path.isdir(release_dir):143 if os.path.isdir(release_dir):

Subscribers

People subscribed via source and target branches