Skip to content

Don't show update-pr-from-base-branch when there are conflicts #3879

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 7 commits into from
Jan 12, 2021
Merged

Don't show update-pr-from-base-branch when there are conflicts #3879

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dcae740
Don't show `update-pr-from-base-branch` when there are conflicts
yakov116 Jan 10, 2021
28b962e
check only if can merge
yakov116 Jan 11, 2021
3e09d97
Update Can Merge Selector
yakov116 Jan 12, 2021
b3557fd
can push
yakov116 Jan 12, 2021
1d2dbe4
Update comments
fregante Jan 12, 2021
955ee09
Lint
fregante Jan 12, 2021
3b5ab36
Restore variables for improved readability
fregante Jan 12, 2021
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
17 changes: 4 additions & 13 deletions source/features/update-pr-from-base-branch.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,6 @@ async function handler({delegateTarget}: delegate.Event): Promise<void> {
const response = await mergeBranches();
if (response.ok) {
statusMeta.remove();
} else if (response.message?.toLowerCase().startsWith('merge conflict')) {
// Only shown on Draft PRs
statusMeta.textContent = '';
statusMeta.append(
<a href={location.pathname + '/conflicts'} className="btn float-right"><AlertIcon/> Resolve conflicts</a>
);
} else {
statusMeta.textContent = response.message ?? 'Error';
statusMeta.prepend(<AlertIcon/>, ' ');
Expand Down Expand Up @@ -98,13 +92,10 @@ async function addButton(): Promise<void> {
async function init(): Promise<void | false> {
await api.expectToken();

// Button exists when the current user can merge the PR.
// Button is disabled when:
// - There are conflicts (there's already a native "Resolve conflicts" button)
// - Draft PR (show the button anyway)
const canMerge = select.exists('[data-details-container=".js-merge-pr"]:not(:disabled)');
const isDraftPR = select.exists('[action$="ready_for_review"]');
if (!canMerge && !isDraftPR) {
// This link does the same thing as this feature: Updates the head branch from the base
const hasResolveConflictsLink = select.exists('.js-merge-pr a[href$="/conflicts"]');
const currentUserCanPush = select.exists('.merge-pr > .text-gray:first-child');
if (!currentUserCanPush || hasResolveConflictsLink) {
return false;
}

Expand Down