Fix progress and handling of large of multi-pack index offsets (#279)

GitoxideLabs · Jan 1, 2022 · 5dc1f81 · 5dc1f81
1 parent 89428b2
commit 5dc1f81
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/git-pack/src/multi_index/chunk.rs b/git-pack/src/multi_index/chunk.rs
@@ -243,15 +243,15 @@ pub mod large_offsets {
 
     pub(crate) fn write(
         sorted_entries: &[multi_index::write::Entry],
-        num_large_offsets: usize,
+        mut num_large_offsets: usize,
         mut out: impl std::io::Write,
     ) -> std::io::Result<()> {
         for offset in sorted_entries
             .iter()
             .filter_map(|e| (e.pack_offset > LARGE_OFFSET_THRESHOLD).then(|| e.pack_offset))
         {
             out.write_u64::<BigEndian>(offset)?;
-            num_large_offsets
+            num_large_offsets = num_large_offsets
                 .checked_sub(1)
                 .expect("BUG: wrote more offsets the previously found");
         }

diff --git a/git-pack/src/multi_index/write.rs b/git-pack/src/multi_index/write.rs
@@ -118,6 +118,7 @@ impl multi_index::File {
                     .then_with(|| l.pack_index.cmp(&r.pack_index))
             });
             entries.dedup_by_key(|e| e.id);
+            progress.inc_by(entries.len());
             progress.show_throughput(start);
             if should_interrupt.load(Ordering::Relaxed) {
                 return Err(Error::Interrupted);

diff --git a/gitoxide-core/src/pack/multi_index.rs b/gitoxide-core/src/pack/multi_index.rs
@@ -5,7 +5,7 @@ use std::sync::atomic::AtomicBool;
 
 use git_repository as git;
 
-pub const PROGRESS_RANGE: std::ops::RangeInclusive<u8> = 2..=3;
+pub const PROGRESS_RANGE: std::ops::RangeInclusive<u8> = 1..=3;
 
 pub fn create(
     index_paths: Vec<PathBuf>,