1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
|
import React from 'dom-chef';
import select from 'select-dom';
import delegate, {DelegateEvent} from 'delegate-it';
import features from '../libs/features';
import * as api from '../libs/api';
import * as icons from '../libs/icons';
import observeEl from '../libs/simplified-element-observer';
import {getRepoURL, getDiscussionNumber} from '../libs/utils';
let observer: MutationObserver;
function getBranches(): {base: string; head: string} {
return {
base: select('.base-ref')!.textContent!.trim(),
head: select('.head-ref')!.textContent!.trim()
};
}
export async function mergeBranches(): Promise<AnyObject> {
return api.v3(`repos/${getRepoURL()}/pulls/${getDiscussionNumber()}/update-branch`, {
method: 'PUT',
headers: {
Accept: 'application/vnd.github.lydian-preview+json'
},
ignoreHTTPStatus: true
});
}
async function handler(event: DelegateEvent): Promise<void> {
const button = event.target as HTMLButtonElement;
button.disabled = true;
button.textContent = 'Updating branch…';
button.classList.remove('tooltipped');
observer.disconnect();
const response = await mergeBranches();
if (response.ok) {
button.remove();
} else if (response.message && response.message.toLowerCase().startsWith('merge conflict')) {
// Only shown on Draft PRs
button.replaceWith(
<a href={location.pathname + '/conflicts'} className="btn float-right">{icons.alert()} Resolve conflicts</a>
);
} else {
button.textContent = response.message || 'Error';
button.prepend(icons.alert(), ' ');
throw new api.RefinedGitHubAPIError('update-pr-from-base-branch: ' + JSON.stringify(response));
}
}
function createButton(base: string, head: string): HTMLElement {
return (
<button type="button" className="btn float-right rgh-update-pr-from-master tooltipped tooltipped-n" aria-label={`Merge the ${base} branch into ${head}`}>
Update branch
</button>
);
}
async function addButton(): Promise<void> {
if (select.exists('.rgh-update-pr-from-master, .branch-action-btn > .btn')) {
return;
}
const stillLoading = select('#partial-pull-merging poll-include-fragment');
if (stillLoading) {
stillLoading.addEventListener('load', addButton);
return;
}
const {base, head} = getBranches();
// Draft PRs already have this info on the page
const [outOfDateContainer] = select.all('.completeness-indicator-problem + .status-heading')
.filter(title => (title.textContent!).includes('out-of-date'));
if (outOfDateContainer) {
outOfDateContainer.append(createButton(base, head));
return;
}
const {status} = await api.v3(`repos/${getRepoURL()}/compare/${base}...${head}`);
if (status !== 'diverged') {
return;
}
select('.mergeability-details .merge-message')!.append(createButton(base, head));
}
function init(): void | false {
const mergeButton = select<HTMLButtonElement>('[data-details-container=".js-merge-pr"]');
// Only if user can merge it
if (!mergeButton) {
return false;
}
// Button is disabled when:
// - There are conflicts (there's already a native "Resolve conflicts" button)
// - Draft PR (show the button anyway)
if (mergeButton.disabled && !select.exists('[action$="ready_for_review"]')) {
return false;
}
observer = observeEl('.discussion-timeline-actions', addButton)!;
delegate('.discussion-timeline-actions', '.rgh-update-pr-from-master', 'click', handler);
}
features.add({
id: __featureName__,
description: 'Adds button to update a PR from the base branch to ensure it builds correctly before merging the PR itself.',
screenshot: 'https://user-images.githubusercontent.com/1402241/57941992-f2170080-7902-11e9-8f8a-594aad983559.png',
include: [
features.isPRConversation
],
load: features.onAjaxedPages,
init
});
|
