Changes graph sync to force push

Author: d13

package.json

@@ -8826,10 +8826,10 @@
 				"enablement": "!operationInProgress"
 			},
 			{
-				"command": "gitlens.graph.sync",
-				"title": "Pull",
+				"command": "gitlens.graph.pushWithForce",
+				"title": "Push (force)",
 				"category": "GitLens",
-				"icon": "$(gitlens-repo-sync)",
+				"icon": "$(gitlens-repo-force-push)",
 				"enablement": "!operationInProgress"
 			},
 			{
@@ -12003,7 +12003,7 @@
 					"when": "false"
 				},
 				{
-					"command": "gitlens.graph.sync",
+					"command": "gitlens.graph.pushWithForce",
 					"when": "false"
 				},
 				{
@@ -15588,11 +15588,6 @@
 					"when": "gitlens:repos:withRemotes && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && webviewItem =~ /gitlens:branch\\b(?=.*?\\b\\+(behind|tracking)\\b)(?!.*?\\b\\+closed\\b)/",
 					"group": "1_gitlens_actions@2"
 				},
-				{
-					"command": "gitlens.graph.sync",
-					"when": "false",
-					"group": "1_gitlens_actions@2"
-				},
 				{
 					"command": "gitlens.graph.fetch",
 					"when": "gitlens:repos:withRemotes && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && webviewItem =~ /gitlens:branch\\b(?=.*?\\b\\+(remote|tracking)\\b)(?!.*?\\b\\+closed\\b)/",
@@ -15848,11 +15843,6 @@
 					"when": "webviewItem =~ /gitlens:upstreamStatus\\b/",
 					"group": "1_gitlens_actions@2"
 				},
-				{
-					"command": "gitlens.graph.sync",
-					"when": "sync",
-					"group": "1_gitlens_actions@2"
-				},
 				{
 					"command": "gitlens.graph.fetch",
 					"when": "webviewItem =~ /gitlens:upstreamStatus\\b/",

src/plus/webviews/graph/graphWebview.ts

@@ -447,7 +447,7 @@ export class GraphWebviewProvider implements WebviewProvider<State, State, Graph
 			this.host.registerWebviewCommand('gitlens.graph.push', this.push),
 			this.host.registerWebviewCommand('gitlens.graph.pull', this.pull),
 			this.host.registerWebviewCommand('gitlens.graph.fetch', this.fetch),
-			this.host.registerWebviewCommand('gitlens.graph.sync', this.sync),
+			this.host.registerWebviewCommand('gitlens.graph.pushWithForce', this.forcePush),
 			this.host.registerWebviewCommand('gitlens.graph.publishBranch', this.publishBranch),
 			this.host.registerWebviewCommand('gitlens.graph.switchToAnotherBranch', this.switchToAnother),
 
@@ -2856,13 +2856,9 @@ export class GraphWebviewProvider implements WebviewProvider<State, State, Graph
 		void RepoActions.fetch(this.repository, ref);
 	}
 
-	// @unimplemented
 	@log()
-	private sync(item?: GraphItemContext) {
-		throw new Error('unimplemented');
-		// const ref = item != null ? this.getGraphItemRef(item, 'branch') : undefined;
-		// await RepoActions.pull(this.repository, ref);
-		// void RepoActions.push(this.repository, undefined, ref);
+	private forcePush(item?: GraphItemContext) {
+		this.push(item, true);
 	}
 
 	@log()
@@ -2872,9 +2868,9 @@ export class GraphWebviewProvider implements WebviewProvider<State, State, Graph
 	}
 
 	@log()
-	private push(item?: GraphItemContext) {
+	private push(item?: GraphItemContext, force?: boolean) {
 		const ref = item != null ? this.getGraphItemRef(item) : undefined;
-		void RepoActions.push(this.repository, undefined, ref);
+		void RepoActions.push(this.repository, force, ref);
 	}
 
 	@log()

src/webviews/apps/plus/graph/actions/syncButton.tsx

@@ -3,8 +3,8 @@ import React from 'react';
 import type { BranchState, State } from '../../../../../plus/webviews/graph/protocol';
 import { pluralize } from '../../../../../system/string';
 import { createWebviewCommandLink } from '../../../../../system/webview';
-import { MenuItem, MenuLabel, MenuList } from '../../../shared/components/menu/react';
-import { PopMenu } from '../../../shared/components/overlays/pop-menu/react';
+import { MenuItem, MenuLabel } from '../../../shared/components/menu/react';
+import { GlPopover } from '../../../shared/components/overlays/popover.react';
 import { GlTooltip } from '../../../shared/components/overlays/tooltip.react';
 
 export const SyncButton = ({
@@ -119,42 +119,29 @@ export const SyncButton = ({
 				</div>
 			</GlTooltip>
 			{isAhead && isBehind && (
-				<GlTooltip placement="top" distance={7}>
-					<PopMenu position="right">
-						<button type="button" className="action-button" slot="trigger" aria-label="Minimap Options">
+				<GlPopover className="popover" placement="bottom-start" trigger="focus" arrow={false} distance={0}>
+					<GlTooltip placement="top" slot="anchor">
+						<button type="button" className="action-button" aria-label="Branch Actions">
 							<span
 								className="codicon codicon-chevron-down action-button__more"
 								aria-hidden="true"
 							></span>
 						</button>
-						<MenuList slot="content" style={{ width: 120 }}>
-							<MenuLabel>Git actions</MenuLabel>
-							<MenuItem>
-								<a
-									href={createWebviewCommandLink(
-										'gitlens.graph.pull',
-										state.webviewId,
-										state.webviewInstanceId,
-									)}
-								>
-									Pull...
-								</a>
-							</MenuItem>
-							<MenuItem>
-								<a
-									href={createWebviewCommandLink(
-										'gitlens.graph.push',
-										state.webviewId,
-										state.webviewInstanceId,
-									)}
-								>
-									Push...
-								</a>
-							</MenuItem>
-						</MenuList>
-					</PopMenu>
-					<span slot="content">Git Sync Options</span>
-				</GlTooltip>
+						<span slot="content">Branch Actions</span>
+					</GlTooltip>
+					<div slot="content">
+						<MenuLabel>Branch actions</MenuLabel>
+						<MenuItem
+							href={createWebviewCommandLink(
+								'gitlens.graph.pushWithForce',
+								state.webviewId,
+								state.webviewInstanceId,
+							)}
+						>
+							Push (force)
+						</MenuItem>
+					</div>
+				</GlPopover>
 			)}
 		</span>
 	);