Merge lp:~jelmer/bzr/merge-2.5 into lp:bzr

[Jelmer Vernooij]

Merge bzr/2.5.

Merge bzr/2.5.

=== modified file 'bzrlib/info.py'
--- bzrlib/info.py	2012-01-18 20:47:13 +0000
+++ bzrlib/info.py	2012-02-23 18:27:21 +0000
@@ -200,9 +200,10 @@
             repository._format.get_format_description())
 
 
-def _show_locking_info(repository, branch=None, working=None, outfile=None):
+def _show_locking_info(repository=None, branch=None, working=None,
+        outfile=None):
     """Show locking status of working, branch and repository."""
-    if (repository.get_physical_lock_status() or
+    if (repository and repository.get_physical_lock_status() or
         (branch and branch.get_physical_lock_status()) or
         (working and working.get_physical_lock_status())):
         outfile.write('\n')
@@ -413,11 +414,12 @@
     if branch is not None:
         show_committers = verbose >= 2
         stats = _show_branch_stats(branch, show_committers, outfile)
-    else:
+    elif repository is not None:
         stats = repository.gather_stats()
-    if branch is None and working is None:
+    if branch is None and working is None and repository is not None:
         _show_repository_info(repository, outfile)
-    _show_repository_stats(repository, stats, outfile)
+    if repository is not None:
+        _show_repository_stats(repository, stats, outfile)
 
 
 def describe_layout(repository=None, branch=None, tree=None, control=None):

=== modified file 'bzrlib/tests/blackbox/test_info.py'
--- bzrlib/tests/blackbox/test_info.py	2012-02-14 17:22:37 +0000
+++ bzrlib/tests/blackbox/test_info.py	2012-02-23 18:27:21 +0000
@@ -57,6 +57,19 @@
             '  control directory: ctrl\n')
         self.assertEquals(err, '')
 
+    def test_info_empty_controldir_verbose(self):
+        self.make_bzrdir('ctrl')
+        out, err = self.run_bzr('info -v ctrl')
+        self.assertEqualDiff(out,
+            'Empty control directory (format: 2a or pack-0.92)\n'
+            'Location:\n'
+            '  control directory: ctrl\n\n'
+            'Format:\n'
+            '       control: Meta directory format 1\n\n'
+            'Control directory:\n'
+            '         0 branches\n')
+        self.assertEquals(err, '')
+
     def test_info_dangling_branch_reference(self):
         br = self.make_branch('target')
         br.create_checkout('from', lightweight=True)

=== modified file 'bzrlib/tests/per_controldir_colo/test_supported.py'
--- bzrlib/tests/per_controldir_colo/test_supported.py	2012-01-23 19:09:00 +0000
+++ bzrlib/tests/per_controldir_colo/test_supported.py	2012-02-23 18:27:21 +0000
@@ -145,6 +145,10 @@
     def test_branch_reference(self):
         referenced = self.make_branch('referenced')
         repo = self.make_repository('repo')
-        repo.bzrdir.set_branch_reference(referenced, name='foo')
+        try:
+            repo.bzrdir.set_branch_reference(referenced, name='foo')
+        except errors.IncompatibleFormat:
+            raise tests.TestNotApplicable(
+                'Control dir does not support creating branch references.')
         self.assertEquals(referenced.base,
             repo.bzrdir.get_branch_reference('foo'))

=== modified file 'bzrlib/transport/http/_urllib2_wrappers.py'
--- bzrlib/transport/http/_urllib2_wrappers.py	2012-02-15 10:24:06 +0000
+++ bzrlib/transport/http/_urllib2_wrappers.py	2012-02-23 18:27:21 +0000
@@ -88,7 +88,7 @@
     ]
 def default_ca_certs():
     if sys.platform == 'win32':
-        return os.path.join(os.path.dirname(sys.executable), u"ca_bundle.crt")
+        return os.path.join(os.path.dirname(sys.executable), u"cacert.pem")
     elif sys.platform == 'darwin':
         # FIXME: Needs some default value for osx, waiting for osx installers
         # guys feedback -- vila 2012-01-25

=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- doc/en/release-notes/bzr-2.5.txt	2012-02-18 16:55:04 +0000
+++ doc/en/release-notes/bzr-2.5.txt	2012-02-23 18:27:21 +0000
@@ -36,6 +36,9 @@
 .. Fixes for situations where bzr would previously crash or give incorrect
    or undesirable results.
 
+* Show locks in ``bzr info`` on control directories without a
+  repository. (Jelmer Vernooij, #936767)
+
 * Disable ssl certificate verification on osx and windows until a native
   access to the the root certificates is provided there.
   (Vincent Ladeuil, #929179)