Remove circular dep between git and midx

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Tested-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/lib/bup/gc.py b/lib/bup/gc.py
index 819756ffa480f0adb96981a99c31815159f56252..d05357c6572a87c6223aadba3caf4e38163d913f 100644 (file)
--- a/lib/bup/gc.py
+++ b/lib/bup/gc.py
@@ -229,10 +229,11 @@ def bup_gc(threshold=10, compression=1, verbosity=0):
         try:
             # FIXME: just rename midxes and bloom, and restore them at the end if
             # we didn't change any packs?
+            packdir = git.repo('objects/pack')
             if verbosity: log('clearing midx files\n')
-            midx.clear_midxes()
+            midx.clear_midxes(packdir)
             if verbosity: log('clearing bloom filter\n')
-            bloom.clear_bloom(git.repo('objects/pack'))
+            bloom.clear_bloom(packdir)
             if verbosity: log('clearing reflog\n')
             expirelog_cmd = ['git', 'reflog', 'expire', '--all', '--expire=all']
             expirelog = subprocess.Popen(expirelog_cmd, preexec_fn = git._gitenv())

diff --git a/lib/bup/midx.py b/lib/bup/midx.py
index 1bf946ce28ebb0a9f48c55b6c708644ca45dbd57..a4ef37b21cbaa792aa622d9bdd109ce5f3434498 100644 (file)
--- a/lib/bup/midx.py
+++ b/lib/bup/midx.py
@@ -1,5 +1,5 @@
 
-import git, glob, mmap, os, struct
+import glob, mmap, os, struct
 
 from bup import _helpers
 from bup.helpers import log, mmap_read
@@ -122,6 +122,5 @@ class PackMidx:
 
 
 def clear_midxes(dir=None):
-    dir = dir or git.repo('objects/pack')
     for midx in glob.glob(os.path.join(dir, '*.midx')):
         os.unlink(midx)