From 10ee2acdd26a7f1298c6f6d6b7af9b469fe29b87 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sat, 4 May 2024 14:41:41 +0200
Subject: Merging upstream version 1.70.0+dfsg2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 vendor/gix/src/revision/spec/mod.rs | 90 +++++++++++++++++++++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 vendor/gix/src/revision/spec/mod.rs

(limited to 'vendor/gix/src/revision/spec/mod.rs')

diff --git a/vendor/gix/src/revision/spec/mod.rs b/vendor/gix/src/revision/spec/mod.rs
new file mode 100644
index 000000000..a6a6eb739
--- /dev/null
+++ b/vendor/gix/src/revision/spec/mod.rs
@@ -0,0 +1,90 @@
+use crate::{ext::ReferenceExt, revision::Spec, Id, Reference};
+
+///
+pub mod parse;
+
+mod impls {
+    use std::ops::{Deref, DerefMut};
+
+    use crate::revision::Spec;
+
+    impl<'repo> Deref for Spec<'repo> {
+        type Target = gix_revision::Spec;
+
+        fn deref(&self) -> &Self::Target {
+            &self.inner
+        }
+    }
+
+    impl<'repo> DerefMut for Spec<'repo> {
+        fn deref_mut(&mut self) -> &mut Self::Target {
+            &mut self.inner
+        }
+    }
+
+    impl<'repo> PartialEq for Spec<'repo> {
+        fn eq(&self, other: &Self) -> bool {
+            self.inner == other.inner
+        }
+    }
+
+    impl<'repo> Eq for Spec<'repo> {}
+}
+
+/// Initialization
+impl<'repo> Spec<'repo> {
+    /// Create a single specification which points to `id`.
+    pub fn from_id(id: Id<'repo>) -> Self {
+        Spec {
+            inner: gix_revision::Spec::Include(id.inner),
+            repo: id.repo,
+            first_ref: None,
+            second_ref: None,
+        }
+    }
+}
+
+/// Access
+impl<'repo> Spec<'repo> {
+    /// Detach the `Repository` from this instance, leaving only plain data that can be moved freely and serialized.
+    pub fn detach(self) -> gix_revision::Spec {
+        self.inner
+    }
+
+    /// Some revision specifications leave information about references which are returned as `(from-ref, to-ref)` here, e.g.
+    /// `HEAD@{-1}..main` might be `(Some(refs/heads/previous-branch), Some(refs/heads/main))`,
+    /// or `@` returns `(Some(refs/heads/main), None)`.
+    pub fn into_references(self) -> (Option<Reference<'repo>>, Option<Reference<'repo>>) {
+        let repo = self.repo;
+        (
+            self.first_ref.map(|r| r.attach(repo)),
+            self.second_ref.map(|r| r.attach(repo)),
+        )
+    }
+
+    /// Return the name of the first reference we encountered while resolving the rev-spec, or `None` if a short hash
+    /// was used. For example, `@` might yield `Some(HEAD)`, but `abcd` yields `None`.
+    pub fn first_reference(&self) -> Option<&gix_ref::Reference> {
+        self.first_ref.as_ref()
+    }
+
+    /// Return the name of the second reference we encountered while resolving the rev-spec, or `None` if a short hash
+    /// was used or there was no second reference. For example, `..@` might yield `Some(HEAD)`, but `..abcd` or `@`
+    /// yields `None`.
+    pub fn second_reference(&self) -> Option<&gix_ref::Reference> {
+        self.second_ref.as_ref()
+    }
+
+    /// Return the single included object represented by this instance, or `None` if it is a range of any kind.
+    pub fn single(&self) -> Option<Id<'repo>> {
+        match self.inner {
+            gix_revision::Spec::Include(id) | gix_revision::Spec::ExcludeParents(id) => {
+                Id::from_id(id, self.repo).into()
+            }
+            gix_revision::Spec::Exclude(_)
+            | gix_revision::Spec::Range { .. }
+            | gix_revision::Spec::Merge { .. }
+            | gix_revision::Spec::IncludeOnlyParents { .. } => None,
+        }
+    }
+}
-- 
cgit v1.2.3