From 17970d8258aa7123891ac903c6280ca83baf16ad Mon Sep 17 00:00:00 2001 From: Ramin Tadayon Date: Mon, 12 Jun 2023 10:16:27 +0900 Subject: [PATCH] Removes some git commands from workspace repo nodes --- package.json | 22 +++++++++++----------- src/views/nodes/repositoryNode.ts | 3 +++ 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index d438a03..d64a508 100644 --- a/package.json +++ b/package.json @@ -11888,18 +11888,18 @@ }, { "command": "gitlens.views.push", - "when": "gitlens:hasRemotes && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && viewItem =~ /gitlens:repository\\b/", + "when": "gitlens:hasRemotes && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && viewItem =~ /gitlens:repository\\b(?!.*?\\b\\+workspace.*?\\+closed\\b)/", "group": "inline@96", "alt": "gitlens.views.pushWithForce" }, { "command": "gitlens.views.pull", - "when": "gitlens:hasRemotes && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && viewItem =~ /gitlens:repository\\b/", + "when": "gitlens:hasRemotes && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && viewItem =~ /gitlens:repository\\b(?!.*?\\b\\+workspace.*?\\+closed\\b)/", "group": "inline@97" }, { "command": "gitlens.views.fetch", - "when": "gitlens:hasRemotes && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && viewItem =~ /gitlens:repository\\b/", + "when": "gitlens:hasRemotes && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && viewItem =~ /gitlens:repository\\b(?!.*?\\b\\+workspace.*?\\+closed\\b)/", "group": "inline@98" }, { @@ -11914,22 +11914,22 @@ }, { "command": "gitlens.views.fetch", - "when": "gitlens:hasRemotes && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && viewItem =~ /gitlens:repository\\b/", + "when": "gitlens:hasRemotes && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && viewItem =~ /gitlens:repository\\b(?!.*?\\b\\+workspace.*?\\+closed\\b)/", "group": "1_gitlens_actions@1" }, { "command": "gitlens.views.pull", - "when": "gitlens:hasRemotes && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && viewItem =~ /gitlens:repository\\b/", + "when": "gitlens:hasRemotes && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && viewItem =~ /gitlens:repository\\b(?!.*?\\b\\+workspace\\b.*?\\+closed\\b)/", "group": "1_gitlens_actions@1" }, { "command": "gitlens.views.push", - "when": "gitlens:hasRemotes && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && viewItem =~ /gitlens:repository\\b/", + "when": "gitlens:hasRemotes && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && viewItem =~ /gitlens:repository\\b(?!.*?\\b\\+workspace\\b.*?\\+closed\\b)/", "group": "1_gitlens_actions@1" }, { "command": "gitlens.views.pushWithForce", - "when": "gitlens:hasRemotes && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && viewItem =~ /gitlens:repository\\b/", + "when": "gitlens:hasRemotes && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && viewItem =~ /gitlens:repository\\b(?!.*?\\b\\+workspace\\b.*?\\+closed\\b)/", "group": "1_gitlens_actions@2" }, { @@ -11955,17 +11955,17 @@ }, { "command": "gitlens.stashSave", - "when": "!gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && viewItem =~ /gitlens:repository\\b/", + "when": "!gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && viewItem =~ /gitlens:repository\\b(?!.*?\\b\\+workspace\\b)/", "group": "1_gitlens_actions_1@1" }, { "command": "gitlens.stashApply", - "when": "!gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && viewItem =~ /gitlens:repository\\b/", + "when": "!gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && viewItem =~ /gitlens:repository\\b(?!.*?\\b\\+workspace\\b)/", "group": "1_gitlens_actions_1@2" }, { "command": "gitlens.views.star", - "when": "viewItem =~ /gitlens:repository\\b(?!.*?\\b\\+starred\\b)/", + "when": "viewItem =~ /gitlens:repository\\b(?!.*?\\b\\+(starred|workspace)\\b)/", "group": "8_gitlens_actions_@1" }, { @@ -11975,7 +11975,7 @@ }, { "command": "gitlens.views.closeRepository", - "when": "viewItem =~ /gitlens:repository\\b/", + "when": "viewItem =~ /gitlens:repository\\b(?!.*?\\b\\+closed\\b)/", "group": "8_gitlens_actions_@2" }, { diff --git a/src/views/nodes/repositoryNode.ts b/src/views/nodes/repositoryNode.ts index 92732bf..823314f 100644 --- a/src/views/nodes/repositoryNode.ts +++ b/src/views/nodes/repositoryNode.ts @@ -271,6 +271,9 @@ export class RepositoryNode extends SubscribeableViewNode } else if (this.options.workspace.type === WorkspaceType.Local) { contextValue += '+local'; } + if (this.repo.closed) { + contextValue += '+closed'; + } } if (this.repo.virtual) { contextValue += '+virtual';