From: Rob Browning <rlb@defaultvalue.org>
Date: Sat, 27 Jan 2018 17:39:30 +0000 (-0600)
Subject: Remove circular dep between git and midx
X-Git-Tag: 0.30~110
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=bup.git;a=commitdiff_plain;h=6df109426b0b22f016ccf67414d140655ac5d3c5

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 819756f..d05357c 100644
--- 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 1bf946c..a4ef37b 100644
--- 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)