|
6412 | 6412 | ] |
6413 | 6413 | } |
6414 | 6414 | }, |
6415 | | - "gitlens.views.abortPausedOperation": { |
6416 | | - "label": "Abort", |
6417 | | - "icon": "$(circle-slash)", |
6418 | | - "menus": { |
6419 | | - "view/item/context": [ |
6420 | | - { |
6421 | | - "when": "viewItem =~ /gitlens:paused-operation\\b/ && !listMultiSelection", |
6422 | | - "group": "inline", |
6423 | | - "order": 3 |
6424 | | - }, |
6425 | | - { |
6426 | | - "when": "viewItem =~ /gitlens:paused-operation\\b/ && !listMultiSelection", |
6427 | | - "group": "1_gitlens_actions", |
6428 | | - "order": 3 |
6429 | | - } |
6430 | | - ] |
6431 | | - } |
6432 | | - }, |
6433 | 6415 | "gitlens.views.addAuthor": { |
6434 | 6416 | "label": "Add as Co-author", |
6435 | 6417 | "icon": "$(person-add)", |
|
8253 | 8235 | ] |
8254 | 8236 | } |
8255 | 8237 | }, |
8256 | | - "gitlens.views.continuePausedOperation": { |
8257 | | - "label": "Continue", |
8258 | | - "icon": "$(debug-continue)", |
8259 | | - "menus": { |
8260 | | - "view/item/context": [ |
8261 | | - { |
8262 | | - "when": "viewItem =~ /gitlens:paused-operation:(cherry-pick|merge|rebase)\\b/ && !listMultiSelection", |
8263 | | - "group": "inline", |
8264 | | - "order": 1 |
8265 | | - }, |
8266 | | - { |
8267 | | - "when": "viewItem =~ /gitlens:paused-operation:(cherry-pick|merge|rebase)\\b/ && !listMultiSelection", |
8268 | | - "group": "1_gitlens_actions", |
8269 | | - "order": 1 |
8270 | | - } |
8271 | | - ] |
8272 | | - } |
8273 | | - }, |
8274 | 8238 | "gitlens.views.contributors.attach": { |
8275 | 8239 | "label": "Group into GitLens View", |
8276 | 8240 | "icon": "$(close)", |
|
11253 | 11217 | ] |
11254 | 11218 | } |
11255 | 11219 | }, |
11256 | | - "gitlens.views.openPausedOperationInRebaseEditor": { |
11257 | | - "label": "Open in Rebase Editor", |
11258 | | - "icon": "$(edit)", |
11259 | | - "menus": { |
11260 | | - "view/item/context": [ |
11261 | | - { |
11262 | | - "when": "viewItem =~ /gitlens:paused-operation:rebase\\b/ && !listMultiSelection", |
11263 | | - "group": "inline", |
11264 | | - "order": 4 |
11265 | | - }, |
11266 | | - { |
11267 | | - "when": "viewItem =~ /gitlens:paused-operation:rebase\\b/ && !listMultiSelection", |
11268 | | - "group": "2_gitlens", |
11269 | | - "order": 1 |
11270 | | - } |
11271 | | - ] |
11272 | | - } |
11273 | | - }, |
11274 | 11220 | "gitlens.views.openPreviousChangesWithWorking": { |
11275 | 11221 | "label": "Open Previous Changes with Working File", |
11276 | 11222 | "menus": { |
|
11505 | 11451 | ] |
11506 | 11452 | } |
11507 | 11453 | }, |
| 11454 | + "gitlens.views.pausedOperation.abort": { |
| 11455 | + "label": "Abort", |
| 11456 | + "icon": "$(circle-slash)", |
| 11457 | + "menus": { |
| 11458 | + "view/item/context": [ |
| 11459 | + { |
| 11460 | + "when": "viewItem =~ /gitlens:paused-operation\\b/ && !listMultiSelection", |
| 11461 | + "group": "inline", |
| 11462 | + "order": 3 |
| 11463 | + }, |
| 11464 | + { |
| 11465 | + "when": "viewItem =~ /gitlens:paused-operation\\b/ && !listMultiSelection", |
| 11466 | + "group": "1_gitlens_actions", |
| 11467 | + "order": 3 |
| 11468 | + } |
| 11469 | + ] |
| 11470 | + } |
| 11471 | + }, |
| 11472 | + "gitlens.views.pausedOperation.continue": { |
| 11473 | + "label": "Continue", |
| 11474 | + "icon": "$(debug-continue)", |
| 11475 | + "menus": { |
| 11476 | + "view/item/context": [ |
| 11477 | + { |
| 11478 | + "when": "viewItem =~ /gitlens:paused-operation:(cherry-pick|merge|rebase)\\b/ && !listMultiSelection", |
| 11479 | + "group": "inline", |
| 11480 | + "order": 1 |
| 11481 | + }, |
| 11482 | + { |
| 11483 | + "when": "viewItem =~ /gitlens:paused-operation:(cherry-pick|merge|rebase)\\b/ && !listMultiSelection", |
| 11484 | + "group": "1_gitlens_actions", |
| 11485 | + "order": 1 |
| 11486 | + } |
| 11487 | + ] |
| 11488 | + } |
| 11489 | + }, |
| 11490 | + "gitlens.views.pausedOperation.open": { |
| 11491 | + "label": "Open in Rebase Editor", |
| 11492 | + "icon": "$(edit)", |
| 11493 | + "menus": { |
| 11494 | + "view/item/context": [ |
| 11495 | + { |
| 11496 | + "when": "viewItem =~ /gitlens:paused-operation:rebase\\b/ && !listMultiSelection", |
| 11497 | + "group": "inline", |
| 11498 | + "order": -1 |
| 11499 | + }, |
| 11500 | + { |
| 11501 | + "when": "viewItem =~ /gitlens:paused-operation:rebase\\b/ && !listMultiSelection", |
| 11502 | + "group": "2_gitlens", |
| 11503 | + "order": 1 |
| 11504 | + } |
| 11505 | + ] |
| 11506 | + } |
| 11507 | + }, |
| 11508 | + "gitlens.views.pausedOperation.skip": { |
| 11509 | + "label": "Skip", |
| 11510 | + "icon": "$(debug-step-over)", |
| 11511 | + "menus": { |
| 11512 | + "view/item/context": [ |
| 11513 | + { |
| 11514 | + "when": "viewItem =~ /gitlens:paused-operation:(cherry-pick|rebase|revert)\\b/ && !listMultiSelection", |
| 11515 | + "group": "inline", |
| 11516 | + "order": 2 |
| 11517 | + }, |
| 11518 | + { |
| 11519 | + "when": "viewItem =~ /gitlens:paused-operation:(cherry-pick|rebase|revert)\\b/ && !listMultiSelection", |
| 11520 | + "group": "1_gitlens_actions", |
| 11521 | + "order": 2 |
| 11522 | + } |
| 11523 | + ] |
| 11524 | + } |
| 11525 | + }, |
11508 | 11526 | "gitlens.views.pruneRemote": { |
11509 | 11527 | "label": "Prune", |
11510 | 11528 | "enablement": "!operationInProgress", |
|
15728 | 15746 | ] |
15729 | 15747 | } |
15730 | 15748 | }, |
15731 | | - "gitlens.views.skipPausedOperation": { |
15732 | | - "label": "Skip", |
15733 | | - "icon": "$(debug-step-over)", |
15734 | | - "menus": { |
15735 | | - "view/item/context": [ |
15736 | | - { |
15737 | | - "when": "viewItem =~ /gitlens:paused-operation:(cherry-pick|rebase|revert)\\b/ && !listMultiSelection", |
15738 | | - "group": "inline", |
15739 | | - "order": 2 |
15740 | | - }, |
15741 | | - { |
15742 | | - "when": "viewItem =~ /gitlens:paused-operation:(cherry-pick|rebase|revert)\\b/ && !listMultiSelection", |
15743 | | - "group": "1_gitlens_actions", |
15744 | | - "order": 2 |
15745 | | - } |
15746 | | - ] |
15747 | | - } |
15748 | | - }, |
15749 | 15749 | "gitlens.views.stageDirectory": { |
15750 | 15750 | "label": "Stage All Changes", |
15751 | 15751 | "icon": "$(add)", |
|
0 commit comments