fix!: Replace References with Labels for now

Author: epage

schema.json

@@ -81,7 +81,7 @@
           ],
           "properties": {
             "reset": {
-              "$ref": "#/definitions/Reference"
+              "type": "string"
             }
           },
           "additionalProperties": false
@@ -136,46 +136,6 @@
         }
       ]
     },
-    "Reference": {
-      "oneOf": [
-        {
-          "type": "object",
-          "required": [
-            "branch"
-          ],
-          "properties": {
-            "branch": {
-              "type": "string"
-            }
-          },
-          "additionalProperties": false
-        },
-        {
-          "type": "object",
-          "required": [
-            "tag"
-          ],
-          "properties": {
-            "tag": {
-              "type": "string"
-            }
-          },
-          "additionalProperties": false
-        },
-        {
-          "type": "object",
-          "required": [
-            "label"
-          ],
-          "properties": {
-            "label": {
-              "type": "string"
-            }
-          },
-          "additionalProperties": false
-        }
-      ]
-    },
     "Tree": {
       "type": "object",
       "required": [
@@ -229,7 +189,7 @@
         "base": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/Reference"
+            "type": "string"
           }
         },
         "message": {

src/lib.rs

@@ -83,15 +83,11 @@ impl TodoList {
                     let commit = current_oid(cwd)?;
                     labels.insert(label.clone(), commit);
                 }
-                Command::Reset(reference) => {
-                    let revspec = match &reference {
-                        Reference::Label(label) => labels
-                            .get(label.as_str())
-                            .ok_or_else(|| eyre::eyre!("Reference doesn't exist: {:?}", label))?
-                            .as_str(),
-                        Reference::Tag(tag) => tag.as_str(),
-                        Reference::Branch(branch) => branch.as_str(),
-                    };
+                Command::Reset(label) => {
+                    let revspec = labels
+                        .get(label.as_str())
+                        .ok_or_else(|| eyre::eyre!("Label doesn't exist: {:?}", label))?
+                        .as_str();
                     checkout(cwd, revspec)?;
                 }
                 Command::Tree(tree) => {
@@ -153,14 +149,10 @@ impl TodoList {
                         p.arg("--author").arg(author);
                     }
                     for base in &merge.base {
-                        let revspec = match base {
-                            Reference::Label(label) => labels
-                                .get(label.as_str())
-                                .ok_or_else(|| eyre::eyre!("Reference doesn't exist: {:?}", label))?
-                                .as_str(),
-                            Reference::Tag(tag) => tag.as_str(),
-                            Reference::Branch(branch) => branch.as_str(),
-                        };
+                        let revspec = labels
+                            .get(base.as_str())
+                            .ok_or_else(|| eyre::eyre!("Label doesn't exist: {:?}", base))?
+                            .as_str();
                         p.arg(revspec);
                     }
                     p.ok()?;

src/model.rs

@@ -44,7 +44,7 @@ impl Default for TodoList {
 #[cfg_attr(feature = "serde", serde(deny_unknown_fields))]
 pub enum Command {
     Label(Label),
-    Reset(Reference),
+    Reset(Label),
     Tree(Tree),
     Merge(Merge),
     Branch(Branch),
@@ -115,42 +115,13 @@ impl<'d> From<&'d str> for FileContent {
 #[cfg_attr(feature = "serde", serde(rename_all = "snake_case"))]
 #[cfg_attr(feature = "serde", serde(deny_unknown_fields))]
 pub struct Merge {
-    pub base: Vec<Reference>,
+    pub base: Vec<Label>,
     #[cfg_attr(feature = "serde", serde(default))]
     pub message: Option<String>,
     #[cfg_attr(feature = "serde", serde(default))]
     pub author: Option<String>,
 }
 
-#[derive(Clone, Debug, derive_more::IsVariant)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
-#[cfg_attr(feature = "serde", serde(rename_all = "snake_case"))]
-#[cfg_attr(feature = "serde", serde(deny_unknown_fields))]
-pub enum Reference {
-    Branch(Branch),
-    Tag(Tag),
-    Label(Label),
-}
-
-impl From<Branch> for Reference {
-    fn from(inner: Branch) -> Self {
-        Self::Branch(inner)
-    }
-}
-
-impl From<Tag> for Reference {
-    fn from(inner: Tag) -> Self {
-        Self::Tag(inner)
-    }
-}
-
-impl From<Label> for Reference {
-    fn from(inner: Label) -> Self {
-        Self::Label(inner)
-    }
-}
-
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]

tests/fixtures/branches.yml

@@ -16,8 +16,7 @@ commands:
 - branch: base
 - label: base
 
-- reset:
-    label: base
+- reset: base
 - tree:
     tracked:
       "file_a.txt": "3"
@@ -36,8 +35,7 @@ commands:
     message: "6"
 - branch: off_master
 
-- reset:
-    label: base
+- reset: base
 - tree:
     tracked:
       "file_a.txt": "3"

tests/fixtures/conflict.yml

@@ -16,8 +16,7 @@ commands:
 - branch: base
 - label: base
 
-- reset:
-    label: base
+- reset: base
 - tree:
     tracked:
       "file_a.txt": "4"
@@ -28,8 +27,7 @@ commands:
     message: "5"
 - branch: master
 
-- reset:
-    label: base
+- reset: base
 - tree:
     tracked:
       "file_a.txt": "6"

tests/fixtures/git_rebase_existing.yml

@@ -16,8 +16,7 @@ commands:
 - branch: master
 - label: master
 
-- reset:
-    label: master
+- reset: master
 - tree:
     tracked:
       "file_a.txt": "3"
@@ -31,8 +30,7 @@ commands:
 - branch: feature2
 
 # `git rebase master` caused the history to split
-- reset:
-    label: master
+- reset: master
 - tree:
     tracked:
       "file_a.txt": "3"

tests/fixtures/git_rebase_new.yml

@@ -16,8 +16,7 @@ commands:
 - branch: master
 - label: master
 
-- reset:
-    label: master
+- reset: master
 - tree:
     tracked:
       "file_a.txt": "3"
@@ -32,8 +31,7 @@ commands:
 - branch: feature2
 
 # `git rebase master` caused the history to split
-- reset:
-    label: master
+- reset: master
 - tree:
     tracked:
       "file_a.txt": "3"

tests/fixtures/pr-semi-linear-merge.yml

@@ -16,8 +16,7 @@ commands:
 - branch: base
 - label: base
 
-- reset:
-    label: base
+- reset: base
 - tree:
     tracked:
       "file_a.txt": "3"
@@ -61,8 +60,7 @@ commands:
     message: "10"
 - branch: master
 
-- reset:
-    label: base
+- reset: base
 - tree:
     tracked:
       "file_a.txt": "3"

tests/fixtures/pr-squash.yml

@@ -16,8 +16,7 @@ commands:
 - branch: base
 - label: base
 
-- reset:
-    label: base
+- reset: base
 - tree:
     tracked:
       "file_a.txt": "3"
@@ -43,8 +42,7 @@ commands:
     message: "Merged #10"
 - branch: master
 
-- reset:
-    label: base
+- reset: base
 - tree:
     tracked:
       "file_a.txt": "3"