From 6e96095cfcf3fd9ce7d6265526d9ef9b939a28ec Mon Sep 17 00:00:00 2001
From: Sebastian Thiel <sebastian.thiel@icloud.com>
Date: Sat, 4 Mar 2023 11:21:55 +0100
Subject: [PATCH] Adjust git::fetch() progress bar to deal with
 gitoxide-specifics

The `git2` implementation can leverage that `git2` provides a consistent
view on the objects to be index, so it looks like 33% of the time is spent
receiving objects, and the rest of the time is used resolving them.

In `gitoxide`, there are two distinct phases and these are exposed by the way
we obtain progress for two separate phases. We have to do some math to renormalize
those to a single, continuous progress by mapping the values for 'amount of objects'
to the first half and second half of the progress bar respectively.

This has the advantage of having the first phase (receiving objects) end at 50%
and the second phase (resolving deltas) at 100%.
---
 Cargo.toml                     | 4 ++--
 src/cargo/sources/git/oxide.rs | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 4534cf15d..f65fb7f55 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -30,8 +30,8 @@ filetime = "0.2.9"
 flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] }
 git2 = "0.16.0"
 git2-curl = "0.17.0"
-gix = { version = "0.38.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree"] }
-gix-features-for-configuration-only = { version = "0.27.0", package = "gix-features", features = [ "parallel" ] }
+gix = { version = "0.39.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree"] }
+gix-features-for-configuration-only = { version = "0.28.0", package = "gix-features", features = [ "parallel" ] }
 glob = "0.3.0"
 hex = "0.4"
 hmac = "0.12.1"
diff --git a/src/cargo/sources/git/oxide.rs b/src/cargo/sources/git/oxide.rs
index cccd127c4..cf301bbd0 100644
--- a/src/cargo/sources/git/oxide.rs
+++ b/src/cargo/sources/git/oxide.rs
@@ -96,13 +96,14 @@ fn translate_progress_to_bar(
             tasks.iter().find_map(|(_, t)| cb(t))
         }
 
+        const NUM_PHASES: usize = 2; // indexing + delta-resolution, both with same amount of objects to handle
         if let Some(objs) = find_in(&tasks, |t| progress_by_id(resolve_objects, t)) {
             // Resolving deltas.
             let objects = objs.step.load(Ordering::Relaxed);
             let total_objects = objs.done_at.expect("known amount of objects");
             let msg = format!(", ({objects}/{total_objects}) resolving deltas");
 
-            progress_bar.tick(objects, total_objects, &msg)?;
+            progress_bar.tick(total_objects + objects, total_objects * NUM_PHASES, &msg)?;
         } else if let Some((objs, read_pack)) =
             find_in(&tasks, |t| progress_by_id(read_pack_bytes, t)).and_then(|read| {
                 find_in(&tasks, |t| progress_by_id(delta_index_objects, t))
@@ -122,7 +123,7 @@ fn translate_progress_to_bar(
             let (rate, unit) = human_readable_bytes(counter.rate() as u64);
             let msg = format!(", {rate:.2}{unit}/s");
 
-            progress_bar.tick(objects, total_objects, &msg)?;
+            progress_bar.tick(objects, total_objects * NUM_PHASES, &msg)?;
         }
     }
     Ok(())