Simplifies the event name

(#4224, #4258)

Author: sergeibbb

contributions.json

@@ -71,8 +71,8 @@
 			"enablement": "gitlens:enabled && resourceScheme =~ /^(gitlens|pr)$/",
 			"commandPalette": "!gitlens:hasVirtualFolders && gitlens:enabled && resourceScheme =~ /^(gitlens|git|pr)$/"
 		},
-		"gitlens.changeUserDefinedMergeBase": {
-			"label": "Change Merge Target of a branch",
+		"gitlens.changeBranchMergeTarget": {
+			"label": "Change Branch Merge Target",
 			"commandPalette": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders"
 		},
 		"gitlens.clearFileAnnotations": {

docs/telemetry-events.md

@@ -1160,7 +1160,7 @@ or
 }
 ```
 
-### home/changeUserDefinedMergeBase
+### home/changeBranchMergeTarget
 
 > Sent when the user starts defining a user-specific merge target branch
 

package.json

@@ -6086,8 +6086,8 @@
 				"enablement": "gitlens:enabled && resourceScheme =~ /^(gitlens|pr)$/"
 			},
 			{
-				"command": "gitlens.changeUserDefinedMergeBase",
-				"title": "Change Merge Target of a branch",
+				"command": "gitlens.changeBranchMergeTarget",
+				"title": "Change Branch Merge Target",
 				"category": "GitLens"
 			},
 			{
@@ -10376,7 +10376,7 @@
 					"when": "!gitlens:hasVirtualFolders && gitlens:enabled && resourceScheme =~ /^(gitlens|git|pr)$/"
 				},
 				{
-					"command": "gitlens.changeUserDefinedMergeBase",
+					"command": "gitlens.changeBranchMergeTarget",
 					"when": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders"
 				},
 				{

src/commands/changeUserDefinedMergeBase.ts

@@ -30,13 +30,13 @@ function assertState(state: PartialStepState<InitialState>): asserts state is St
 }
 
 export interface ChangeUserDefinedMergeBaseCommandArgs {
-	readonly command: 'changeUserDefinedMergeBase';
+	readonly command: 'changeBranchMergeTarget';
 	state?: Partial<InitialState>;
 }
 
 export class ChangeUserDefinedMergeBaseCommand extends QuickCommand {
 	constructor(container: Container, args?: ChangeUserDefinedMergeBaseCommandArgs) {
-		super(container, 'changeUserDefinedMergeBase', 'changeUserDefinedMergeBase', 'Change Merge Target', {
+		super(container, 'changeBranchMergeTarget', 'changeBranchMergeTarget', 'Change Merge Target', {
 			description: 'Change Merge Target for a branch',
 		});
 		let counter = 0;

src/commands/quickWizard.ts

@@ -20,7 +20,7 @@ export class QuickWizardCommand extends QuickWizardCommandBase {
 			'gitlens.showLaunchpad',
 			'gitlens.startWork',
 			'gitlens.associateIssueWithBranch',
-			'gitlens.changeUserDefinedMergeBase',
+			'gitlens.changeBranchMergeTarget',
 		]);
 	}
 
@@ -35,8 +35,8 @@ export class QuickWizardCommand extends QuickWizardCommandBase {
 			case 'gitlens.associateIssueWithBranch':
 				return this.execute({ command: 'associateIssueWithBranch', ...args });
 
-			case 'gitlens.changeUserDefinedMergeBase':
-				return this.execute({ command: 'changeUserDefinedMergeBase', ...args });
+			case 'gitlens.changeBranchMergeTarget':
+				return this.execute({ command: 'changeBranchMergeTarget', ...args });
 
 			default:
 				return this.execute(args);

src/commands/quickWizard.utils.ts

@@ -124,7 +124,7 @@ export class QuickWizardRootStep implements QuickPickStep<QuickCommand> {
 			this.hiddenItems.push(new AssociateIssueWithBranchCommand(container, args));
 		}
 
-		if (args?.command === 'changeUserDefinedMergeBase') {
+		if (args?.command === 'changeBranchMergeTarget') {
 			this.hiddenItems.push(new ChangeUserDefinedMergeBaseCommand(container, args));
 		}
 	}

src/constants.commands.generated.ts

@@ -619,7 +619,7 @@ export type ContributedPaletteCommands =
 	| 'gitlens.browseRepoAtRevisionInNewWindow'
 	| 'gitlens.browseRepoBeforeRevision'
 	| 'gitlens.browseRepoBeforeRevisionInNewWindow'
-	| 'gitlens.changeUserDefinedMergeBase'
+	| 'gitlens.changeBranchMergeTarget'
 	| 'gitlens.clearFileAnnotations'
 	| 'gitlens.closeUnchangedFiles'
 	| 'gitlens.compareHeadWith'

src/constants.commands.ts

@@ -33,7 +33,7 @@ type InternalGraphWebviewCommands =
 	| 'gitlens.graph.skipPausedOperation';
 
 type InternalHomeWebviewCommands =
-	| 'gitlens.home.changeUserDefinedMergeBase'
+	| 'gitlens.home.changeBranchMergeTarget'
 	| 'gitlens.home.deleteBranchOrWorktree'
 	| 'gitlens.home.pushBranch'
 	| 'gitlens.home.openMergeTargetComparison'
@@ -104,7 +104,7 @@ type InternalWalkthroughCommands =
 
 type InternalGlCommands =
 	| `gitlens.action.${string}`
-	| 'gitlens.changeUserDefinedMergeBase'
+	| 'gitlens.changeBranchMergeTarget'
 	| 'gitlens.diffWith'
 	| 'gitlens.openOnRemote'
 	| 'gitlens.openWalkthrough'

src/constants.telemetry.ts

@@ -158,7 +158,7 @@ export interface TelemetryEvents extends WebviewShowAbortedEvents, WebviewShownE
 	/** Sent when the user chooses to start work on an issue from the home view */
 	'home/startWork': void;
 	/** Sent when the user starts defining a user-specific merge target branch */
-	'home/changeUserDefinedMergeBase': void;
+	'home/changeBranchMergeTarget': void;
 
 	/** Sent when the user takes an action on the Launchpad title bar */
 	'launchpad/title/action': LaunchpadTitleActionEvent;

src/webviews/apps/plus/home/components/merge-target-status.ts

@@ -477,7 +477,7 @@ export class GlMergeTargetStatus extends LitElement {
 		return html`<span class="header__actions"
 			>${branchRef && targetRef
 				? html`<gl-button
-							href="${createCommandLink<BranchAndTargetRefs>('gitlens.home.changeUserDefinedMergeBase', {
+							href="${createCommandLink<BranchAndTargetRefs>('gitlens.home.changeBranchMergeTarget', {
 								...branchRef,
 								mergeTargetId: targetRef.branchId,
 								mergeTargetName: targetRef.branchName,