Skip to content

Commit

Permalink
FEAT: Add rule: git push different branch names (#152)
Browse files Browse the repository at this point in the history
  • Loading branch information
luizvbo authored Apr 22, 2024
1 parent 6474a0d commit a0945f9
Show file tree
Hide file tree
Showing 2 changed files with 115 additions and 0 deletions.
113 changes: 113 additions & 0 deletions src/rules/git_push_different_branch_names.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
use crate::{
cli::command::CrabCommand,
rules::{
utils::git::{get_new_command_with_git_support, match_rule_with_git_support},
Rule,
},
shell::Shell,
};
use regex::Regex;

fn auxiliary_match_rule(command: &CrabCommand) -> bool {
if let Some(stdout) = &command.output {
command.script.contains("push")
&& stdout.contains("The upstream branch of your current branch does not match")
} 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> {
if let Some(stdout) = &command.output {
let re = Regex::new(r"(?m)^ +(git push [^\s]+ [^\s]+)").unwrap();
let new_command = re
.captures_iter(stdout)
.next()
.map(|cap| cap[1].to_string());
match new_command {
Some(new_command) => vec![new_command],
None => vec![],
}
} else {
vec![]
}
}

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_push_different_branch_names".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 = r#"
fatal: The upstream branch of your current branch does not match
the name of your current branch. To push to the upstream branch
on the remote, use
git push origin HEAD:%s
To push to the branch of the same name on the remote, use
git push origin %s
To choose either option permanently, see push.default in 'git help config'.
"#;

fn error_msg(localbranch: &str, remotebranch: &str) -> String {
OUTPUT
.replace("%s", remotebranch)
.replace("%s", localbranch)
}

#[rstest]
#[case("git push", &error_msg("foo", "bar"), true)]
#[case("vim", "", false)]
#[case("git status", &error_msg("foo", "bar"), false)]
#[case("git push", "", 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 push", &error_msg("foo", "bar"), vec!["git push origin HEAD:bar"])]
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 @@ -60,6 +60,7 @@ mod git_pull;
mod git_pull_clone;
mod git_pull_uncommitted_changes;
mod git_push;
mod git_push_different_branch_names;
mod git_push_force;
mod git_rebase_merge_dir;
mod go_run;
Expand Down Expand Up @@ -167,6 +168,7 @@ pub fn get_rules() -> Vec<Rule> {
git_pull_clone::get_rule(),
git_pull_uncommitted_changes::get_rule(),
git_push::get_rule(),
git_push_different_branch_names::get_rule(),
git_push_force::get_rule(),
git_rebase_merge_dir::get_rule(),
go_run::get_rule(),
Expand Down

0 comments on commit a0945f9

Please sign in to comment.