Rev 6509: Ensures the format registry is not empty when generating docs for sphinx in file:///home/vila/src/bzr/bugs/956860-doc-generate/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/956860-doc-generate/

------------------------------------------------------------
revno: 6509
revision-id: v.ladeuil+lp at free.fr-20120316111003-a3fsp7hi8wo86e3a
parent: pqm at pqm.ubuntu.com-20120315213553-pj1g3cjj19nstvns
fixes bug: https://launchpad.net/bugs/956860
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 956860-doc-generate
timestamp: Fri 2012-03-16 12:10:03 +0100
message:
  Ensures the format registry is not empty when generating docs for sphinx
-------------- next part --------------
=== modified file 'doc/en/release-notes/bzr-2.6.txt'
--- a/doc/en/release-notes/bzr-2.6.txt	2012-03-15 15:09:48 +0000
+++ b/doc/en/release-notes/bzr-2.6.txt	2012-03-16 11:10:03 +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'
--- a/tools/generate_docs.py	2011-09-26 15:40:02 +0000
+++ b/tools/generate_docs.py	2012-03-16 11:10:03 +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,
     )