Add 'apps/servers/octopus/' from commit '623954d19fdf0dca47db319e5c88ee561aa8d25c'

git-subtree-dir: apps/servers/octopus
git-subtree-mainline: 4e09fe2509904ee64d2470ca8d41006d51e4ffd6
git-subtree-split: 623954d19fdf0dca47db319e5c88ee561aa8d25c

1 files changed, 22 insertions, 0 deletions

diff --git a/apps/servers/octopus/supergit/src/branch.rs b/apps/servers/octopus/supergit/src/branch.rs
new file mode 100644
index 000000000000..81abbffed112
--- /dev/null
+++ b/apps/servers/octopus/supergit/src/branch.rs
@@ -0,0 +1,22 @@
+use crate::{Commit, CommitId};
+
+/// Abstraction for a branch history slice
+pub struct Branch {
+    name: String,
+    head: CommitId,
+    history: Vec<BranchCommit>,
+}
+
+/// A commit represented as a relationship to a branch
+///
+/// Most commits will be simple, meaning they are in sequence on the
+/// branch.  Two types of merge commits exist: normal, and octopus.
+/// All branches leading into this branch are a reverse tree
+pub enum BranchCommit {
+    /// A single commit
+    Commit(Commit),
+    /// A merge commit from one other branch
+    Merge(Branch),
+    /// An octopus merge with multiple branches
+    Octopus(Vec<Branch>),
+}