fix(github): keep merged PRs as branch history instead of hiding them
Branch status resolves an open PR across the whole fork network first, so a merged fork PR can never hide an open upstream PR for the same head. Only when no target has an open PR does the branch's newest closed/merged PR come back, as history. The panel shows that history as a compact note and offers creating the next PR below it, instead of either sticking on a terminal PR or going blank after a merge. Terminal associations stay persisted for reload continuity but are never treated as authority: they revalidate on the discovery cadence and on focus. History is looked up only for the branch's own remote and name, and remembered per repo+branch, so the extra lookup cannot exhaust the route's resolve budget. The checks summary and merge-permission lookup are skipped for a closed or merged PR, where neither is actionable.
This commit is contained in:
@@ -933,6 +933,8 @@ export const dict = {
|
||||
'gitView.pr.field.draft': 'Entwurf',
|
||||
'gitView.pr.field.title': 'Titel',
|
||||
'gitView.pr.githubNotConnected': 'GitHub ist nicht verbunden',
|
||||
'gitView.pr.history.merged': 'PR #{number} wurde in {base} gemergt.',
|
||||
'gitView.pr.history.closed': 'PR #{number} wurde geschlossen.',
|
||||
'gitView.pr.loadingDescription': 'Beschreibung wird geladen...',
|
||||
'gitView.pr.mergeMethod.merge': 'Einen Merge-Commit erstellen',
|
||||
'gitView.pr.mergeMethod.rebase': 'Rebase und Merge',
|
||||
|
||||
@@ -997,6 +997,8 @@ export const dict = {
|
||||
'gitView.pr.field.draft': 'Draft',
|
||||
'gitView.pr.field.title': 'Title',
|
||||
'gitView.pr.githubNotConnected': 'GitHub is not connected',
|
||||
'gitView.pr.history.merged': 'PR #{number} was merged into {base}.',
|
||||
'gitView.pr.history.closed': 'PR #{number} was closed.',
|
||||
'gitView.pr.loadingDescription': 'Loading description...',
|
||||
'gitView.pr.mergeMethod.merge': 'Create a merge commit',
|
||||
'gitView.pr.mergeMethod.rebase': 'Rebase and merge',
|
||||
|
||||
@@ -998,6 +998,8 @@ export const dict: Record<I18nKey, string> = {
|
||||
"gitView.pr.field.draft": "Borrador",
|
||||
"gitView.pr.field.title": "Título",
|
||||
"gitView.pr.githubNotConnected": "GitHub no está conectado",
|
||||
"gitView.pr.history.merged": "La PR #{number} se fusionó en {base}.",
|
||||
"gitView.pr.history.closed": "La PR #{number} se cerró.",
|
||||
"gitView.pr.loadingDescription": "Cargando descripción...",
|
||||
"gitView.pr.mergeMethod.merge": "Crear un merge commit",
|
||||
"gitView.pr.mergeMethod.rebase": "Rebase y merge",
|
||||
|
||||
@@ -817,6 +817,8 @@ export const dict = {
|
||||
'gitView.pr.field.draft': 'Brouillon',
|
||||
'gitView.pr.field.title': 'Titre',
|
||||
'gitView.pr.githubNotConnected': 'GitHub n\'est pas connecté',
|
||||
'gitView.pr.history.merged': 'La PR #{number} a été fusionnée dans {base}.',
|
||||
'gitView.pr.history.closed': 'La PR #{number} a été fermée.',
|
||||
'gitView.pr.loadingDescription': 'Chargement de la description de la PR...',
|
||||
'gitView.pr.mergeMethod.merge': 'Créer un commit de fusion',
|
||||
'gitView.pr.mergeMethod.rebase': 'Rebase et fusionner',
|
||||
|
||||
@@ -994,6 +994,8 @@ export const dict: Record<I18nKey, string> = {
|
||||
'gitView.pr.field.draft': '下書き',
|
||||
'gitView.pr.field.title': 'タイトル',
|
||||
'gitView.pr.githubNotConnected': 'GitHubが接続されていません',
|
||||
'gitView.pr.history.merged': 'PR #{number} は {base} にマージされました。',
|
||||
'gitView.pr.history.closed': 'PR #{number} はクローズされました。',
|
||||
'gitView.pr.loadingDescription': '説明を読み込み中...',
|
||||
'gitView.pr.mergeMethod.merge': 'マージコミットを作成',
|
||||
'gitView.pr.mergeMethod.rebase': 'リベースしてマージ',
|
||||
|
||||
@@ -998,6 +998,8 @@ export const dict: Record<I18nKey, string> = {
|
||||
'gitView.pr.field.draft': '드래프트',
|
||||
'gitView.pr.field.title': '제목',
|
||||
'gitView.pr.githubNotConnected': 'GitHub에 연결되지 않음',
|
||||
'gitView.pr.history.merged': 'PR #{number}이(가) {base}에 병합되었습니다.',
|
||||
'gitView.pr.history.closed': 'PR #{number}이(가) 닫혔습니다.',
|
||||
'gitView.pr.loadingDescription': '설명 로드 중…',
|
||||
'gitView.pr.mergeMethod.merge': '병합 커밋 생성',
|
||||
'gitView.pr.mergeMethod.rebase': '리베이스 후 병합',
|
||||
|
||||
@@ -2187,6 +2187,8 @@ export const dict: Record<I18nKey, string> = {
|
||||
'gitView.pr.field.draft': 'Szkic',
|
||||
'gitView.pr.field.title': 'Tytuł',
|
||||
'gitView.pr.githubNotConnected': 'GitHub nie jest połączony',
|
||||
'gitView.pr.history.merged': 'PR #{number} został scalony do {base}.',
|
||||
'gitView.pr.history.closed': 'PR #{number} został zamknięty.',
|
||||
'gitView.pr.loadingDescription': 'Loading description...',
|
||||
'gitView.pr.mergeMethod.merge': 'Create a merge commit',
|
||||
'gitView.pr.mergeMethod.rebase': 'Rebase and merge',
|
||||
|
||||
@@ -998,6 +998,8 @@ export const dict: Record<I18nKey, string> = {
|
||||
"gitView.pr.field.draft": "Borrador",
|
||||
"gitView.pr.field.title": "Título",
|
||||
"gitView.pr.githubNotConnected": "GitHub não está conectado",
|
||||
"gitView.pr.history.merged": "A PR #{number} foi mesclada em {base}.",
|
||||
"gitView.pr.history.closed": "A PR #{number} foi fechada.",
|
||||
"gitView.pr.loadingDescription": "Carregando descrição...",
|
||||
"gitView.pr.mergeMethod.merge": "Criar um merge commit",
|
||||
"gitView.pr.mergeMethod.rebase": "Rebase e merge",
|
||||
|
||||
@@ -998,6 +998,8 @@ export const dict: Record<I18nKey, string> = {
|
||||
"gitView.pr.field.draft": "Чернетка",
|
||||
"gitView.pr.field.title": "Назва",
|
||||
"gitView.pr.githubNotConnected": "GitHub не підключено",
|
||||
"gitView.pr.history.merged": "PR #{number} злито в {base}.",
|
||||
"gitView.pr.history.closed": "PR #{number} закрито.",
|
||||
"gitView.pr.loadingDescription": "Завантаження опису...",
|
||||
"gitView.pr.mergeMethod.merge": "Створити коміт злиття",
|
||||
"gitView.pr.mergeMethod.rebase": "Перебазувати та злити",
|
||||
|
||||
@@ -998,6 +998,8 @@ export const dict: Record<I18nKey, string> = {
|
||||
'gitView.pr.field.draft': '草稿',
|
||||
'gitView.pr.field.title': '标题',
|
||||
'gitView.pr.githubNotConnected': 'GitHub 未连接',
|
||||
'gitView.pr.history.merged': 'PR #{number} 已合并到 {base}。',
|
||||
'gitView.pr.history.closed': 'PR #{number} 已关闭。',
|
||||
'gitView.pr.loadingDescription': '正在加载描述...',
|
||||
'gitView.pr.mergeMethod.merge': '创建合并提交',
|
||||
'gitView.pr.mergeMethod.rebase': '变基并合并',
|
||||
|
||||
@@ -1010,6 +1010,8 @@ export const dict: Record<I18nKey, string> = {
|
||||
'gitView.pr.field.draft': '草稿',
|
||||
'gitView.pr.field.title': '標題',
|
||||
'gitView.pr.githubNotConnected': 'GitHub 未連線',
|
||||
'gitView.pr.history.merged': 'PR #{number} 已合併到 {base}。',
|
||||
'gitView.pr.history.closed': 'PR #{number} 已關閉。',
|
||||
'gitView.pr.loadingDescription': '正在載入描述...',
|
||||
'gitView.pr.mergeMethod.merge': '建立合併提交',
|
||||
'gitView.pr.mergeMethod.rebase': 'Rebase 並合併',
|
||||
|
||||
Reference in New Issue
Block a user