Merging upstream version 1.70.0+dfsg2.

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

1 files changed, 63 insertions, 0 deletions

diff --git a/vendor/gix-revision/src/spec/mod.rs b/vendor/gix-revision/src/spec/mod.rs
new file mode 100644
index 000000000..ba24c75c0
--- /dev/null
+++ b/vendor/gix-revision/src/spec/mod.rs
@@ -0,0 +1,63 @@
+use crate::Spec;
+
+/// How to interpret a revision specification, or `revspec`.
+#[derive(Debug, Copy, Clone, PartialOrd, PartialEq, Ord, Eq, Hash)]
+#[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))]
+pub enum Kind {
+    /// Include commits reachable from this revision, the default when parsing revision `a` for example, i.e. `a` and its ancestors.
+    /// Example: `a`.
+    IncludeReachable,
+    /// Exclude commits reachable from this revision, i.e. `a` and its ancestors. Example: `^a`.
+    ExcludeReachable,
+    /// Every commit that is reachable from `b` but not from `a`. Example: `a..b`.
+    RangeBetween,
+    /// Every commit reachable through either `a` or `b` but no commit that is reachable by both. Example: `a...b`.
+    ReachableToMergeBase,
+    /// Include every commit of all parents of `a`, but not `a` itself. Example: `a^@`.
+    IncludeReachableFromParents,
+    /// Exclude every commit of all parents of `a`, but not `a` itself. Example: `a^!`.
+    ExcludeReachableFromParents,
+}
+
+impl Default for Kind {
+    fn default() -> Self {
+        Kind::IncludeReachable
+    }
+}
+
+impl Spec {
+    /// Return the kind of this specification.
+    pub fn kind(&self) -> Kind {
+        match self {
+            Spec::Include(_) => Kind::IncludeReachable,
+            Spec::Exclude(_) => Kind::ExcludeReachable,
+            Spec::Range { .. } => Kind::RangeBetween,
+            Spec::Merge { .. } => Kind::ReachableToMergeBase,
+            Spec::IncludeOnlyParents { .. } => Kind::IncludeReachableFromParents,
+            Spec::ExcludeParents { .. } => Kind::ExcludeReachableFromParents,
+        }
+    }
+}
+
+mod _impls {
+    use std::fmt::{Display, Formatter};
+
+    use crate::Spec;
+
+    impl Display for Spec {
+        fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+            match self {
+                Spec::Include(oid) => Display::fmt(oid, f),
+                Spec::Exclude(oid) => write!(f, "^{oid}"),
+                Spec::Range { from, to } => write!(f, "{from}..{to}"),
+                Spec::Merge { theirs, ours } => write!(f, "{theirs}...{ours}"),
+                Spec::IncludeOnlyParents(from_exclusive) => write!(f, "{from_exclusive}^@"),
+                Spec::ExcludeParents(oid) => write!(f, "{oid}^!"),
+            }
+        }
+    }
+}
+
+///
+pub mod parse;
+pub use parse::function::parse;