Rev 21: Update groupcompress to bzrlib 1.10. in http://people.ubuntu.com/~robertc/baz2.0/plugins/groupcompress/trunk

[Robert Collins]

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

------------------------------------------------------------
revno: 21
revision-id: robertc at robertcollins.net-20090107032515-tj4y1xwol3rme9k0
parent: robertc at robertcollins.net-20080725045827-ixxmnk4cp7cmzad9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: trunk
timestamp: Wed 2009-01-07 14:25:15 +1100
message:
  Update groupcompress to bzrlib 1.10.
=== modified file 'groupcompress.py'
--- a/groupcompress.py	2008-07-25 04:58:27 +0000
+++ b/groupcompress.py	2009-01-07 03:25:15 +0000
@@ -39,7 +39,7 @@
     sha_strings,
     split_lines,
     )
-from bzrlib.plugins.index2.btree_index import BTreeBuilder
+from bzrlib.btree_index import BTreeBuilder
 from bzrlib.plugins.groupcompress import equivalence_table
 from bzrlib.tsort import topo_sort
 from bzrlib.versionedfile import (

=== modified file 'repofmt.py'
--- a/repofmt.py	2008-07-15 12:58:20 +0000
+++ b/repofmt.py	2009-01-07 03:25:15 +0000
@@ -21,25 +21,24 @@
 import time
 
 from bzrlib import debug, errors, pack, repository
+from bzrlib.btree_index import (
+    BTreeBuilder,
+    BTreeGraphIndex,
+    )
 from bzrlib.index import GraphIndex, GraphIndexBuilder
 from bzrlib.repository import InterPackRepo
 from bzrlib.plugins.groupcompress.groupcompress import (
     _GCGraphIndex,
     GroupCompressVersionedFiles,
     )
-from bzrlib.plugins.index2.btree_index import (
-    BTreeBuilder,
-    BTreeGraphIndex,
-    FixedMemoryGraphIndex,
-    )
 from bzrlib.osutils import rand_chars
 from bzrlib.repofmt.pack_repo import (
     Pack,
     NewPack,
     KnitPackRepository,
     RepositoryPackCollection,
-    RepositoryFormatPackDevelopment0,
-    RepositoryFormatPackDevelopment0Subtree,
+    RepositoryFormatPackDevelopment2,
+    RepositoryFormatPackDevelopment2Subtree,
     RepositoryFormatKnitPack1,
     RepositoryFormatKnitPack3,
     RepositoryFormatKnitPack4,
@@ -241,7 +240,7 @@
         self._reconcile_backsup_inventory = False
 
 
-class RepositoryFormatPackGCPlain(RepositoryFormatPackDevelopment0):
+class RepositoryFormatPackGCPlain(RepositoryFormatPackDevelopment2):
     """A B+Tree index using pack repository."""
 
     repository_class = GCPackRepository
@@ -273,7 +272,7 @@
             ", interoperates with rich-root-pack\n")
 
 
-class RepositoryFormatPackGCSubtrees(RepositoryFormatPackDevelopment0Subtree):
+class RepositoryFormatPackGCSubtrees(RepositoryFormatPackDevelopment2Subtree):
     """A B+Tree index using pack repository."""
 
     repository_class = GCPackRepository