Merge lp:~vila/bzr/956860-doc-generate into lp:bzr

[Vincent Ladeuil]

Ensures the format registry is not empty when generating docs for sphinx

Not worth thinking too much when the fix is that simple.

If this can avoid a failure on escudero when building
docs.bazaar.canonical.com, let's just do it.

See associated bug for details.

[Martin Packman (gz)]

Hu, a script that uses bzrlib.initialize() and commands.install_bzr_command_hooks() but still needs more dancing to actually work.

We end up doing a lot using the bzrlib tree just when calling setup.py which dirties the state rather.

review: Approve

[Vincent Ladeuil (vila)]

> Hu, a script that uses bzrlib.initialize() and
> commands.install_bzr_command_hooks() but still needs more dancing to actually
> work.
>

<shudder>, yes :-/ And I did use bzrlib.initialize() *just* to avoid such issues here...(That is, the last time I touched generate_docs).

Poking jelmer for further advice as I think it's a fallout from his work on lazy loading (not throwing stones, really, but there may be a way to avoid this particular fallout by still loading something wt/branch/repo ?)

> We end up doing a lot using the bzrlib tree just when calling setup.py which
> dirties the state rather.

I don't follow, generate_docs is not related to setup.py, what do you mean ?

[Vincent Ladeuil (vila)]

sent to pqm by email

=== modified file 'doc/en/release-notes/bzr-2.6.txt'
--- doc/en/release-notes/bzr-2.6.txt	2012-03-15 15:09:48 +0000
+++ doc/en/release-notes/bzr-2.6.txt	2012-03-16 11:22:18 +0000
@@ -37,6 +37,9 @@
 
 .. Improved or updated documentation.
 
+* Force format registration to avoid generate_docs.py traceback when the
+  registry is empty. (Vincent Ladeuil, #956860)
+
 API Changes
 ***********
 
 
=== modified file 'tools/generate_docs.py'
--- tools/generate_docs.py	2011-09-26 15:40:02 +0000
+++ tools/generate_docs.py	2012-03-16 11:22:18 +0000
@@ -41,6 +41,9 @@
 import bzrlib
 from bzrlib import (
     commands,
+    # Don't remove the following import, it triggers a format registration that
+    # avoid http://pad.lv/956860
+    branch,
     doc_generate,
     )