Skip to content

Improve rebase hint message #1810

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.

Sign up for GitHub

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

Merged
jackh726 merged 1 commit into from
May 8, 2024
Merged

Improve rebase hint message #1810

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 13 additions & 8 deletions src/handlers/no_merges.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,20 +80,23 @@ pub(super) async fn parse_input(
Ok(Some(NoMergesInput { merge_commits }))
}

const DEFAULT_MESSAGE: &str = "
fn get_default_message(repository_name: &str, default_branch: &str) -> String {
format!(
"
There are merge commits (commits with multiple parents) in your changes. We have a \
[no merge policy](https://rustc-dev-guide.rust-lang.org/git.html#no-merge-policy) \
so these commits will need to be removed for this pull request to be merged.

You can start a rebase with the following commands:
```shell-session
$ # rebase
$ git rebase -i master
$ # delete any merge commits in the editor that appears
$ git pull --rebase https://github.com/{repository_name}.git {default_branch}
$ git push --force-with-lease
```

";
"
)
}

pub(super) async fn handle_input(
ctx: &Context,
Expand Down Expand Up @@ -135,7 +138,10 @@ pub(super) async fn handle_input(
let mut message = config
.message
.as_deref()
.unwrap_or(DEFAULT_MESSAGE)
.unwrap_or(&get_default_message(
&event.repository.full_name,
&event.repository.default_branch,
))
.to_string();

let since_last_posted = if first_time {
Expand Down Expand Up @@ -212,7 +218,7 @@ mod test {

#[test]
fn message() {
let mut message = DEFAULT_MESSAGE.to_string();
let mut message = get_default_message("foo/bar", "baz").to_string();

writeln!(message, "The following commits are merge commits:").unwrap();

Expand All @@ -228,8 +234,7 @@ There are merge commits (commits with multiple parents) in your changes. We have
You can start a rebase with the following commands:
```shell-session
$ # rebase
$ git rebase -i master
$ # delete any merge commits in the editor that appears
$ git pull --rebase https://github.com/foo/bar.git baz
$ git push --force-with-lease
```

Expand Down