Rev 3939: init prints more concise information in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Thu Jan 15 06:28:52 GMT 2009
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3939
revision-id: pqm at pqm.ubuntu.com-20090115062848-vl9tlzwnawaqht01
parent: pqm at pqm.ubuntu.com-20090114051315-92k8x1bysxbvs0mu
parent: mbp at sourcefrog.net-20090115051822-o2xh2rpsdhovwzm4
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-01-15 06:28:48 +0000
message:
init prints more concise information
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
------------------------------------------------------------
revno: 3938.1.1
revision-id: mbp at sourcefrog.net-20090115051822-o2xh2rpsdhovwzm4
parent: pqm at pqm.ubuntu.com-20090114051315-92k8x1bysxbvs0mu
parent: amanic at gmail.com-20090106220351-1abewrk6luuep0vc
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integration
timestamp: Thu 2009-01-15 16:18:22 +1100
message:
init prints more concise information
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
------------------------------------------------------------
revno: 3922.2.2
revision-id: amanic at gmail.com-20090106220351-1abewrk6luuep0vc
parent: amanic at gmail.com-20090106213609-idg4oy9kce4qgtpl
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.init_output
timestamp: Wed 2009-01-07 00:03:51 +0200
message:
add NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3922.2.1
revision-id: amanic at gmail.com-20090106213609-idg4oy9kce4qgtpl
parent: pqm at pqm.ubuntu.com-20090106073252-m4c72a1m7004nqmz
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.init_output
timestamp: Tue 2009-01-06 23:36:09 +0200
message:
make `bzr init` less verbose, and update tests
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
=== modified file 'NEWS'
--- a/NEWS 2009-01-14 04:05:52 +0000
+++ b/NEWS 2009-01-15 05:18:22 +0000
@@ -19,6 +19,9 @@
IMPROVEMENTS:
+ * ``bzr init`` will now print a little less verbose output.
+ (Marius Kruger)
+
BUG FIXES:
DOCUMENTATION:
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2009-01-14 04:05:52 +0000
+++ b/bzrlib/builtins.py 2009-01-15 05:18:22 +0000
@@ -1506,8 +1506,23 @@
raise errors.BzrCommandError('This branch format cannot be set'
' to append-revisions-only. Try --experimental-branch6')
if not is_quiet():
- from bzrlib.info import show_bzrdir_info
- show_bzrdir_info(a_bzrdir, verbose=0, outfile=self.outf)
+ from bzrlib.info import describe_layout, describe_format
+ try:
+ tree = a_bzrdir.open_workingtree(recommend_upgrade=False)
+ except (errors.NoWorkingTree, errors.NotLocalUrl):
+ tree = None
+ repository = branch.repository
+ layout = describe_layout(repository, branch, tree).lower()
+ format = describe_format(a_bzrdir, repository, branch, tree)
+ self.outf.write("Created a %s (format: %s)\n" % (layout, format))
+ if repository.is_shared():
+ #XXX: maybe this can be refactored into transport.path_or_url()
+ url = repository.bzrdir.root_transport.external_url()
+ try:
+ url = urlutils.local_path_from_url(url)
+ except errors.InvalidURL:
+ pass
+ self.outf.write("Using shared repository: %s\n" % url)
class cmd_init_repository(Command):
=== modified file 'bzrlib/tests/blackbox/test_init.py'
--- a/bzrlib/tests/blackbox/test_init.py 2008-09-16 21:38:29 +0000
+++ b/bzrlib/tests/blackbox/test_init.py 2009-01-06 21:36:09 +0000
@@ -22,6 +22,7 @@
from bzrlib import (
branch as _mod_branch,
+ urlutils,
)
from bzrlib.bzrdir import BzrDirMetaFormat1
from bzrlib.tests import TestSkipped
@@ -44,10 +45,8 @@
# --format=weave should be accepted to allow interoperation with
# old releases when desired.
out, err = self.run_bzr('init --format=weave')
- self.assertEqual("""Standalone tree (format: weave)
-Location:
- branch root: .
-""", out)
+ self.assertEqual("""Created a standalone tree (format: weave)\n""",
+ out)
self.assertEqual('', err)
def test_init_at_repository_root(self):
@@ -60,32 +59,26 @@
repo = newdir.create_repository(shared=True)
repo.set_make_working_trees(False)
out, err = self.run_bzr('init repo')
- self.assertEqual(
-"""Repository tree (format: pack-0.92)
-Location:
- shared repository: repo
- repository branch: repo
-""", out)
+ self.assertEqual("""Created a repository tree (format: pack-0.92)
+Using shared repository: %s
+""" % urlutils.local_path_from_url(
+ repo.bzrdir.root_transport.external_url()), out)
+ self.assertEndsWith(out, "bzrlib.tests.blackbox.test_init.TestInit."
+ "test_init_at_repository_root/work/repo/\n")
self.assertEqual('', err)
newdir.open_branch()
newdir.open_workingtree()
-
+
def test_init_branch(self):
out, err = self.run_bzr('init')
- self.assertEqual(
-"""Standalone tree (format: pack-0.92)
-Location:
- branch root: .
-""", out)
+ self.assertEqual("""Created a standalone tree (format: pack-0.92)\n""",
+ out)
self.assertEqual('', err)
# Can it handle subdirectories of branches too ?
out, err = self.run_bzr('init subdir1')
- self.assertEqual(
-"""Standalone tree (format: pack-0.92)
-Location:
- branch root: subdir1
-""", out)
+ self.assertEqual("""Created a standalone tree (format: pack-0.92)\n""",
+ out)
self.assertEqual('', err)
WorkingTree.open('subdir1')
@@ -96,10 +89,8 @@
os.mkdir('subdir2')
out, err = self.run_bzr('init subdir2')
- self.assertEqual("""Standalone tree (format: pack-0.92)
-Location:
- branch root: subdir2
-""", out)
+ self.assertEqual("""Created a standalone tree (format: pack-0.92)\n""",
+ out)
self.assertEqual('', err)
# init an existing branch.
out, err = self.run_bzr('init subdir2', retcode=3)
@@ -166,11 +157,10 @@
def test_init(self):
# init on a remote url should succeed.
out, err = self.run_bzr(['init', self.get_url()])
- self.assertStartsWith(out, """Standalone branch (format: pack-0.92)
-Location:
- branch root: """)
+ self.assertEqual(out,
+ """Created a standalone branch (format: pack-0.92)\n""")
self.assertEqual('', err)
-
+
def test_init_existing_branch(self):
# when there is already a branch present, make mention
self.make_branch('.')
More information about the bazaar-commits
mailing list