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.

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

Fix an issue where github.preserve-pull-request-description=true was adding \n to commit message. #880

Closed
wants to merge 1 commit into from
Closed

Fix an issue where github.preserve-pull-request-description=true was adding \n to commit message. #880

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion eden/scm/sapling/ext/github/mock_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,8 @@ def expect_update_pr_request(
f"* __->__ #{n}" if n == pr_number else f"* #{n}" for n in stack_pr_ids
]
body += (
"\n---\n"
("" if body.endswith("\n") else "\n") +
"---\n"
"[//]: # (BEGIN SAPLING FOOTER)\n"
"Stack created with [Sapling](https://sapling-scm.com). Best reviewed"
f" with [ReviewStack](https://reviewstack.dev/{owner}/{name}/pull/{pr_number}).\n"
Expand Down
25 changes: 24 additions & 1 deletion eden/scm/sapling/ext/github/pull_request_body.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,33 @@ def create_pull_request_title_and_body(
* __->__ #42
* #4

Add trailing whitespace to commit_msg and ensure it is preserved.
>>> commit_msg += '\n\n'
>>> title, body = create_pull_request_title_and_body(
... commit_msg,
... pr_numbers_and_num_commits,
... pr_numbers_index,
... contributor_repo,
... )
>>> print(body.replace(reviewstack_url, "{reviewstack_url}"))
The original commit message.
Second line of message.
<BLANKLINE>
---
[//]: # (BEGIN SAPLING FOOTER)
Stack created with [Sapling](https://sapling-scm.com). Best reviewed with [ReviewStack]({reviewstack_url}).
* #1
* #2 (2 commits)
* __->__ #42
* #4

Disable reviewstack message:
>>> title, body = create_pull_request_title_and_body(commit_msg, pr_numbers_and_num_commits,
... pr_numbers_index, contributor_repo, reviewstack=False)
>>> print(body)
The original commit message.
Second line of message.
<BLANKLINE>
---
[//]: # (BEGIN SAPLING FOOTER)
* #1
Expand Down Expand Up @@ -84,7 +105,9 @@ def create_pull_request_title_and_body(
)
extra.append(bulleted_list)
if extra:
body = "\n".join([body, _HORIZONTAL_RULE, _SAPLING_FOOTER_MARKER] + extra)
if not body.endswith("\n"):
body += "\n"
body += "\n".join([_HORIZONTAL_RULE, _SAPLING_FOOTER_MARKER] + extra)
return title, body


Expand Down
Loading