development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-02 17:32:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

SCM - Use Publish action when the local branch does not have an upstream (#204617)

Browse source
This commit is contained in:
Ladislau Szomoru 2024-02-07 15:54:49 +01:00 committed by GitHub
parent 015d675fb6
commit d96a8b66ce
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 41 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
extensions/git/package.json
View file

@ -629,6 +629,7 @@
"command": "git.publish",
"title": "%command.publish%",
"category": "Git",
"icon": "$(cloud-upload)",
"enablement": "!operationInProgress"
},
{
@ -1887,14 +1888,24 @@
{
"command": "git.pushRef",
"group": "navigation",
"when": "scmProvider == git"
"when": "scmProvider == git && scmHistoryItemGroupHasUpstream"
},
{
"command": "git.publish",
"group": "navigation",
"when": "scmProvider == git && !scmHistoryItemGroupHasUpstream"
}
],
"scm/outgoingChanges/context": [
{
"command": "git.pushRef",
"group": "1_modification@1",
"when": "scmProvider == git"
"when": "scmProvider == git && scmHistoryItemGroupHasUpstream"
},
{
"command": "git.publish",
"group": "1_modification@1",
"when": "scmProvider == git && !scmHistoryItemGroupHasUpstream"
}
],
"scm/outgoingChanges/allChanges/context": [

48
src/vs/workbench/contrib/scm/browser/menus.ts
View file

@ -14,7 +14,7 @@ import { IMenu, IMenuService, MenuId, MenuRegistry } from 'vs/platform/actions/c
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
import { ISCMHistoryProviderMenus, SCMHistoryItemTreeElement } from 'vs/workbench/contrib/scm/common/history';
import { ISCMHistoryProviderMenus, SCMHistoryItemGroupTreeElement, SCMHistoryItemTreeElement } from 'vs/workbench/contrib/scm/common/history';
import { ISCMMenus, ISCMProvider, ISCMRepository, ISCMRepositoryMenus, ISCMResource, ISCMResourceGroup, ISCMService } from 'vs/workbench/contrib/scm/common/scm';
function actionEquals(a: IAction, b: IAction): boolean {
@ -258,38 +258,26 @@ export class SCMHistoryProviderMenus implements ISCMHistoryProviderMenus, IDispo
private readonly historyItemMenus = new Map<SCMHistoryItemTreeElement, IMenu>();
private readonly disposables = new DisposableStore();
private _incomingHistoryItemGroupMenu: IMenu;
get incomingHistoryItemGroupMenu(): IMenu { return this._incomingHistoryItemGroupMenu; }
private _incomingHistoryItemGroupContextMenu: IMenu;
get incomingHistoryItemGroupContextMenu(): IMenu { return this._incomingHistoryItemGroupContextMenu; }
private _outgoingHistoryItemGroupMenu: IMenu;
get outgoingHistoryItemGroupMenu(): IMenu { return this._outgoingHistoryItemGroupMenu; }
private _outgoingHistoryItemGroupContextMenu: IMenu;
get outgoingHistoryItemGroupContextMenu(): IMenu { return this._outgoingHistoryItemGroupContextMenu; }
constructor(
@IContextKeyService private readonly contextKeyService: IContextKeyService,
@IMenuService private readonly menuService: IMenuService) {
this._incomingHistoryItemGroupMenu = this.menuService.createMenu(MenuId.SCMIncomingChanges, this.contextKeyService);
this.disposables.add(this._incomingHistoryItemGroupMenu);
this._incomingHistoryItemGroupContextMenu = this.menuService.createMenu(MenuId.SCMIncomingChangesContext, this.contextKeyService);
this.disposables.add(this._incomingHistoryItemGroupContextMenu);
this._outgoingHistoryItemGroupMenu = this.menuService.createMenu(MenuId.SCMOutgoingChanges, this.contextKeyService);
this.disposables.add(this._outgoingHistoryItemGroupMenu);
this._outgoingHistoryItemGroupContextMenu = this.menuService.createMenu(MenuId.SCMOutgoingChangesContext, this.contextKeyService);
this.disposables.add(this._outgoingHistoryItemGroupContextMenu);
}
@IMenuService private readonly menuService: IMenuService) { }
getHistoryItemMenu(historyItem: SCMHistoryItemTreeElement): IMenu {
return this.getOrCreateHistoryItemMenu(historyItem);
}
getHistoryItemGroupMenu(historyItemGroup: SCMHistoryItemGroupTreeElement): IMenu {
return historyItemGroup.direction === 'incoming' ?
this.menuService.createMenu(MenuId.SCMIncomingChanges, this.contextKeyService) :
this.getOutgoingHistoryItemGroupMenu(MenuId.SCMOutgoingChanges, historyItemGroup);
}
getHistoryItemGroupContextMenu(historyItemGroup: SCMHistoryItemGroupTreeElement): IMenu {
return historyItemGroup.direction === 'incoming' ?
this.menuService.createMenu(MenuId.SCMIncomingChangesContext, this.contextKeyService) :
this.getOutgoingHistoryItemGroupMenu(MenuId.SCMOutgoingChangesContext, historyItemGroup);
}
private getOrCreateHistoryItemMenu(historyItem: SCMHistoryItemTreeElement): IMenu {
let result = this.historyItemMenus.get(historyItem);
@ -316,6 +304,14 @@ export class SCMHistoryProviderMenus implements ISCMHistoryProviderMenus, IDispo
return result;
}
private getOutgoingHistoryItemGroupMenu(menuId: MenuId, historyItemGroup: SCMHistoryItemGroupTreeElement): IMenu {
const contextKeyService = this.contextKeyService.createOverlay([
['scmHistoryItemGroupHasUpstream', !!historyItemGroup.repository.provider.historyProvider?.currentHistoryItemGroup?.base],
]);
return this.menuService.createMenu(menuId, contextKeyService);
}
dispose(): void {
this.disposables.dispose();
}

10
src/vs/workbench/contrib/scm/browser/scmViewPane.ts
View file

@ -831,11 +831,11 @@ class HistoryItemGroupRenderer implements ICompressibleTreeRenderer<SCMHistoryIt
const historyProviderMenu = repositoryMenus.historyProviderMenu;
if (historyProviderMenu) {
const menuId = historyItemGroup.direction === 'incoming' ? MenuId.SCMIncomingChanges : MenuId.SCMOutgoingChanges;
const menu = historyItemGroup.direction === 'incoming' ? historyProviderMenu.incomingHistoryItemGroupMenu : historyProviderMenu.outgoingHistoryItemGroupMenu;
const menu = historyProviderMenu.getHistoryItemGroupMenu(historyItemGroup);
const resetMenuId = historyItemGroup.direction === 'incoming' ? MenuId.SCMIncomingChanges : MenuId.SCMOutgoingChanges;
templateData.elementDisposables.add(connectPrimaryMenu(menu, (primary, secondary) => {
templateData.toolBar.setActions(primary, secondary, [menuId]);
templateData.toolBar.setActions(primary, secondary, [resetMenuId]);
}));
templateData.toolBar.context = historyItemGroup;
@ -3037,9 +3037,7 @@ export class SCMViewPane extends ViewPane {
}
} else if (isSCMHistoryItemGroupTreeElement(element)) {
const menus = this.scmViewService.menus.getRepositoryMenus(element.repository.provider);
const menu = element.direction === 'incoming' ?
menus.historyProviderMenu?.incomingHistoryItemGroupContextMenu :
menus.historyProviderMenu?.outgoingHistoryItemGroupContextMenu;
const menu = menus.historyProviderMenu?.getHistoryItemGroupContextMenu(element);
if (menu) {
actionRunner = new HistoryItemGroupActionRunner();

6
src/vs/workbench/contrib/scm/common/history.ts
View file

@ -10,10 +10,8 @@ import { IMenu } from 'vs/platform/actions/common/actions';
import { ISCMRepository } from 'vs/workbench/contrib/scm/common/scm';
export interface ISCMHistoryProviderMenus {
readonly incomingHistoryItemGroupMenu: IMenu;
readonly incomingHistoryItemGroupContextMenu: IMenu;
readonly outgoingHistoryItemGroupMenu: IMenu;
readonly outgoingHistoryItemGroupContextMenu: IMenu;
getHistoryItemGroupMenu(historyItemGroup: SCMHistoryItemGroupTreeElement): IMenu;
getHistoryItemGroupContextMenu(historyItemGroup: SCMHistoryItemGroupTreeElement): IMenu;
getHistoryItemMenu(historyItem: SCMHistoryItemTreeElement): IMenu;
}