Skip to content

Restore base branch name in clean-conversation-headers #4103

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
fregante merged 1 commit into from
Mar 19, 2021
Merged

Restore base branch name in clean-conversation-headers #4103

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
15 changes: 5 additions & 10 deletions source/features/clean-conversation-headers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,18 @@ function initPR(): void {
const baseBranch = select('.commit-ref:not(.head-ref)', byline)!;
const isDefaultBranch = (baseBranch.firstElementChild as HTMLAnchorElement).pathname.split('/').length === 3;

// Removes: [octocat wants to merge 1 commit into] github:master from octocat:feature
// Removes: [octocat merged 1 commit into] master from feature
// Removes: octocat [merged 1 commit into] github:master from lovelycat:feature
for (const node of [...byline.childNodes].slice(isSameAuthor ? 0 : 2, pageDetect.isMergedPR() ? 3 : 5)) {
// Removes: [octocat wants to merge 1] commit into github:master from octocat:feature
// Removes: [octocat] merged 1 commit into master from feature
for (const node of [...byline.childNodes].slice(isSameAuthor ? 0 : 2, pageDetect.isMergedPR() ? 2 : 4)) {
node.remove();
}

baseBranch.previousSibling!.textContent = ' into ';
if (!isSameAuthor) {
byline.prepend('by ');
}

if (isDefaultBranch || (pageDetect.isClosedPR() && baseBranch.title.endsWith(':master'))) {
// Removes: octocat wants to merge 1 commit into [github:dev] from octocat:feature
baseBranch.hidden = true;
} else {
// Add back "into" if the PR base branch is not the default branch
baseBranch.before(' into ');
if (!isDefaultBranch && !(pageDetect.isClosedPR() && baseBranch.title.endsWith(':master'))) {
baseBranch.classList.add('rgh-clean-conversation-headers-non-default-branch');
}
}
Expand Down