I can spell

Author: Caleb-T-Owens

crates/but-rebase/src/graph_rebase/cherry_pick.rs

@@ -38,7 +38,7 @@ pub enum CherryPickOutcome {
 /// - Then, I do the three way merge where N is the "base", M is "ours", and X
 ///   is "theirs".
 ///
-/// Expect in the case where X is conflicted. In that case we then make use of
+/// Except in the case where X is conflicted. In that case we then make use of
 /// X's "base" sub-tree as the base.
 pub fn cherry_pick(
     repo: &gix::Repository,
@@ -64,7 +64,7 @@ pub fn cherry_pick(
             Ok(CherryPickOutcome::Identity(target.id.detach()))
         }
         (MergeOutcome::Conflict, _) | (_, MergeOutcome::Conflict) => {
-            // TODO(cto): We can hande the specific case where (the base is
+            // TODO(cto): We can handle the specific case where (the base is
             // _not_ conflicted & the ontos _is_ conflicted & the target == base
             // & ontos.len() == 2) by writing out the ontos conflict as a
             // conflicted merge commit, without expanding our conflict

crates/but-rebase/src/graph_rebase/commit.rs

@@ -1,4 +1,4 @@
-//! Provides some slightly higher level tools to help with manipulating commits, in preperation for use in the editor.
+//! Provides some slightly higher level tools to help with manipulating commits, in preparation for use in the editor.
 
 use anyhow::Result;
 use gix::prelude::ObjectIdExt;
@@ -14,7 +14,7 @@ impl Editor {
         but_core::Commit::from_id(id.attach(&self.repo))
     }
 
-    /// Writes a commit with correct signing to the in memory repostiory.
+    /// Writes a commit with correct signing to the in memory repository.
     pub fn write_commit(
         &self,
         commit: but_core::Commit<'_>,

crates/but-rebase/src/graph_rebase/creation.rs

@@ -19,7 +19,7 @@ impl GraphExt for Graph {
         // TODO(CTO): Look into stopping at the common base
         let entrypoint = self.lookup_entrypoint()?;
 
-        // Commits in this list are ordred such that iterating in reverse will
+        // Commits in this list are ordered such that iterating in reverse will
         // have any relevant parent commits already inserted in the graph.
         let mut commits: Vec<Commit> = Vec::new();
         // References are ordered from child-most to parent-most

crates/but-rebase/src/graph_rebase/mod.rs

@@ -29,7 +29,7 @@ pub enum Step {
         /// If this is Some, the commit WILL NOT be picked onto the parents the
         /// graph implies but instead on to the parents listed here.
         ///
-        /// This is intened to be a private API
+        /// This is intended to be a private API
         preserved_parents: Option<Vec<gix::ObjectId>>,
     },
     /// Represents applying a reference to the commit found at it's first parent
@@ -58,8 +58,6 @@ pub(crate) struct Edge {
     ///
     /// A child commit should have edges that all have unique orders. In order
     /// to achive that we can employ the following semantics.
-    ///
-    /// When replacing a given parent with N other parents, the first in that list takes the old parent's order, and the rest take the
     order: usize,
 }
 

crates/but-rebase/src/graph_rebase/mutate.rs

@@ -1,4 +1,4 @@
-//! Operations for mutation the editor
+//! Operations for mutating the editor
 
 use anyhow::{Result, anyhow};
 use petgraph::{Direction, visit::EdgeRef};

crates/but-rebase/src/graph_rebase/rebase.rs

@@ -20,9 +20,9 @@ pub struct SuccessfulRebase {
     pub(crate) repo: gix::Repository,
     /// A mapping of any commits that were rewritten as part of the rebase
     pub(crate) commit_mapping: HashMap<gix::ObjectId, gix::ObjectId>,
-    /// A mapping between the origional step graph and the new one
+    /// A mapping between the original step graph and the new one
     pub(crate) graph_mapping: HashMap<StepGraphIndex, StepGraphIndex>,
-    /// Any reference edits that need to be commited as a result of the history
+    /// Any reference edits that need to be committed as a result of the history
     /// rewrite
     pub(crate) ref_edits: Vec<RefEdit>,
     /// The new step graph
@@ -49,7 +49,7 @@ impl Editor {
                 .collect::<Vec<_>>(),
         );
 
-        // A 1 to 1 mapping between the incoming graph and hte output graph
+        // A 1 to 1 mapping between the incoming graph and the output graph
         let mut graph_mapping: HashMap<StepGraphIndex, StepGraphIndex> = HashMap::new();
         // The step graph with updated commit oids
         let mut output_graph = StepGraph::new();
@@ -174,7 +174,7 @@ impl Editor {
 
             for e in edges {
                 let Some(new_parent) = graph_mapping.get(&e.target()) else {
-                    bail!("Failed to find cooresponding parent");
+                    bail!("Failed to find corresponding parent");
                 };
 
                 output_graph.add_edge(new_idx, *new_parent, e.weight().clone());
@@ -233,7 +233,7 @@ fn collect_ordered_parents(graph: &StepGraph, target: StepGraphIndex) -> Vec<Ste
     while let Some(candidate) = potential_parent_edges.pop() {
         if let Step::Pick { .. } = graph[candidate.target()] {
             parents.push(candidate.target());
-            // Don't persue the children
+            // Don't pursue the children
             continue;
         };
 
@@ -370,7 +370,7 @@ mod test {
         }
 
         #[test]
-        fn insertion_order_is_irrelivant() -> Result<()> {
+        fn insertion_order_is_irrelevant() -> Result<()> {
             let mut graph = StepGraph::new();
             let a_id = gix::ObjectId::from_str("1000000000000000000000000000000000000000")?;
             let a = graph.add_node(Step::Pick {

crates/but-rebase/tests/rebase/graph_rebase/cherry_pick.rs

@@ -569,7 +569,7 @@ fn no_parents_to_single_parent_cp_conflicts() -> Result<()> {
 }
 
 #[test]
-fn cherry_pick_back_to_origional_parents_unconflicts() -> Result<()> {
+fn cherry_pick_back_to_original_parents_unconflicts() -> Result<()> {
     set_var("GITBUTLER_CHANGE_ID", "1");
     let (repo, _tmpdir, _meta) = fixture_writable("cherry-pick-scenario")?;
 

crates/but-rebase/tests/rebase/graph_rebase/insert.rs

@@ -138,5 +138,5 @@ fn insert_above_commit_with_two_children() -> Result<()> {
 #[test]
 #[ignore]
 fn inserts_violating_fp_protection_should_cause_rebase_failure() -> Result<()> {
-    panic!("Branch protection hasn't been implemented dyet");
+    panic!("Branch protection hasn't been implemented yet");
 }

crates/but-rebase/tests/rebase/graph_rebase/replace.rs

@@ -32,7 +32,7 @@ fn reword_a_commit() -> Result<()> {
 
     let mut editor = graph.to_editor(&repo)?;
 
-    // get the origional a
+    // get the original a
     let a = repo.rev_parse_single("A")?.detach();
 
     // reword commit a
@@ -41,7 +41,7 @@ fn reword_a_commit() -> Result<()> {
     a_obj.message = "A: a second coming".into();
     let a_new = repo.write_object(a_obj)?.detach();
 
-    // select the origional a out of the graph
+    // select the original a out of the graph
     let a_selector = editor
         .select_commit(a)
         .context("Failed to find commit a in editor graph")?;
@@ -75,7 +75,7 @@ fn reword_a_commit() -> Result<()> {
 }
 
 #[test]
-fn ammend_a_commit() -> Result<()> {
+fn amend_a_commit() -> Result<()> {
     set_var("GITBUTLER_CHANGE_ID", "1");
     let (repo, _tmpdir, meta) = fixture_writable("merge-in-the-middle")?;
 
@@ -103,7 +103,7 @@ fn ammend_a_commit() -> Result<()> {
 
     let mut editor = graph.to_editor(&repo)?;
 
-    // get the origional a
+    // get the original a
     let a = repo.rev_parse_single("A")?;
     insta::assert_snapshot!(visualize_tree(a), @r#"
     0cc630c
@@ -122,7 +122,7 @@ fn ammend_a_commit() -> Result<()> {
     a_obj.message = "A: a second coming".into();
     let a_new = repo.write_object(a_obj.inner)?.detach();
 
-    // select the origional a out of the graph
+    // select the original a out of the graph
     let a_selector = editor
         .select_commit(a.detach())
         .context("Failed to find commit a in editor graph")?;
@@ -174,5 +174,5 @@ fn ammend_a_commit() -> Result<()> {
 #[test]
 #[ignore]
 fn replaces_violating_fp_protection_should_cause_rebase_failure() -> Result<()> {
-    panic!("Branch protection hasn't been implemented dyet");
+    panic!("Branch protection hasn't been implemented yet");
 }

crates/but-worktrees/tests/worktree/integrate.rs

@@ -38,7 +38,7 @@ fn test_create_unrelated_change_and_reintroduce() -> anyhow::Result<()> {
             commits_above_conflict: false,
             working_dir_conflicts: false
         },
-        "We should be able to integrate the unrelated change back into the origional reference"
+        "We should be able to integrate the unrelated change back into the original reference"
     );
     assert_eq!(
         worktree_integration_status(
@@ -273,7 +273,7 @@ fn test_causes_workdir_conflicts_complex() -> anyhow::Result<()> {
             commits_above_conflict: false,
             working_dir_conflicts: false
         },
-        "When integrating into feature-b, because the thing that commits is the cherry on top of the source, it auto-resolves to what was origionally there, resulting in the working_dir not conflicting"
+        "When integrating into feature-b, because the thing that commits is the cherry on top of the source, it auto-resolves to what was originally there, resulting in the working_dir not conflicting"
     );
 
     assert!(