Skip to content

Commit 75a3dfa

Browse files
eamodioeamodio
committed
Adds changing upstream from tracking status nodes
1 parent 1bf2171 commit 75a3dfa

File tree

3 files changed

+50
-30
lines changed

3 files changed

+50
-30
lines changed

‎contributions.json‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -466,8 +466,8 @@
466466
"webview/context": [
467467
{
468468
"when": "webviewItem =~ /gitlens:branch\\b(?!.*?\\b\\+remote\\b)(?!.*?\\b\\+closed\\b)(?=.*?\\b\\+tracking\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
469-
"group": "1_gitlens_actions_2",
470-
"order": 3
469+
"group": "1_gitlens_actions",
470+
"order": 10
471471
}
472472
]
473473
}
@@ -480,8 +480,13 @@
480480
"view/item/context": [
481481
{
482482
"when": "viewItem =~ /gitlens:branch\\b(?!.*?\\b\\+remote\\b)(?!.*?\\b\\+closed\\b)(?=.*?\\b\\+tracking\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
483-
"group": "1_gitlens_actions_2",
484-
"order": 3
483+
"group": "1_gitlens_actions",
484+
"order": 10
485+
},
486+
{
487+
"when": "viewItem =~ /gitlens:status(-branch)?:upstream:(ahead|behind|same|missing)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
488+
"group": "1_gitlens_actions",
489+
"order": 10
485490
}
486491
]
487492
}
@@ -4636,8 +4641,8 @@
46364641
"webview/context": [
46374642
{
46384643
"when": "webviewItem =~ /gitlens:branch\\b(?!.*?\\b\\+remote\\b)(?!.*?\\b\\+closed\\b)(?!.*?\\b\\+tracking\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
4639-
"group": "1_gitlens_actions_2",
4640-
"order": 3
4644+
"group": "1_gitlens_actions",
4645+
"order": 10
46414646
}
46424647
]
46434648
}
@@ -4650,8 +4655,13 @@
46504655
"view/item/context": [
46514656
{
46524657
"when": "viewItem =~ /gitlens:branch\\b(?!.*?\\b\\+remote\\b)(?!.*?\\b\\+closed\\b)(?!.*?\\b\\+tracking\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
4653-
"group": "1_gitlens_actions_2",
4654-
"order": 3
4658+
"group": "1_gitlens_actions",
4659+
"order": 10
4660+
},
4661+
{
4662+
"when": "viewItem =~ /gitlens:status(-branch)?:upstream:none/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
4663+
"group": "1_gitlens_actions",
4664+
"order": 10
46554665
}
46564666
]
46574667
}

‎package.json‎

