Rev 19: Make chk_inv support optional - work with regular bzr. in http://people.ubuntu.com/~robertc/baz2.0/plugins/repodetails/trunk

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/plugins/repodetails/trunk

------------------------------------------------------------
revno: 19
revision-id: robertc at robertcollins.net-20090210042619-q6xka6cioosmhtod
parent: john at arbash-meinel.com-20090106175936-u0robeaqahsw2zym
committer: Robert Collins <robertc at robertcollins.net>
branch nick: trunk
timestamp: Tue 2009-02-10 15:26:19 +1100
message:
  Make chk_inv support optional - work with regular bzr.
=== modified file 'gather_stats.py'
--- a/gather_stats.py	2009-01-06 17:59:36 +0000
+++ b/gather_stats.py	2009-02-10 04:26:19 +0000
@@ -22,8 +22,25 @@
 
 import math
 
-from bzrlib import chk_map, repository, ui, tsort
-from bzrlib.inventory import CHKInventory
+from bzrlib import repository, ui, tsort
+try:
+    from bzrlib import chk_map
+    from bzrlib.inventory import CHKInventory
+    from bzrlib.repofmt.pack_repo import (
+        RepositoryFormatPackDevelopment3,
+        RepositoryFormatPackDevelopment3Subtree,
+        RepositoryFormatPackDevelopment4,
+        RepositoryFormatPackDevelopment4Subtree,
+        )
+    pack_chk_inv_types = (
+        RepositoryFormatPackDevelopment3,
+        RepositoryFormatPackDevelopment3Subtree,
+        RepositoryFormatPackDevelopment4,
+        RepositoryFormatPackDevelopment4Subtree,
+        )
+    chk_support = True
+except ImportError:
+    chk_support = False
 from bzrlib.repofmt.pack_repo import (
     RepositoryFormatKnitPack1,
     RepositoryFormatKnitPack3,
@@ -35,10 +52,6 @@
     RepositoryFormatKnitPack6RichRoot,
     RepositoryFormatPackDevelopment2,
     RepositoryFormatPackDevelopment2Subtree,
-    RepositoryFormatPackDevelopment3,
-    RepositoryFormatPackDevelopment3Subtree,
-    RepositoryFormatPackDevelopment4,
-    RepositoryFormatPackDevelopment4Subtree,
     )
 
 pack_rev_types = (
@@ -52,11 +65,26 @@
     RepositoryFormatKnitPack6RichRoot,
     RepositoryFormatPackDevelopment2,
     RepositoryFormatPackDevelopment2Subtree,
-    RepositoryFormatPackDevelopment3,
-    RepositoryFormatPackDevelopment3Subtree,
-    RepositoryFormatPackDevelopment4,
-    RepositoryFormatPackDevelopment4Subtree,
     )
+if chk_support:
+    pack_rev_types = pack_rev_types + (
+        RepositoryFormatPackDevelopment3,
+        RepositoryFormatPackDevelopment3Subtree,
+        RepositoryFormatPackDevelopment4,
+        RepositoryFormatPackDevelopment4Subtree,
+        )
+    pack_signature_types = pack_signature_types + (
+        RepositoryFormatPackDevelopment3,
+        RepositoryFormatPackDevelopment3Subtree,
+        RepositoryFormatPackDevelopment4,
+        RepositoryFormatPackDevelopment4Subtree,
+        )
+    pack_text_types = pack_text_types + (
+        RepositoryFormatPackDevelopment3,
+        RepositoryFormatPackDevelopment3Subtree,
+        RepositoryFormatPackDevelopment4,
+        RepositoryFormatPackDevelopment4Subtree,
+        )
 pack_signature_types = (
     RepositoryFormatKnitPack1,
     RepositoryFormatKnitPack3,
@@ -68,10 +96,6 @@
     RepositoryFormatKnitPack6RichRoot,
     RepositoryFormatPackDevelopment2,
     RepositoryFormatPackDevelopment2Subtree,
-    RepositoryFormatPackDevelopment3,
-    RepositoryFormatPackDevelopment3Subtree,
-    RepositoryFormatPackDevelopment4,
-    RepositoryFormatPackDevelopment4Subtree,
     )
 pack_text_types = (
     RepositoryFormatKnitPack1,
@@ -84,10 +108,6 @@
     RepositoryFormatKnitPack6RichRoot,
     RepositoryFormatPackDevelopment2,
     RepositoryFormatPackDevelopment2Subtree,
-    RepositoryFormatPackDevelopment3,
-    RepositoryFormatPackDevelopment3Subtree,
-    RepositoryFormatPackDevelopment4,
-    RepositoryFormatPackDevelopment4Subtree,
     )
 pack_xml_inv_types = (
     RepositoryFormatKnitPack1,
@@ -101,12 +121,6 @@
     RepositoryFormatPackDevelopment2,
     RepositoryFormatPackDevelopment2Subtree,
     )
-pack_chk_inv_types = (
-    RepositoryFormatPackDevelopment3,
-    RepositoryFormatPackDevelopment3Subtree,
-    RepositoryFormatPackDevelopment4,
-    RepositoryFormatPackDevelopment4Subtree,
-    )
 
 
 class ObjectStats(object):