Skip to content

Commit b88abc8

Browse files
CopilotByron
andcommitted
Fix remaining spelling errors in but and gitbutler crates
Co-authored-by: Byron <63622+Byron@users.noreply.github.com>
1 parent 7833005 commit b88abc8

File tree

9 files changed

+21
-21
lines changed

9 files changed

+21
-21
lines changed

crates/but-bot/src/butbot.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Don't be too verbose, but be thorough and outline everything you did.
5252
5353
### Core concepts
5454
- **Project**: A Git repository that has been initialized with GitButler.
55-
- **Stack**: A collection of dependent branchs that are used to manage changes in the project. With GitButler (as opposed to normal Git), multiple stacks can be applied at the same time.
55+
- **Stack**: A collection of dependent branches that are used to manage changes in the project. With GitButler (as opposed to normal Git), multiple stacks can be applied at the same time.
5656
- **Branch**: A pointer to a specific commit in the project. Branches can contain multiple commits. Commits are always listed newest to oldest.
5757
- **Commit**: A snapshot of the project at a specific point in time.
5858
- **File changes**: A set of changes made to the files in the project. This can include additions, deletions, and modifications of files. The user can assign these changes to stacks to keep things ordering.
@@ -68,13 +68,13 @@ In order to do that, please follow these steps:
6868
4. Use the tools provided to you to perform the actions.
6969
7070
### Capabilities
71-
You can generally perform the normal Git operations, such as creating branchs and committing to them.
71+
You can generally perform the normal Git operations, such as creating branches and committing to them.
7272
You can also perform more advanced operations, such as:
7373
- `absorb`: Take a set of file changes and amend them into the existing commits in the project.
7474
This requires you to figure out where the changes should go based on the locks, assignments and any other user provided information.
7575
- `split a commit`: Take an existing commit and split it into multiple commits based on the the user directive.
7676
This can be achieved by using the `split_commit` tool.
77-
- `split a branch`: Take an existing branch and split it into two branchs. This basically takes a set of committed file changes and moves them to a new branch, removing them from the original branch.
77+
- `split a branch`: Take an existing branch and split it into two branches. This basically takes a set of committed file changes and moves them to a new branch, removing them from the original branch.
7878
This is useful when you want to separate the changes into a new branch for further work.
7979
In order to do this, you will need to get the branch changes for the intended source branch (call the `get_branch_changes` tool), and then call the split branch tool with the changes you want to split off.
8080
@@ -177,7 +177,7 @@ Take a look at the conversation, specifically, the last user request below, and
177177
Alright, let's create the plan for what the user wants to do.
178178
The plan should be based on the user request found in the conversation below.
179179
Add items to the todo list based on the plan.
180-
Reference relevant resources from the project status (e.g. branchs, commits, file changes) when creating the todo items.
180+
Reference relevant resources from the project status (e.g. branches, commits, file changes) when creating the todo items.
181181
182182
<CONVERSATION>
183183
{conversation}
@@ -356,7 +356,7 @@ Based on the conversation below and the project status, please update the status
356356
</TODO>
357357
358358
<IMPORTANT_NOTES>
359-
Be thorough in your response. Name relevant branchs, commits, file changes, and any other relevant information.
359+
Be thorough in your response. Name relevant branches, commits, file changes, and any other relevant information.
360360
Follow best practices.
361361
ONLY perform the actions that are necessary to complete the todo item above.
362362
If you need to perform investigations, do so, and be detailed in your findings. Don't perform actions.

