Fix an issue where github.preserve-pull-request-description=true was adding \n to commit message.#880
Closed
bolinfest wants to merge 1 commit intofacebook:mainfrom
Closed
Fix an issue where github.preserve-pull-request-description=true was adding \n to commit message.#880bolinfest wants to merge 1 commit intofacebook:mainfrom
bolinfest wants to merge 1 commit intofacebook:mainfrom
Conversation
Contributor
|
@facebook-github-bot has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
Contributor
|
@bolinfest , seems like this breaks a couple of tests: also: |
Contributor
|
@bolinfest has updated the pull request. You must reimport the pull request before landing. |
Contributor
|
@facebook-github-bot has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
Contributor
Author
|
@sggutier I updated the two tests that you mentioned. Unfortunately, when I run: I admit I see a number of failures, but the messages I'm seeing give me the impression that not all of these tests are written to work in OSS Sapling? |
…adding \n to commit message. Summary: While facebook#863 fixed some important issues with respect to recognizing `\r\n`, it also introduced a new issue where running `sl pr s` with `github.preserve-pull-request-description=true` would inadvertently add an extra `\n` before the horizontal rule delimiting the Sapling stack information. This fixes `create_pull_request_title_and_body()` to preserve whatever whitespace was originally present before the horizontal rule, only adding a new `\n` to the end of the commit message if it did not already have one. Test Plan: ``` ./tests/run-tests.py ./tests/test-doctest.py ```
Contributor
|
@bolinfest has updated the pull request. You must reimport the pull request before landing. |
Contributor
|
@facebook-github-bot has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
Contributor
@bolinfest yeah, we should really try to make our tests more external-friendly, especially if those tests are testing OSS featurues |
sggutier
approved these changes
Apr 23, 2024
Contributor
sggutier
left a comment
sggutier
left a comment
There was a problem hiding this comment.
Also, it seems like tests are now passing, so I'll try to get this merged soon
Contributor
|
@bolinfest I think this introduced an issue where the last line of a commit is rendered as a header since it now looks like a "second level header" here: https://daringfireball.net/projects/markdown/basics. What issue did the extra newline cause? |
Contributor
Author
|
I agree and I have hit this, as well. Before, I believe it was adding an extra new line every time I ran Agree I should fix it so there is exactly one before the horizontal separator. I think the problem mainly happens when the PR at the bottom of the stack goes from "lone" to "stacked" because it had no trailing newline before the stack is appended. |
facebook-github-bot
pushed a commit
that referenced
this pull request
Oct 16, 2024
Summary: # Motivation And if there is one is one design mistake Rust ecosystem made, it is making [`group_by` weird](rust-itertools/itertools#374) and possible for users to, quote: > I spent several hours debugging my code written using the group_by function. Luckily for internal users, the build tooling responds accordingly and fails build for all usages of deprecated API. Thus, there is a need to adjust all of them manually. # [Release notes](https://github.com/rust-itertools/itertools/blob/master/CHANGELOG.md#0130) ### Breaking - Removed implementation of `DoubleEndedIterator` for `ConsTuples` (#853) - Made `MultiProduct` fused and fixed on an empty iterator (#835, #834) - Changed `iproduct!` to return tuples for maxi one iterator too (#870) - Changed `PutBack::put_back` to return the old value (#880) - Removed deprecated `repeat_call, Itertools::{foreach, step, map_results, fold_results}` (#878) - Removed `TakeWhileInclusive::new` (#912) NOTE: Quick search didn't tell me anything related to breaking changes above, CI will tell. And, of course, scream to me if it breaks your personal build. Reviewed By: anps77 Differential Revision: D64306014 fbshipit-source-id: 881ac716e1dc23968d4a28000fdaccdbf9097ec2
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix an issue where github.preserve-pull-request-description=true was adding \n to commit message.
Summary:
While #863 fixed some important
issues with respect to recognizing
\r\n, it also introduced a newissue where running
sl pr swithgithub.preserve-pull-request-description=truewould inadvertently add an extra
\nbefore the horizontal ruledelimiting the Sapling stack information.
This fixes
create_pull_request_title_and_body()to preserve whateverwhitespace was originally present before the horizontal rule,
only adding a new
\nto the end of the commit message if it did notalready have one.
Test Plan: