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
116
117
118
119
120
|
import React from 'dom-chef';
import select from 'select-dom';
import delegate from 'delegate-it';
import AlertIcon from 'octicon/alert.svg';
import * as pageDetect from 'github-url-detection';
import features from '.';
import * as api from '../github-helpers/api';
import observeElement from '../helpers/simplified-element-observer';
import {getConversationNumber} from '../github-helpers';
let observer: MutationObserver;
function getBranches(): {base: string; head: string} {
return {
base: select('.base-ref')!.textContent!.trim(),
head: select('.head-ref')!.textContent!.trim()
};
}
async function mergeBranches(): Promise<AnyObject> {
return api.v3(`pulls/${getConversationNumber()!}/update-branch`, {
method: 'PUT',
headers: {
Accept: 'application/vnd.github.lydian-preview+json'
},
ignoreHTTPStatus: true
});
}
async function handler({delegateTarget}: delegate.Event): Promise<void> {
const {base, head} = getBranches();
if (!confirm(`Merge the ${base} branch into ${head}?`)) {
return;
}
const statusMeta = delegateTarget.parentElement!;
statusMeta.textContent = 'Updating branch…';
observer.disconnect();
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/>, ' ');
throw new api.RefinedGitHubAPIError('update-pr-from-base-branch: ' + JSON.stringify(response));
}
}
function createButton(): HTMLElement {
const button = <button type="button" className="btn-link">update the base branch</button>;
return <span className="status-meta rgh-update-pr-from-base-branch">You can {button}.</span>;
}
async function addButton(): Promise<void> {
if (select.exists('.rgh-update-pr-from-base-branch, .branch-action-btn:not([action$="ready_for_review"]) > .btn')) {
return;
}
const stillLoading = select('#partial-pull-merging poll-include-fragment');
if (stillLoading) {
stillLoading.addEventListener('load', addButton);
return;
}
const {base, head} = getBranches();
if (head === 'unknown repository') {
return;
}
// Draft PRs already have this info on the page
const outOfDateContainer = select.all('.completeness-indicator-problem + .status-heading')
.find(title => title.textContent!.includes('out-of-date'));
if (outOfDateContainer) {
const meta = outOfDateContainer.nextElementSibling!;
meta.after(' ', createButton());
return;
}
const {status} = await api.v3(`compare/${base}...${head}`);
if (status !== 'diverged') {
return;
}
for (const meta of select.all('.mergeability-details > :not(.js-details-container) .status-meta')) {
meta.after(' ', createButton());
}
}
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) {
return false;
}
observer = observeElement('.discussion-timeline-actions', addButton)!;
delegate(document, '.rgh-update-pr-from-base-branch button', 'click', handler);
}
void features.add(__filebasename, {
include: [
pageDetect.isPRConversation
],
init
});
|