Lines changed: 30 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18657,6 +18657,16 @@
1865718657
"when": "viewItem =~ /gitlens:branch\\b(?=.*?\\b\\+(remote|tracking)\\b)(?!.*?\\b\\+closed\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && gitlens:repos:withRemotes",
1865818658
"group": "1_gitlens_actions@3"
1865918659
},
18660+
{
18661+
"command": "gitlens.changeUpstream:views",
18662+
"when": "viewItem =~ /gitlens:branch\\b(?!.*?\\b\\+remote\\b)(?!.*?\\b\\+closed\\b)(?=.*?\\b\\+tracking\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
18663+
"group": "1_gitlens_actions@10"
18664+
},
18665+
{
18666+
"command": "gitlens.setUpstream:views",
18667+
"when": "viewItem =~ /gitlens:branch\\b(?!.*?\\b\\+remote\\b)(?!.*?\\b\\+closed\\b)(?!.*?\\b\\+tracking\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
18668+
"group": "1_gitlens_actions@10"
18669+
},
1866018670
{
1866118671
"command": "gitlens.views.mergeBranchInto",
1866218672
"when": "viewItem =~ /gitlens:branch\\b(?!.*?\\b\\+current\\b)(?!.*?\\b\\+closed\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
@@ -18692,16 +18702,6 @@
1869218702
"when": "viewItem =~ /gitlens:branch\\b(?!.*?\\b\\+closed\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
1869318703
"group": "1_gitlens_actions_2@2"
1869418704
},
18695-
{
18696-
"command": "gitlens.changeUpstream:views",
18697-
"when": "viewItem =~ /gitlens:branch\\b(?!.*?\\b\\+remote\\b)(?!.*?\\b\\+closed\\b)(?=.*?\\b\\+tracking\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
18698-
"group": "1_gitlens_actions_2@3"
18699-
},
18700-
{
18701-
"command": "gitlens.setUpstream:views",
18702-
"when": "viewItem =~ /gitlens:branch\\b(?!.*?\\b\\+remote\\b)(?!.*?\\b\\+closed\\b)(?!.*?\\b\\+tracking\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
18703-
"group": "1_gitlens_actions_2@3"
18704-
},
1870518705
{
1870618706
"command": "gitlens.views.deleteBranch",
1870718707
"when": "viewItem =~ /gitlens:branch\\b(?!.*?\\b\\+current\\b)(?!.*?\\b\\+closed\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
@@ -20175,6 +20175,11 @@
2017520175
"group": "inline@99",
2017620176
"alt": "gitlens.views.pushWithForce"
2017720177
},
20178+
{
20179+
"command": "gitlens.changeUpstream:views",
20180+
"when": "viewItem =~ /gitlens:status(-branch)?:upstream:(ahead|behind|same|missing)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
20181+
"group": "1_gitlens_actions@10"
20182+
},
2017820183
{
2017920184
"command": "gitlens.views.pull",
2018020185
"when": "viewItem =~ /gitlens:status(\\-branch)?:upstream:behind/ && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && gitlens:repos:withRemotes",
@@ -20195,6 +20200,11 @@
2019520200
"when": "viewItem =~ /gitlens:status(\\-branch)?:upstream:none/ && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && !gitlens:repos:withRemotes",
2019620201
"group": "inline@2"
2019720202
},
20203+
{
20204+
"command": "gitlens.setUpstream:views",
20205+
"when": "viewItem =~ /gitlens:status(-branch)?:upstream:none/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
20206+
"group": "1_gitlens_actions@10"
20207+
},
2019820208
{
2019920209
"command": "gitlens.views.createBranch",
2020020210
"when": "viewItem =~ /gitlens:status:upstream/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
@@ -24674,6 +24684,16 @@
2467424684
"when": "webviewItem =~ /gitlens:branch\\b(?=.*?\\b\\+(remote|tracking)\\b)(?!.*?\\b\\+closed\\b)/ && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && gitlens:repos:withRemotes",
2467524685
"group": "1_gitlens_actions@3"
2467624686
},
24687+
{
24688+
"command": "gitlens.changeUpstream:graph",
24689+
"when": "webviewItem =~ /gitlens:branch\\b(?!.*?\\b\\+remote\\b)(?!.*?\\b\\+closed\\b)(?=.*?\\b\\+tracking\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
24690+
"group": "1_gitlens_actions@10"
24691+
},
24692+
{
24693+
"command": "gitlens.setUpstream:graph",
24694+
"when": "webviewItem =~ /gitlens:branch\\b(?!.*?\\b\\+remote\\b)(?!.*?\\b\\+closed\\b)(?!.*?\\b\\+tracking\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
24695+
"group": "1_gitlens_actions@10"
24696+
},
2467724697
{
2467824698
"command": "gitlens.graph.mergeBranchInto",
2467924699
"when": "webviewItem =~ /gitlens:branch\\b(?!.*?\\b\\+current\\b)/ && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
@@ -24709,21 +24729,11 @@
2470924729
"when": "webviewItem =~ /gitlens:branch\\b/ && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
2471024730
"group": "1_gitlens_actions_2@2"
2471124731
},
24712-
{
24713-
"command": "gitlens.changeUpstream:graph",
24714-
"when": "webviewItem =~ /gitlens:branch\\b(?!.*?\\b\\+remote\\b)(?!.*?\\b\\+closed\\b)(?=.*?\\b\\+tracking\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
24715-
"group": "1_gitlens_actions_2@3"
24716-
},
2471724732
{
2471824733
"command": "gitlens.graph.deleteBranch",
2471924734
"when": "webviewItem =~ /gitlens:branch\\b(?!.*?\\b\\+(current|checkedout)\\b)/ && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
2472024735
"group": "1_gitlens_actions_2@3"
2472124736
},
24722-
{
24723-
"command": "gitlens.setUpstream:graph",
24724-
"when": "webviewItem =~ /gitlens:branch\\b(?!.*?\\b\\+remote\\b)(?!.*?\\b\\+closed\\b)(?!.*?\\b\\+tracking\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
24725-
"group": "1_gitlens_actions_2@3"
24726-
},
2472724737
{
2472824738
"command": "gitlens.graph.createBranch",
2472924739
"when": "webviewItem =~ /gitlens:branch\\b/ && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",

‎src/views/viewCommands.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -973,8 +973,8 @@ export class ViewCommands implements Disposable {
973973
@command('gitlens.changeUpstream:views')
974974
@command('gitlens.setUpstream:views')
975975
@log()
976-
private changeUpstreamBranch(node: BranchNode) {
977-
if (!node.is('branch')) return Promise.resolve();
976+
private changeUpstreamBranch(node: BranchNode | BranchTrackingStatusNode) {
977+
if (!node.isAny('branch', 'tracking-status')) return Promise.resolve();
978978

979979
return BranchActions.changeUpstream(node.repoPath, node.branch);
980980
}

0 commit comments

Comments
 (0)