crates/but/src/args/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ pub enum OutputFormat {
4949
/// The output to write is supposed to be for human consumption, and can be more verbose.
5050
#[default]
5151
Human,
52-
/// The output should be suitable for shells, and assigning the major result to variables so that it can be re-used
52+
/// The output should be suitable for shells, and assigning the major result to variables so that it can be reused
5353
/// in subsequent CLI invocations.
5454
Shell,
5555
/// Output detailed information as JSON for tool consumption.
@@ -417,7 +417,7 @@ pub enum Subcommands {
417417
///
418418
/// Optionally an identifier to an Uncommitted File or a Branch (stack) may be provided.
419419
///
420-
/// - If an Uncommitted File id is provided, absorb will be peformed for just that file
420+
/// - If an Uncommitted File id is provided, absorb will be performed for just that file
421421
/// - If a Branch (stack) id is provided, absorb will be performed for all changes assigned to that stack
422422
/// - If no source is provided, absorb is performed for all uncommitted changes
423423
///
@@ -494,7 +494,7 @@ pub enum Subcommands {
494494
#[clap(hide = true)]
495495
Cursor(cursor::Platform),
496496

497-
/// INTERNAL: GitButler Actions are automated tasks (like macros) that can be peformed on a repository.
497+
/// INTERNAL: GitButler Actions are automated tasks (like macros) that can be performed on a repository.
498498
#[cfg(feature = "legacy")]
499499
#[clap(hide = true)]
500500
Actions(actions::Platform),

crates/but/src/command/legacy/absorb.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ use crate::{
2828
///
2929
/// Optionally an identifier to an Uncommitted File or a Branch (stack) may be provided.
3030
///
31-
/// If an Uncommitted File id is provided, absorb will be peformed for just that file
31+
/// If an Uncommitted File id is provided, absorb will be performed for just that file
3232
/// If a Branch (stack) id is provided, absorb will be performed for all changes assigned to that stack
3333
/// If no source is provided, absorb is performed for all uncommitted changes
3434
pub(crate) fn handle(

crates/but/src/command/legacy/forge/review.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ async fn publish_reviews_for_branch_and_dependents(
286286
if let Some(out) = out.for_human() {
287287
writeln!(
288288
out,
289-
"Publishing review for branch '{}' targetting '{}",
289+
"Publishing review for branch '{}' targeting '{}",
290290
head.name, current_target_branch
291291
)?;
292292
}

crates/but/src/command/legacy/mark.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ fn mark_branch(
102102
return Ok(());
103103
}
104104
// TODO: if there are other marks of this kind, get rid of them
105-
let stack_id = stack_id.expect("Cant find stack for this branch");
105+
let stack_id = stack_id.expect("Cannot find stack for this branch");
106106
let action = but_rules::Action::Explicit(Operation::Assign {
107107
target: but_rules::StackTarget::StackId(stack_id.to_string()),
108108
});

crates/but/src/command/legacy/status/json.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ pub(crate) struct Commit {
128128
author_name: String,
129129
/// The email of the commit author
130130
author_email: String,
131-
/// Wheter the commit is in a conflicted state. Only applicable to local commits (and not to upstream commits)
131+
/// Whether the commit is in a conflicted state. Only applicable to local commits (and not to upstream commits)
132132
conflicted: Option<bool>,
133133
/// If but status was invoked with --review and if the commit has an associated review ID (eg. Gerrit review number), it will be present here
134134
review_id: Option<String>,

crates/but/src/legacy/id/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ pub struct IdDb {
9595
/// Lifecycle
9696
impl IdDb {
9797
/// Initialise CLI IDs for all information in the `RefInfo` structure for `HEAD` via `ctx`.
98-
// TODO: create an API that enforces re-use of `RefInfo` by its users.
98+
// TODO: create an API that enforces reuse of `RefInfo` by its users.
9999
pub fn new(ctx: &Context) -> anyhow::Result<Self> {
100100
let mut max_zero_count = 1; // Ensure at least two "0" in ID.
101101
let context_info = context_info(ctx)?;

crates/but/src/tui/select_branch/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ pub struct TuiBranch {
6666
#[derive(Debug, Default)]
6767
pub struct TuiStack {
6868
/// The branches in the stack.
69-
/// Orderd from child to parent.
69+
/// Ordered from child to parent.
7070
pub branches: Vec<TuiBranch>,
7171
}
7272

crates/gitbutler-hunk-dependency/README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Hunk dependency
22

3-
This crate contains the logic behind the calculation of the dependency graph between commits and between uncommited changes.
3+
This crate contains the logic behind the calculation of the dependency graph between commits and between uncommitted changes.
44

55
## Overview
66

@@ -16,9 +16,9 @@ We should play around with the limits of what should be rearrangeable.
1616

1717
### What do we want?
1818

19-
1. Be able to tell which uncommited changes belong to which stacks.
19+
1. Be able to tell which uncommitted changes belong to which stacks.
2020
2. Be able to tell which commits depend on which preceding commits.
21-
3. Be able to tell which commits are depended upon by following commits or uncommited changes (i.e. the inverse map of the previous two items).
21+
3. Be able to tell which commits are depended upon by following commits or uncommitted changes (i.e. the inverse map of the previous two items).
2222

2323
### What do we need?
2424

@@ -49,7 +49,7 @@ The items in the vector, i.e. hunk ranges, have the following information:
4949

5050
## Algorithm's pseudo code (roughly)
5151

52-
What we're rougly doing in the code is
52+
What we're roughly doing in the code is
5353
```
5454
for all affected files:
5555
for all input diff hunks:
@@ -61,7 +61,7 @@ for all affected files:
6161
override all previous hunks
6262
break
6363
64-
if there are no exsting hunks
64+
if there are no existing hunks
6565
add all diffs (can be multiple)
6666
break
6767
@@ -189,12 +189,12 @@ After processing the incoming hunk, the hunk range list looks like this
189189
The existing range was split, and the incoming hunk split the existing range into the first and the last one.
190190
The index of the next hunk range to visit is `2` and the index of the first hunk to shift is `3`.
191191
When we process a following hunk, we need to compare it to the **3rd hunk range** (and following hunk ranges if any), but we need to shift the `start` lines of the hunk ranges following the ones we updated, in this case the **4th hunk range**.
192-
Since the net lines are 0, everythin stays as is.
192+
Since the net lines are 0, everything stays as is.
193193

194194
### Multiple shifts per commit
195195
---
196196

197-
Inside a commit, multple hunks will most probably shift the lines different amounts.
197+
Inside a commit, multiple hunks will most probably shift the lines different amounts.
198198
We keep track of the cumulative line shift, and update only the hunks that follow the hunk that introduced the shift.
199199

200200
### Matching incoming hunks to shifted ranges

0 commit comments

Comments
 (0)