Rev 3702: Cherry pick init "verbose" tweaks in file:///v/home/vila/src/bzr/integration/1.7/

[Vincent Ladeuil]

At file:///v/home/vila/src/bzr/integration/1.7/

------------------------------------------------------------
revno: 3702
revision-id: v.ladeuil+lp at free.fr-20080916165714-isrnfb75d68vjxaj
parent: pqm at pqm.ubuntu.com-20080916001152-wi5calcm4ic36lee
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 1.7
timestamp: Tue 2008-09-16 18:57:14 +0200
message:
  Cherry pick init "verbose" tweaks
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
-------------- next part --------------
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2008-09-01 23:49:18 +0000
+++ b/bzrlib/builtins.py	2008-09-16 16:57:14 +0000
@@ -1312,22 +1312,22 @@
             _create_prefix(to_transport)
 
         try:
-            existing_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
+            a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
         except errors.NotBranchError:
             # really a NotBzrDir error...
             create_branch = bzrdir.BzrDir.create_branch_convenience
             branch = create_branch(to_transport.base, format=format,
                                    possible_transports=[to_transport])
+            a_bzrdir = branch.bzrdir
         else:
             from bzrlib.transport.local import LocalTransport
-            if existing_bzrdir.has_branch():
+            if a_bzrdir.has_branch():
                 if (isinstance(to_transport, LocalTransport)
-                    and not existing_bzrdir.has_workingtree()):
+                    and not a_bzrdir.has_workingtree()):
                         raise errors.BranchExistsWithoutWorkingTree(location)
                 raise errors.AlreadyBranchError(location)
-            else:
-                branch = existing_bzrdir.create_branch()
-                existing_bzrdir.create_workingtree()
+            branch = a_bzrdir.create_branch()
+            a_bzrdir.create_workingtree()
         if append_revisions_only:
             try:
                 branch.set_append_revisions_only(True)
@@ -1336,8 +1336,7 @@
                     ' to append-revisions-only.  Try --experimental-branch6')
         if not is_quiet():
             from bzrlib.info import show_bzrdir_info
-            show_bzrdir_info(bzrdir.BzrDir.open_containing_from_transport(
-                to_transport)[0], verbose=0, outfile=self.outf)
+            show_bzrdir_info(a_bzrdir, verbose=0, outfile=self.outf)
 
 
 class cmd_init_repository(Command):
@@ -1391,8 +1390,7 @@
         repo.set_make_working_trees(not no_trees)
         if not is_quiet():
             from bzrlib.info import show_bzrdir_info
-            show_bzrdir_info(bzrdir.BzrDir.open_containing_from_transport(
-                to_transport)[0], verbose=0, outfile=self.outf)
+            show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
 
 
 class cmd_diff(Command):

=== modified file 'bzrlib/tests/blackbox/test_init.py'
--- a/bzrlib/tests/blackbox/test_init.py	2008-07-18 07:29:06 +0000
+++ b/bzrlib/tests/blackbox/test_init.py	2008-09-16 16:57:14 +0000
@@ -142,7 +142,7 @@
         except UnicodeError:
             raise TestSkipped("Unable to create Unicode filename")
         # try to init unicode dir
-        self.run_bzr(['init', u'mu-\xb5'])
+        self.run_bzr(['init', '-q', u'mu-\xb5'])
 
     def create_simple_tree(self):
         tree = self.make_branch_and_tree('tree')