Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions crates/bitbygit-core/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ pub enum OperationRequest {
Rebase {
base: String,
},
OpenPullRequest {
base: Option<String>,
},
PromptSequence {
requests: Vec<OperationRequest>,
},
Expand All @@ -63,6 +66,7 @@ pub enum OperationKind {
CreateBranch,
MergeFastForward,
Rebase,
OpenPullRequest,
}

impl OperationKind {
Expand All @@ -84,6 +88,7 @@ impl OperationKind {
Self::CreateBranch => "create branch",
Self::MergeFastForward => "merge",
Self::Rebase => "rebase",
Self::OpenPullRequest => "open pull request",
}
}

Expand All @@ -106,6 +111,7 @@ impl OperationKind {
Self::CreateBranch => "create_branch",
Self::MergeFastForward => "merge_ff_only",
Self::Rebase => "rebase",
Self::OpenPullRequest => "open_pull_request",
}
}
}
Expand Down
50 changes: 48 additions & 2 deletions crates/bitbygit-core/src/prompt_parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ use std::fmt;

use crate::OperationRequest;

const PROMPT_EXAMPLES: &str = "branches, checkout <branch>, branch <name>, branch <name> from <base>, merge <branch>, rebase <base>, commit -m \"message\", fetch, push, pull, or pull --rebase";
pub const UNSUPPORTED_PROMPT_MESSAGE: &str = "Unsupported prompt. Try: branches, checkout <branch>, branch <name>, branch <name> from <base>, merge <branch>, rebase <base>, commit -m \"message\", fetch, push, pull, or pull --rebase";
const PROMPT_EXAMPLES: &str = "branches, checkout <branch>, branch <name>, branch <name> from <base>, merge <branch>, rebase <base>, open pr, commit -m \"message\", fetch, push, pull, or pull --rebase";
pub const UNSUPPORTED_PROMPT_MESSAGE: &str = "Unsupported prompt. Try: branches, checkout <branch>, branch <name>, branch <name> from <base>, merge <branch>, rebase <base>, open pr, commit -m \"message\", fetch, push, pull, or pull --rebase";
const SHELL_SYNTAX_MESSAGE: &str =
"Shell-style prompt syntax is not supported. Use one guarded prompt at a time.";
const RAW_GIT_MESSAGE: &str =
Expand Down Expand Up @@ -168,6 +168,7 @@ fn parse_single_prompt(input: &str) -> Result<OperationRequest, PromptParseError
"branches" => Ok(OperationRequest::Branches),
"fetch" => Ok(OperationRequest::Fetch),
"push" => Ok(OperationRequest::Push),
"open pr" | "open pull request" => Ok(OperationRequest::OpenPullRequest { base: None }),
"pull" => Ok(OperationRequest::Pull { rebase: false }),
"pull --rebase" | "pull rebase" => Ok(OperationRequest::Pull { rebase: true }),
_ if lower.starts_with("checkout ") => parse_one_arg_prompt(trimmed, "checkout")
Expand All @@ -178,6 +179,10 @@ fn parse_single_prompt(input: &str) -> Result<OperationRequest, PromptParseError
_ if lower.starts_with("rebase ") => {
parse_one_arg_prompt(trimmed, "rebase").map(|base| OperationRequest::Rebase { base })
}
_ if lower.starts_with("open pr to ") => parse_open_pull_request_prompt(trimmed, "open pr"),
_ if lower.starts_with("open pull request to ") => {
parse_open_pull_request_prompt(trimmed, "open pull request")
}
_ if lower.starts_with("branch ") => parse_branch_prompt(trimmed),
_ if lower == "commit" || lower.starts_with("commit ") => {
parse_commit_prompt(trimmed).map(|message| OperationRequest::Commit { message })
Expand All @@ -186,6 +191,30 @@ fn parse_single_prompt(input: &str) -> Result<OperationRequest, PromptParseError
}
}

fn parse_open_pull_request_prompt(
input: &str,
command: &str,
) -> Result<OperationRequest, PromptParseError> {
let Some(rest) = input.get(command.len()..) else {
return Err(parse_error("Expected: open pr or open pr to <base>"));
};
let rest = rest.trim_start();
let Some(base) = rest
.get(..2)
.filter(|prefix| prefix.eq_ignore_ascii_case("to"))
.and_then(|_prefix| rest.get(2..))
.filter(|base| base.starts_with(char::is_whitespace))
else {
return Err(parse_error("Expected: open pr or open pr to <base>"));
};
Ok(OperationRequest::OpenPullRequest {
base: Some(parse_branch_arg(
base.trim(),
"Expected: open pr or open pr to <base>",
)?),
})
}

fn parse_one_arg_prompt(input: &str, command: &str) -> Result<String, PromptParseError> {
let Some(rest) = input.get(command.len()..) else {
return Err(parse_error(format!("Expected: {command} <branch>")));
Expand Down Expand Up @@ -304,6 +333,23 @@ mod tests {
("branches", OperationRequest::Branches),
("fetch", OperationRequest::Fetch),
("push", OperationRequest::Push),
("open pr", OperationRequest::OpenPullRequest { base: None }),
(
"open pull request",
OperationRequest::OpenPullRequest { base: None },
),
(
"open pull request to develop",
OperationRequest::OpenPullRequest {
base: Some("develop".to_owned()),
},
),
(
"OPEN PR TO release",
OperationRequest::OpenPullRequest {
base: Some("release".to_owned()),
},
),
("pull", OperationRequest::Pull { rebase: false }),
("pull --rebase", OperationRequest::Pull { rebase: true }),
("pull rebase", OperationRequest::Pull { rebase: true }),
Expand Down
Loading