Merging upstream version 1.74.1+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/vendor/gix-negotiate/src/consecutive.rs b/vendor/gix-negotiate/src/consecutive.rs
index f213cd949..ae4b4e030 100644
--- a/vendor/gix-negotiate/src/consecutive.rs
+++ b/vendor/gix-negotiate/src/consecutive.rs
@@ -1,17 +1,17 @@
+use gix_date::SecondsSinceUnixEpoch;
 use gix_hash::ObjectId;
-use gix_revision::graph::CommitterTimestamp;
 
 use crate::{Error, Flags, Negotiator};
 
 pub(crate) struct Algorithm {
-    revs: gix_revision::PriorityQueue<CommitterTimestamp, ObjectId>,
+    revs: gix_revwalk::PriorityQueue<SecondsSinceUnixEpoch, ObjectId>,
     non_common_revs: usize,
 }
 
 impl Default for Algorithm {
     fn default() -> Self {
         Self {
-            revs: gix_revision::PriorityQueue::new(),
+            revs: gix_revwalk::PriorityQueue::new(),
             non_common_revs: 0,
         }
     }
@@ -50,7 +50,7 @@ impl Algorithm {
             .try_lookup_or_insert_commit(id, |data| is_common = data.flags.contains(Flags::COMMON))?
             .filter(|_| !is_common)
         {
-            let mut queue = gix_revision::PriorityQueue::from_iter(Some((commit.commit_time, (id, 0_usize))));
+            let mut queue = gix_revwalk::PriorityQueue::from_iter(Some((commit.commit_time, (id, 0_usize))));
             if let Mark::ThisCommitAndAncestors = mode {
                 commit.data.flags |= Flags::COMMON;
                 if commit.data.flags.contains(Flags::SEEN) && !commit.data.flags.contains(Flags::POPPED) {