Skip to content

Commit 33bfb9d

Browse files
committed
add message & sort supress keys
# Conflicts: # src/config.ts
1 parent cdec8c9 commit 33bfb9d

File tree

2 files changed

+18
-5
lines changed

2 files changed

+18
-5
lines changed

package.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4717,22 +4717,23 @@
47174717
"gitlens.advanced.messages": {
47184718
"type": "object",
47194719
"default": {
4720+
"suppressBlameInvalidIgnoreRevsFileBadRevisionWarning": false,
4721+
"suppressBlameInvalidIgnoreRevsFileWarning": false,
47204722
"suppressCommitHasNoPreviousCommitWarning": false,
47214723
"suppressCommitNotFoundWarning": false,
47224724
"suppressCreatePullRequestPrompt": false,
47234725
"suppressDebugLoggingWarning": false,
47244726
"suppressFileNotUnderSourceControlWarning": false,
4727+
"suppressGitBranchNotFullyMergedWarning": false,
47254728
"suppressGitDisabledWarning": false,
47264729
"suppressGitMissingWarning": false,
47274730
"suppressGitVersionWarning": false,
4728-
"suppressLineUncommittedWarning": false,
4729-
"suppressNoRepositoryWarning": false,
4730-
"suppressRebaseSwitchToTextWarning": false,
47314731
"suppressIntegrationDisconnectedTooManyFailedRequestsWarning": false,
47324732
"suppressIntegrationRequestFailed500Warning": false,
47334733
"suppressIntegrationRequestTimedOutWarning": false,
4734-
"suppressBlameInvalidIgnoreRevsFileWarning": false,
4735-
"suppressBlameInvalidIgnoreRevsFileBadRevisionWarning": false
4734+
"suppressLineUncommittedWarning": false,
4735+
"suppressNoRepositoryWarning": false,
4736+
"suppressRebaseSwitchToTextWarning": false
47364737
},
47374738
"properties": {
47384739
"suppressCommitHasNoPreviousCommitWarning": {

src/messages.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,18 @@ export function showGitVersionUnsupportedErrorMessage(
138138
);
139139
}
140140

141+
export async function showGitBranchNotFullyMergedPrompt(branchName: string) {
142+
const confirm = { title: 'Retry with --force flag' };
143+
const result = await showMessage(
144+
'warn',
145+
`Unable to delete branch '${branchName}'. It is not fully merged.`,
146+
'suppressGitBranchNotFullyMergedWarning',
147+
{ title: "Don't Show Again" },
148+
confirm,
149+
);
150+
return result === confirm;
151+
}
152+
141153
export async function showPreReleaseExpiredErrorMessage(version: string) {
142154
const upgrade = { title: 'Upgrade' };
143155
const switchToRelease = { title: 'Switch to Release Version' };

0 commit comments

Comments
 (0)