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
|
import React from 'dom-chef';
import select from 'select-dom';
import {AlertIcon} from '@primer/octicons-react';
import * as pageDetect from 'github-url-detection';
import {observe, Observer} from 'selector-observer';
import delegate, {DelegateEvent} from 'delegate-it';
import features from '.';
import * as api from '../github-helpers/api';
import getPrInfo from '../github-helpers/get-pr-info';
import {getConversationNumber} from '../github-helpers';
const selectorForPushablePRNotice = '.merge-pr > .color-fg-muted:first-child';
let observer: Observer;
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',
ignoreHTTPStatus: true,
});
}
async function handler({delegateTarget}: DelegateEvent): Promise<void> {
const {base, head} = getBranches();
if (!confirm(`Merge the ${base} branch into ${head}?`)) {
return;
}
const statusMeta = delegateTarget.parentElement!;
statusMeta.textContent = 'Updating branch…';
observer.abort();
const response = await mergeBranches();
if (response.ok) {
statusMeta.remove();
} else {
statusMeta.textContent = response.message ?? 'Error';
statusMeta.prepend(<AlertIcon/>, ' ');
throw new api.RefinedGitHubAPIError('update-pr-from-base-branch: ' + JSON.stringify(response));
}
}
async function addButton(position: Element): Promise<void> {
const {base, head} = getBranches();
const [pr, comparison] = await Promise.all([
getPrInfo(),
// TODO: Find how to determine whether the branch needs to be updated via v4
// `page=10000` avoids fetching any commit information, which is heavy
api.v3(`compare/${base}...${head}?page=10000`),
]);
if (comparison.status === 'diverged' && pr.viewerCanEditFiles && pr.mergeable !== 'CONFLICTING') {
position.append(' ', (
<span className="status-meta d-inline-block rgh-update-pr-from-base-branch">
You can <button type="button" className="btn-link">update the base branch</button>.
</span>
));
}
}
async function init(signal: AbortSignal): Promise<false | Deinit> {
await api.expectToken();
delegate(document, '.rgh-update-pr-from-base-branch', 'click', handler, {signal});
// Quick check before using selector-observer on it
if (!select.exists(selectorForPushablePRNotice)) {
return false;
}
observer = observe(`:is(${selectorForPushablePRNotice}):not(.rgh-update-pr)`, {
add(position) {
position.classList.add('rgh-update-pr');
void addButton(position);
},
});
return observer;
}
void features.add(import.meta.url, {
include: [
pageDetect.isPRConversation,
],
exclude: [
pageDetect.isClosedPR,
() => select('.head-ref')!.title === 'This repository has been deleted',
// Native button https://github.blog/changelog/2022-02-03-more-ways-to-keep-your-pull-request-branch-up-to-date/
() => select.exists('.js-update-branch-form'),
],
deduplicate: false,
init,
});
/*
Test URLs
PR without conflicts
https://github.com/refined-github/sandbox/pull/11
Native "Resolve conflicts" button
https://github.com/refined-github/sandbox/pull/9
*/
|
