Adds ability to set or change the upstream branch for branches

CHANGELOG.md

@@ -12,6 +12,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
   - Adds a new "Favorited Branches" option to the branches visibility dropdown on the _Commit Graph_
   - Adds _Add to Favorites_ or _Remove from Favorites_ context menu items to branches in the _Commit Graph_
   - Adds _Add to Favorites_ or _Remove from Favorites_ context menu items to worktrees in the views
+- Adds ability to set or change the upstream branch for branches in the _Commit Graph_ and other GitLens views ([#4498](https://github.com/gitkraken/vscode-gitlens/issues/4498))
+  - Adds new _Set Upstream..._ and _Change Upstream..._ context menu items to branches in the _Commit Graph_ and other GitLens views
+  - Adds a new _upstream_ sub-command to the _branch_ Git Command Palette
 
 ### Changed
 

contributions.json

@@ -407,6 +407,34 @@
 			"label": "Change Branch Merge Target",
 			"commandPalette": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders"
 		},
+		"gitlens.changeUpstream:graph": {
+			"label": "Change Upstream...",
+			"icon": "$(link)",
+			"enablement": "!operationInProgress",
+			"menus": {
+				"webview/context": [
+					{
+						"when": "webviewItem =~ /gitlens:branch\\b(?!.*?\\b\\+remote\\b)(?!.*?\\b\\+closed\\b)(?=.*?\\b\\+tracking\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
+						"group": "1_gitlens_actions_2",
+						"order": 3
+					}
+				]
+			}
+		},
+		"gitlens.changeUpstream:views": {
+			"label": "Change Upstream...",
+			"icon": "$(link)",
+			"enablement": "!operationInProgress",
+			"menus": {
+				"view/item/context": [
+					{
+						"when": "viewItem =~ /gitlens:branch\\b(?!.*?\\b\\+remote\\b)(?!.*?\\b\\+closed\\b)(?=.*?\\b\\+tracking\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
+						"group": "1_gitlens_actions_2",
+						"order": 3
+					}
+				]
+			}
+		},
 		"gitlens.clearFileAnnotations": {
 			"label": "Clear File Annotations",
 			"icon": "$(gitlens-gitlens-filled)",
@@ -3776,6 +3804,34 @@
 				]
 			}
 		},
+		"gitlens.setUpstream:graph": {
+			"label": "Set Upstream...",
+			"icon": "$(link)",
+			"enablement": "!operationInProgress",
+			"menus": {
+				"webview/context": [
+					{
+						"when": "webviewItem =~ /gitlens:branch\\b(?!.*?\\b\\+remote\\b)(?!.*?\\b\\+closed\\b)(?!.*?\\b\\+tracking\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
+						"group": "1_gitlens_actions_2",
+						"order": 3
+					}
+				]
+			}
+		},
+		"gitlens.setUpstream:views": {
+			"label": "Set Upstream...",
+			"icon": "$(link)",
+			"enablement": "!operationInProgress",
+			"menus": {
+				"view/item/context": [
+					{
+						"when": "viewItem =~ /gitlens:branch\\b(?!.*?\\b\\+remote\\b)(?!.*?\\b\\+closed\\b)(?!.*?\\b\\+tracking\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
+						"group": "1_gitlens_actions_2",
+						"order": 3
+					}
+				]
+			}
+		},
 		"gitlens.shareAsCloudPatch": {
 			"label": "Share as Cloud Patch...",
 			"commandPalette": "gitlens:enabled && gitlens:gk:organization:drafts:enabled && config.gitlens.cloudPatches.enabled",

package.json

@@ -6358,6 +6358,18 @@
 				"title": "Change Branch Merge Target",
 				"category": "GitLens"
 			},
+			{
+				"command": "gitlens.changeUpstream:graph",
+				"title": "Change Upstream...",
+				"icon": "$(link)",
+				"enablement": "!operationInProgress"
+			},
+			{
+				"command": "gitlens.changeUpstream:views",
+				"title": "Change Upstream...",
+				"icon": "$(link)",
+				"enablement": "!operationInProgress"
+			},
 			{
 				"command": "gitlens.clearFileAnnotations",
 				"title": "Clear File Annotations",
@@ -7595,6 +7607,18 @@
 				"title": "Reveal Commit in Side Bar",
 				"category": "GitLens"
 			},
+			{
+				"command": "gitlens.setUpstream:graph",
+				"title": "Set Upstream...",
+				"icon": "$(link)",
+				"enablement": "!operationInProgress"
+			},
+			{
+				"command": "gitlens.setUpstream:views",
+				"title": "Set Upstream...",
+				"icon": "$(link)",
+				"enablement": "!operationInProgress"
+			},
 			{
 				"command": "gitlens.shareAsCloudPatch",
 				"title": "Share as Cloud Patch...",
@@ -10899,6 +10923,14 @@
 					"command": "gitlens.changeBranchMergeTarget",
 					"when": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders"
 				},
