Rev 6511: (vila) Ensures the format registry is not empty when generating docs for in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6511 [merge]
revision-id: pqm at pqm.ubuntu.com-20120316150505-30l88aa34gy2j4hx
parent: pqm at pqm.ubuntu.com-20120316141506-30gdc3wkbgmwkdus
parent: v.ladeuil+lp at free.fr-20120316111003-a3fsp7hi8wo86e3a
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2012-03-16 15:05:05 +0000
message:
  (vila) Ensures the format registry is not empty when generating docs for
   sphinx (Vincent Ladeuil)
modified:
  doc/en/release-notes/bzr-2.6.txt bzr2.6.txt-20120116134316-8w1xxom1c7vcu1t5-1
  tools/generate_docs.py         bzrinfogen.py-20051211224525-78e7c14f2c955e55
=== modified file 'doc/en/release-notes/bzr-2.6.txt'
--- a/doc/en/release-notes/bzr-2.6.txt	2012-03-16 13:46:56 +0000
+++ b/doc/en/release-notes/bzr-2.6.txt	2012-03-16 15:05:05 +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,
     )