Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FEAT: Add rule: git pull uncommitted changes #149

Merged
merged 1 commit into from
Apr 22, 2024
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
83 changes: 83 additions & 0 deletions src/rules/git_pull_uncommitted_changes.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
use crate::{
cli::command::CrabCommand,
rules::{
utils::git::{get_new_command_with_git_support, match_rule_with_git_support},
Rule,
},
shell::Shell,
};

fn auxiliary_match_rule(command: &CrabCommand) -> bool {
if let Some(stdout) = &command.output {
command.script.contains("pull")
&& (stdout.contains("You have unstaged changes")
|| stdout.contains("contains uncommitted changes"))
} else {
false
}
}

pub fn match_rule(command: &mut CrabCommand, _system_shell: Option<&dyn Shell>) -> bool {
match_rule_with_git_support(auxiliary_match_rule, command)
}

fn auxiliary_get_new_command(
command: &CrabCommand,
system_shell: Option<&dyn Shell>,
) -> Vec<String> {
vec![system_shell
.unwrap()
.and(vec!["git stash", "git pull", "git stash pop"])]
}

pub fn get_new_command(
command: &mut CrabCommand,
_system_shell: Option<&dyn Shell>,
) -> Vec<String> {
get_new_command_with_git_support(auxiliary_get_new_command, command, _system_shell)
}

pub fn get_rule() -> Rule {
Rule::new(
"git_pull_uncommitted_changes".to_owned(),
None,
None,
None,
match_rule,
get_new_command,
None,
)
}

#[cfg(test)]
mod tests {
use super::{get_new_command, match_rule};
use crate::cli::command::CrabCommand;
use crate::shell::Bash;
use rstest::rstest;
const OUTPUT: &str = "error: Cannot pull with rebase: You have unstaged changes.";

#[rstest]
#[case("git pull", OUTPUT, true)]
#[case("git pull", "", false)]
#[case("ls", OUTPUT, false)]
fn test_match(#[case] command: &str, #[case] output: &str, #[case] is_match: bool) {
let mut command = CrabCommand::new(command.to_owned(), Some(output.to_owned()), None);
assert_eq!(match_rule(&mut command, None), is_match);
}

#[rstest]
#[case("git pull", "error: Cannot pull with rebase: You have unstaged changes.", vec!["git stash && git pull && git stash pop"])]
fn test_get_new_command(
#[case] command: &str,
#[case] output: &str,
#[case] expected: Vec<&str>,
) {
let system_shell = Bash {};
let mut command = CrabCommand::new(command.to_owned(), Some(output.to_owned()), None);
assert_eq!(
get_new_command(&mut command, Some(&system_shell)),
expected.iter().map(|&s| s.to_owned()).collect::<Vec<_>>()
);
}
}
2 changes: 2 additions & 0 deletions src/rules/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ mod git_merge;
mod git_not_command;
mod git_pull;
mod git_pull_clone;
mod git_pull_uncommitted_changes;
mod git_push;
mod git_rebase_merge_dir;
mod go_run;
Expand Down Expand Up @@ -163,6 +164,7 @@ pub fn get_rules() -> Vec<Rule> {
git_not_command::get_rule(),
git_pull::get_rule(),
git_pull_clone::get_rule(),
git_pull_uncommitted_changes::get_rule(),
git_push::get_rule(),
git_rebase_merge_dir::get_rule(),
go_run::get_rule(),
Expand Down
Loading