+				{
+					"command": "gitlens.changeUpstream:graph",
+					"when": "false"
+				},
+				{
+					"command": "gitlens.changeUpstream:views",
+					"when": "false"
+				},
 				{
 					"command": "gitlens.clearFileAnnotations",
 					"when": "resource in gitlens:tabs:blameable && (gitlens:window:annotated || resource in gitlens:tabs:annotated)"
@@ -11859,6 +11891,14 @@
 					"command": "gitlens.revealCommitInView",
 					"when": "resource in gitlens:tabs:blameable"
 				},
+				{
+					"command": "gitlens.setUpstream:graph",
+					"when": "false"
+				},
+				{
+					"command": "gitlens.setUpstream:views",
+					"when": "false"
+				},
 				{
 					"command": "gitlens.shareAsCloudPatch",
 					"when": "gitlens:enabled && gitlens:gk:organization:drafts:enabled && config.gitlens.cloudPatches.enabled"
@@ -16923,6 +16963,16 @@
 					"when": "viewItem =~ /gitlens:branch\\b(?!.*?\\b\\+closed\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
 					"group": "1_gitlens_actions_2@2"
 				},
+				{
+					"command": "gitlens.changeUpstream:views",
+					"when": "viewItem =~ /gitlens:branch\\b(?!.*?\\b\\+remote\\b)(?!.*?\\b\\+closed\\b)(?=.*?\\b\\+tracking\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
+					"group": "1_gitlens_actions_2@3"
+				},
+				{
+					"command": "gitlens.setUpstream:views",
+					"when": "viewItem =~ /gitlens:branch\\b(?!.*?\\b\\+remote\\b)(?!.*?\\b\\+closed\\b)(?!.*?\\b\\+tracking\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
+					"group": "1_gitlens_actions_2@3"
+				},
 				{
 					"command": "gitlens.views.deleteBranch",
 					"when": "viewItem =~ /gitlens:branch\\b(?!.*?\\b\\+current\\b)(?!.*?\\b\\+closed\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
@@ -22755,11 +22805,21 @@
 					"when": "webviewItem =~ /gitlens:branch\\b/ && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
 					"group": "1_gitlens_actions_2@2"
 				},
+				{
+					"command": "gitlens.changeUpstream:graph",
+					"when": "webviewItem =~ /gitlens:branch\\b(?!.*?\\b\\+remote\\b)(?!.*?\\b\\+closed\\b)(?=.*?\\b\\+tracking\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
+					"group": "1_gitlens_actions_2@3"
+				},
 				{
 					"command": "gitlens.graph.deleteBranch",
 					"when": "webviewItem =~ /gitlens:branch\\b(?!.*?\\b\\+(current|checkedout)\\b)/ && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
 					"group": "1_gitlens_actions_2@3"
 				},
+				{
+					"command": "gitlens.setUpstream:graph",
+					"when": "webviewItem =~ /gitlens:branch\\b(?!.*?\\b\\+remote\\b)(?!.*?\\b\\+closed\\b)(?!.*?\\b\\+tracking\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
+					"group": "1_gitlens_actions_2@3"
+				},
 				{
 					"command": "gitlens.graph.createBranch",
 					"when": "webviewItem =~ /gitlens:branch\\b/ && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",

src/commands/changeBranchMergeTarget.ts

@@ -1,3 +1,4 @@
+import { ThemeIcon } from 'vscode';
 import type { Container } from '../container';
 import type { GitBranch } from '../git/models/branch';
 import type { Repository } from '../git/models/repository';
@@ -92,11 +93,14 @@ export class ChangeBranchMergeTargetCommand extends QuickCommand {
 				picked: state.mergeBranch,
 				placeholder: 'Pick a merge target branch',
 				filter: (branch: GitBranch) => branch.remote && branch.name !== state.branch,
-				reset: {
-					allowed: userMergeTarget != null && detectedMergeTarget !== userMergeTarget,
-					label: 'Reset Merge Target',
-					detail: 'Reset the merge target branch to be automatically detected',
-				},
+				reset:
+					userMergeTarget != null && detectedMergeTarget !== userMergeTarget
+						? {
+								label: 'Reset Merge Target',
+								detail: 'Reset the merge target branch to be automatically detected',
+								button: { icon: new ThemeIcon('discard'), tooltip: 'Reset Merge Target' },
+							}
+						: undefined,
 			});
 			if (result === StepResultBreak) continue;