@codingame/monaco-vscode-scm-service-override 7.1.0 → 8.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +2 -2
- package/vscode/src/vs/workbench/contrib/scm/browser/activity.js +62 -95
- package/vscode/src/vs/workbench/contrib/scm/browser/media/scm.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/menus.js +16 -5
- package/vscode/src/vs/workbench/contrib/scm/browser/scm.contribution.js +112 -164
- package/vscode/src/vs/workbench/contrib/scm/browser/scmHistory.js +54 -24
- package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.js +3 -7
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPane.js +598 -380
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPaneContainer.js +2 -3
- package/vscode/src/vs/workbench/contrib/scm/browser/workingSet.js +39 -43
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { localize, localize2 } from 'vscode/vscode/vs/nls';
|
|
2
2
|
import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
|
|
3
3
|
import { Extensions, registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
|
|
4
4
|
import { DirtyDiffWorkbenchController } from 'vscode/vscode/vs/workbench/contrib/scm/browser/dirtydiffDecorator';
|
|
@@ -33,7 +33,6 @@ import { getActiveElement } from 'vscode/vscode/vs/base/browser/dom';
|
|
|
33
33
|
import { SCMWorkingSetController } from './workingSet.js';
|
|
34
34
|
import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
|
|
35
35
|
|
|
36
|
-
const _moduleId = "vs/workbench/contrib/scm/browser/scm.contribution";
|
|
37
36
|
ModesRegistry.registerLanguage({
|
|
38
37
|
id: 'scminput',
|
|
39
38
|
extensions: [],
|
|
@@ -42,10 +41,10 @@ ModesRegistry.registerLanguage({
|
|
|
42
41
|
});
|
|
43
42
|
( (Registry.as(Extensions.Workbench)))
|
|
44
43
|
.registerWorkbenchContribution(DirtyDiffWorkbenchController, LifecyclePhase.Restored);
|
|
45
|
-
const sourceControlViewIcon = registerIcon('source-control-view-icon', Codicon.sourceControl, (
|
|
44
|
+
const sourceControlViewIcon = registerIcon('source-control-view-icon', Codicon.sourceControl, ( localize(2381, 'View icon of the Source Control view.')));
|
|
46
45
|
const viewContainer = ( (Registry.as(Extensions$1.ViewContainersRegistry))).registerViewContainer({
|
|
47
46
|
id: VIEWLET_ID,
|
|
48
|
-
title: (
|
|
47
|
+
title: ( localize2(2382, 'Source Control')),
|
|
49
48
|
ctorDescriptor: ( (new SyncDescriptor(SCMViewPaneContainer))),
|
|
50
49
|
storageId: 'workbench.scm.views.state',
|
|
51
50
|
icon: sourceControlViewIcon,
|
|
@@ -55,13 +54,12 @@ const viewContainer = ( (Registry.as(Extensions$1.ViewContainersRegistry))).regi
|
|
|
55
54
|
}, ViewContainerLocation.Sidebar, { doNotRegisterOpenCommand: true });
|
|
56
55
|
const viewsRegistry = ( (Registry.as(Extensions$1.ViewsRegistry)));
|
|
57
56
|
viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
|
|
58
|
-
content: (
|
|
57
|
+
content: ( localize(2383, "No source control providers registered.")),
|
|
59
58
|
when: 'default'
|
|
60
59
|
});
|
|
61
60
|
viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
|
|
62
|
-
content: (
|
|
63
|
-
|
|
64
|
-
3,
|
|
61
|
+
content: ( localize(
|
|
62
|
+
2384,
|
|
65
63
|
"None of the registered source control providers work in Restricted Mode."
|
|
66
64
|
)),
|
|
67
65
|
when: ( (ContextKeyExpr.and(
|
|
@@ -71,7 +69,7 @@ viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
|
|
|
71
69
|
)))
|
|
72
70
|
});
|
|
73
71
|
viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
|
|
74
|
-
content: `[${(
|
|
72
|
+
content: `[${( localize(2385, "Manage Workspace Trust"))}](command:${MANAGE_TRUST_COMMAND_ID})`,
|
|
75
73
|
when: ( (ContextKeyExpr.and(
|
|
76
74
|
(ContextKeyExpr.equals('scm.providerCount', 0)),
|
|
77
75
|
WorkspaceTrustContext.IsEnabled,
|
|
@@ -80,7 +78,7 @@ viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
|
|
|
80
78
|
});
|
|
81
79
|
viewsRegistry.registerViews([{
|
|
82
80
|
id: VIEW_PANE_ID,
|
|
83
|
-
name: (
|
|
81
|
+
name: ( localize2(2385, 'Source Control')),
|
|
84
82
|
ctorDescriptor: ( (new SyncDescriptor(SCMViewPane))),
|
|
85
83
|
canToggleVisibility: true,
|
|
86
84
|
canMoveView: true,
|
|
@@ -89,7 +87,7 @@ viewsRegistry.registerViews([{
|
|
|
89
87
|
containerIcon: sourceControlViewIcon,
|
|
90
88
|
openCommandActionDescriptor: {
|
|
91
89
|
id: viewContainer.id,
|
|
92
|
-
mnemonicTitle: (
|
|
90
|
+
mnemonicTitle: ( localize(2386, "Source &&Control")),
|
|
93
91
|
keybindings: {
|
|
94
92
|
primary: 0,
|
|
95
93
|
win: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyG },
|
|
@@ -101,7 +99,7 @@ viewsRegistry.registerViews([{
|
|
|
101
99
|
}], viewContainer);
|
|
102
100
|
viewsRegistry.registerViews([{
|
|
103
101
|
id: REPOSITORIES_VIEW_PANE_ID,
|
|
104
|
-
name: (
|
|
102
|
+
name: ( localize2(2387, "Source Control Repositories")),
|
|
105
103
|
ctorDescriptor: ( (new SyncDescriptor(SCMRepositoriesViewPane))),
|
|
106
104
|
canToggleVisibility: true,
|
|
107
105
|
hideByDefault: true,
|
|
@@ -122,7 +120,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
|
|
|
122
120
|
( (Registry.as(Extensions$2.Configuration))).registerConfiguration({
|
|
123
121
|
id: 'scm',
|
|
124
122
|
order: 5,
|
|
125
|
-
title: (
|
|
123
|
+
title: ( localize(2388, "Source Control")),
|
|
126
124
|
type: 'object',
|
|
127
125
|
scope: ConfigurationScope.RESOURCE,
|
|
128
126
|
properties: {
|
|
@@ -130,22 +128,21 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
|
|
|
130
128
|
type: 'string',
|
|
131
129
|
enum: ['all', 'gutter', 'overview', 'minimap', 'none'],
|
|
132
130
|
enumDescriptions: [
|
|
133
|
-
(
|
|
134
|
-
(
|
|
135
|
-
(
|
|
136
|
-
(
|
|
137
|
-
(
|
|
131
|
+
( localize(2389, "Show the diff decorations in all available locations.")),
|
|
132
|
+
( localize(2390, "Show the diff decorations only in the editor gutter.")),
|
|
133
|
+
( localize(2391, "Show the diff decorations only in the overview ruler.")),
|
|
134
|
+
( localize(2392, "Show the diff decorations only in the minimap.")),
|
|
135
|
+
( localize(2393, "Do not show the diff decorations."))
|
|
138
136
|
],
|
|
139
137
|
default: 'all',
|
|
140
|
-
description: (
|
|
138
|
+
description: ( localize(2394, "Controls diff decorations in the editor."))
|
|
141
139
|
},
|
|
142
140
|
'scm.diffDecorationsGutterWidth': {
|
|
143
141
|
type: 'number',
|
|
144
142
|
enum: [1, 2, 3, 4, 5],
|
|
145
143
|
default: 3,
|
|
146
|
-
description: (
|
|
147
|
-
|
|
148
|
-
14,
|
|
144
|
+
description: ( localize(
|
|
145
|
+
2395,
|
|
149
146
|
"Controls the width(px) of diff decorations in gutter (added & modified)."
|
|
150
147
|
))
|
|
151
148
|
},
|
|
@@ -153,12 +150,11 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
|
|
|
153
150
|
type: 'string',
|
|
154
151
|
enum: ['always', 'hover'],
|
|
155
152
|
enumDescriptions: [
|
|
156
|
-
(
|
|
157
|
-
(
|
|
153
|
+
( localize(2396, "Show the diff decorator in the gutter at all times.")),
|
|
154
|
+
( localize(2397, "Show the diff decorator in the gutter only on hover."))
|
|
158
155
|
],
|
|
159
|
-
description: (
|
|
160
|
-
|
|
161
|
-
17,
|
|
156
|
+
description: ( localize(
|
|
157
|
+
2398,
|
|
162
158
|
"Controls the visibility of the Source Control diff decorator in the gutter."
|
|
163
159
|
)),
|
|
164
160
|
default: 'always'
|
|
@@ -167,40 +163,27 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
|
|
|
167
163
|
type: 'string',
|
|
168
164
|
enum: ['diff', 'none'],
|
|
169
165
|
enumDescriptions: [
|
|
170
|
-
(
|
|
171
|
-
(
|
|
166
|
+
( localize(2399, "Show the inline diff Peek view on click.")),
|
|
167
|
+
( localize(2400, "Do nothing."))
|
|
172
168
|
],
|
|
173
|
-
description: (
|
|
174
|
-
_moduleId,
|
|
175
|
-
20,
|
|
176
|
-
"Controls the behavior of Source Control diff gutter decorations."
|
|
177
|
-
)),
|
|
169
|
+
description: ( localize(2401, "Controls the behavior of Source Control diff gutter decorations.")),
|
|
178
170
|
default: 'diff'
|
|
179
171
|
},
|
|
180
172
|
'scm.diffDecorationsGutterPattern': {
|
|
181
173
|
type: 'object',
|
|
182
|
-
description: (
|
|
183
|
-
|
|
184
|
-
21,
|
|
174
|
+
description: ( localize(
|
|
175
|
+
2402,
|
|
185
176
|
"Controls whether a pattern is used for the diff decorations in gutter."
|
|
186
177
|
)),
|
|
187
178
|
additionalProperties: false,
|
|
188
179
|
properties: {
|
|
189
180
|
'added': {
|
|
190
181
|
type: 'boolean',
|
|
191
|
-
description: (
|
|
192
|
-
_moduleId,
|
|
193
|
-
22,
|
|
194
|
-
"Use pattern for the diff decorations in gutter for added lines."
|
|
195
|
-
)),
|
|
182
|
+
description: ( localize(2403, "Use pattern for the diff decorations in gutter for added lines.")),
|
|
196
183
|
},
|
|
197
184
|
'modified': {
|
|
198
185
|
type: 'boolean',
|
|
199
|
-
description: (
|
|
200
|
-
_moduleId,
|
|
201
|
-
23,
|
|
202
|
-
"Use pattern for the diff decorations in gutter for modified lines."
|
|
203
|
-
)),
|
|
186
|
+
description: ( localize(2404, "Use pattern for the diff decorations in gutter for modified lines.")),
|
|
204
187
|
},
|
|
205
188
|
},
|
|
206
189
|
default: {
|
|
@@ -212,22 +195,20 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
|
|
|
212
195
|
type: 'string',
|
|
213
196
|
enum: ['true', 'false', 'inherit'],
|
|
214
197
|
enumDescriptions: [
|
|
215
|
-
(
|
|
216
|
-
(
|
|
217
|
-
(
|
|
198
|
+
( localize(2405, "Ignore leading and trailing whitespace.")),
|
|
199
|
+
( localize(2406, "Do not ignore leading and trailing whitespace.")),
|
|
200
|
+
( localize(2407, "Inherit from `diffEditor.ignoreTrimWhitespace`."))
|
|
218
201
|
],
|
|
219
|
-
description: (
|
|
220
|
-
|
|
221
|
-
27,
|
|
202
|
+
description: ( localize(
|
|
203
|
+
2408,
|
|
222
204
|
"Controls whether leading and trailing whitespace is ignored in Source Control diff gutter decorations."
|
|
223
205
|
)),
|
|
224
206
|
default: 'false'
|
|
225
207
|
},
|
|
226
208
|
'scm.alwaysShowActions': {
|
|
227
209
|
type: 'boolean',
|
|
228
|
-
description: (
|
|
229
|
-
|
|
230
|
-
28,
|
|
210
|
+
description: ( localize(
|
|
211
|
+
2409,
|
|
231
212
|
"Controls whether inline actions are always visible in the Source Control view."
|
|
232
213
|
)),
|
|
233
214
|
default: false
|
|
@@ -236,17 +217,12 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
|
|
|
236
217
|
type: 'string',
|
|
237
218
|
enum: ['all', 'focused', 'off'],
|
|
238
219
|
enumDescriptions: [
|
|
239
|
-
(
|
|
240
|
-
(
|
|
241
|
-
|
|
242
|
-
30,
|
|
243
|
-
"Show the count badge of the focused Source Control Provider."
|
|
244
|
-
)),
|
|
245
|
-
( localizeWithPath(_moduleId, 31, "Disable the Source Control count badge."))
|
|
220
|
+
( localize(2410, "Show the sum of all Source Control Provider count badges.")),
|
|
221
|
+
( localize(2411, "Show the count badge of the focused Source Control Provider.")),
|
|
222
|
+
( localize(2412, "Disable the Source Control count badge."))
|
|
246
223
|
],
|
|
247
|
-
description: (
|
|
248
|
-
|
|
249
|
-
32,
|
|
224
|
+
description: ( localize(
|
|
225
|
+
2413,
|
|
250
226
|
"Controls the count badge on the Source Control icon on the Activity Bar."
|
|
251
227
|
)),
|
|
252
228
|
default: 'all'
|
|
@@ -255,17 +231,12 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
|
|
|
255
231
|
type: 'string',
|
|
256
232
|
enum: ['hidden', 'auto', 'visible'],
|
|
257
233
|
enumDescriptions: [
|
|
258
|
-
(
|
|
259
|
-
(
|
|
260
|
-
|
|
261
|
-
34,
|
|
262
|
-
"Only show count badge for Source Control Provider when non-zero."
|
|
263
|
-
)),
|
|
264
|
-
( localizeWithPath(_moduleId, 35, "Show Source Control Provider count badges."))
|
|
234
|
+
( localize(2414, "Hide Source Control Provider count badges.")),
|
|
235
|
+
( localize(2415, "Only show count badge for Source Control Provider when non-zero.")),
|
|
236
|
+
( localize(2416, "Show Source Control Provider count badges."))
|
|
265
237
|
],
|
|
266
|
-
markdownDescription: (
|
|
267
|
-
|
|
268
|
-
36,
|
|
238
|
+
markdownDescription: ( localize(
|
|
239
|
+
2417,
|
|
269
240
|
"Controls the count badges on Source Control Provider headers. These headers appear in the Source Control view when there is more than one provider or when the {0} setting is enabled, and in the Source Control Repositories view.",
|
|
270
241
|
'\`#scm.alwaysShowRepositories#\`'
|
|
271
242
|
)),
|
|
@@ -275,55 +246,51 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
|
|
|
275
246
|
type: 'string',
|
|
276
247
|
enum: ['tree', 'list'],
|
|
277
248
|
enumDescriptions: [
|
|
278
|
-
(
|
|
279
|
-
(
|
|
249
|
+
( localize(2418, "Show the repository changes as a tree.")),
|
|
250
|
+
( localize(2419, "Show the repository changes as a list."))
|
|
280
251
|
],
|
|
281
|
-
description: (
|
|
252
|
+
description: ( localize(2420, "Controls the default Source Control repository view mode.")),
|
|
282
253
|
default: 'list'
|
|
283
254
|
},
|
|
284
255
|
'scm.defaultViewSortKey': {
|
|
285
256
|
type: 'string',
|
|
286
257
|
enum: ['name', 'path', 'status'],
|
|
287
258
|
enumDescriptions: [
|
|
288
|
-
(
|
|
289
|
-
(
|
|
290
|
-
(
|
|
259
|
+
( localize(2421, "Sort the repository changes by file name.")),
|
|
260
|
+
( localize(2422, "Sort the repository changes by path.")),
|
|
261
|
+
( localize(2423, "Sort the repository changes by Source Control status."))
|
|
291
262
|
],
|
|
292
|
-
description: (
|
|
293
|
-
|
|
294
|
-
43,
|
|
263
|
+
description: ( localize(
|
|
264
|
+
2424,
|
|
295
265
|
"Controls the default Source Control repository changes sort order when viewed as a list."
|
|
296
266
|
)),
|
|
297
267
|
default: 'path'
|
|
298
268
|
},
|
|
299
269
|
'scm.autoReveal': {
|
|
300
270
|
type: 'boolean',
|
|
301
|
-
description: (
|
|
302
|
-
|
|
303
|
-
44,
|
|
271
|
+
description: ( localize(
|
|
272
|
+
2425,
|
|
304
273
|
"Controls whether the Source Control view should automatically reveal and select files when opening them."
|
|
305
274
|
)),
|
|
306
275
|
default: true
|
|
307
276
|
},
|
|
308
277
|
'scm.inputFontFamily': {
|
|
309
278
|
type: 'string',
|
|
310
|
-
markdownDescription: (
|
|
311
|
-
|
|
312
|
-
45,
|
|
279
|
+
markdownDescription: ( localize(
|
|
280
|
+
2426,
|
|
313
281
|
"Controls the font for the input message. Use `default` for the workbench user interface font family, `editor` for the `#editor.fontFamily#`'s value, or a custom font family."
|
|
314
282
|
)),
|
|
315
283
|
default: 'default'
|
|
316
284
|
},
|
|
317
285
|
'scm.inputFontSize': {
|
|
318
286
|
type: 'number',
|
|
319
|
-
markdownDescription: (
|
|
287
|
+
markdownDescription: ( localize(2427, "Controls the font size for the input message in pixels.")),
|
|
320
288
|
default: 13
|
|
321
289
|
},
|
|
322
290
|
'scm.inputMaxLineCount': {
|
|
323
291
|
type: 'number',
|
|
324
|
-
markdownDescription: (
|
|
325
|
-
|
|
326
|
-
47,
|
|
292
|
+
markdownDescription: ( localize(
|
|
293
|
+
2428,
|
|
327
294
|
"Controls the maximum number of lines that the input will auto-grow to."
|
|
328
295
|
)),
|
|
329
296
|
minimum: 1,
|
|
@@ -332,9 +299,8 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
|
|
|
332
299
|
},
|
|
333
300
|
'scm.inputMinLineCount': {
|
|
334
301
|
type: 'number',
|
|
335
|
-
markdownDescription: (
|
|
336
|
-
|
|
337
|
-
48,
|
|
302
|
+
markdownDescription: ( localize(
|
|
303
|
+
2429,
|
|
338
304
|
"Controls the minimum number of lines that the input will auto-grow from."
|
|
339
305
|
)),
|
|
340
306
|
minimum: 1,
|
|
@@ -343,9 +309,8 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
|
|
|
343
309
|
},
|
|
344
310
|
'scm.alwaysShowRepositories': {
|
|
345
311
|
type: 'boolean',
|
|
346
|
-
markdownDescription: (
|
|
347
|
-
|
|
348
|
-
49,
|
|
312
|
+
markdownDescription: ( localize(
|
|
313
|
+
2430,
|
|
349
314
|
"Controls whether repositories should always be visible in the Source Control view."
|
|
350
315
|
)),
|
|
351
316
|
default: false
|
|
@@ -354,52 +319,45 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
|
|
|
354
319
|
type: 'string',
|
|
355
320
|
enum: ['discovery time', 'name', 'path'],
|
|
356
321
|
enumDescriptions: [
|
|
357
|
-
(
|
|
358
|
-
|
|
359
|
-
50,
|
|
322
|
+
( localize(
|
|
323
|
+
2431,
|
|
360
324
|
"Repositories in the Source Control Repositories view are sorted by discovery time. Repositories in the Source Control view are sorted in the order that they were selected."
|
|
361
325
|
)),
|
|
362
|
-
(
|
|
363
|
-
|
|
364
|
-
51,
|
|
326
|
+
( localize(
|
|
327
|
+
2432,
|
|
365
328
|
"Repositories in the Source Control Repositories and Source Control views are sorted by repository name."
|
|
366
329
|
)),
|
|
367
|
-
(
|
|
368
|
-
|
|
369
|
-
52,
|
|
330
|
+
( localize(
|
|
331
|
+
2433,
|
|
370
332
|
"Repositories in the Source Control Repositories and Source Control views are sorted by repository path."
|
|
371
333
|
))
|
|
372
334
|
],
|
|
373
|
-
description: (
|
|
374
|
-
|
|
375
|
-
53,
|
|
335
|
+
description: ( localize(
|
|
336
|
+
2434,
|
|
376
337
|
"Controls the sort order of the repositories in the source control repositories view."
|
|
377
338
|
)),
|
|
378
339
|
default: 'discovery time'
|
|
379
340
|
},
|
|
380
341
|
'scm.repositories.visible': {
|
|
381
342
|
type: 'number',
|
|
382
|
-
description: (
|
|
383
|
-
|
|
384
|
-
54,
|
|
343
|
+
description: ( localize(
|
|
344
|
+
2435,
|
|
385
345
|
"Controls how many repositories are visible in the Source Control Repositories section. Set to 0, to be able to manually resize the view."
|
|
386
346
|
)),
|
|
387
347
|
default: 10
|
|
388
348
|
},
|
|
389
349
|
'scm.showActionButton': {
|
|
390
350
|
type: 'boolean',
|
|
391
|
-
markdownDescription: (
|
|
392
|
-
|
|
393
|
-
55,
|
|
351
|
+
markdownDescription: ( localize(
|
|
352
|
+
2436,
|
|
394
353
|
"Controls whether an action button can be shown in the Source Control view."
|
|
395
354
|
)),
|
|
396
355
|
default: true
|
|
397
356
|
},
|
|
398
357
|
'scm.showInputActionButton': {
|
|
399
358
|
type: 'boolean',
|
|
400
|
-
markdownDescription: (
|
|
401
|
-
|
|
402
|
-
56,
|
|
359
|
+
markdownDescription: ( localize(
|
|
360
|
+
2437,
|
|
403
361
|
"Controls whether an action button can be shown in the Source Control input."
|
|
404
362
|
)),
|
|
405
363
|
default: true
|
|
@@ -408,17 +366,15 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
|
|
|
408
366
|
type: 'string',
|
|
409
367
|
enum: ['always', 'never', 'auto'],
|
|
410
368
|
enumDescriptions: [
|
|
411
|
-
(
|
|
412
|
-
(
|
|
413
|
-
(
|
|
414
|
-
|
|
415
|
-
59,
|
|
369
|
+
( localize(2438, "Always show incoming changes in the Source Control view.")),
|
|
370
|
+
( localize(2439, "Never show incoming changes in the Source Control view.")),
|
|
371
|
+
( localize(
|
|
372
|
+
2440,
|
|
416
373
|
"Only show incoming changes in the Source Control view when any exist."
|
|
417
374
|
)),
|
|
418
375
|
],
|
|
419
|
-
description: (
|
|
420
|
-
|
|
421
|
-
60,
|
|
376
|
+
description: ( localize(
|
|
377
|
+
2441,
|
|
422
378
|
"Controls whether incoming changes are shown in the Source Control view."
|
|
423
379
|
)),
|
|
424
380
|
default: 'auto'
|
|
@@ -427,35 +383,31 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
|
|
|
427
383
|
type: 'string',
|
|
428
384
|
enum: ['always', 'never', 'auto'],
|
|
429
385
|
enumDescriptions: [
|
|
430
|
-
(
|
|
431
|
-
(
|
|
432
|
-
(
|
|
433
|
-
|
|
434
|
-
63,
|
|
386
|
+
( localize(2442, "Always show outgoing changes in the Source Control view.")),
|
|
387
|
+
( localize(2443, "Never show outgoing changes in the Source Control view.")),
|
|
388
|
+
( localize(
|
|
389
|
+
2444,
|
|
435
390
|
"Only show outgoing changes in the Source Control view when any exist."
|
|
436
391
|
)),
|
|
437
392
|
],
|
|
438
|
-
description: (
|
|
439
|
-
|
|
440
|
-
64,
|
|
393
|
+
description: ( localize(
|
|
394
|
+
2445,
|
|
441
395
|
"Controls whether outgoing changes are shown in the Source Control view."
|
|
442
396
|
)),
|
|
443
397
|
default: 'auto'
|
|
444
398
|
},
|
|
445
399
|
'scm.showChangesSummary': {
|
|
446
400
|
type: 'boolean',
|
|
447
|
-
description: (
|
|
448
|
-
|
|
449
|
-
65,
|
|
401
|
+
description: ( localize(
|
|
402
|
+
2446,
|
|
450
403
|
"Controls whether the All Changes entry is shown for incoming/outgoing changes in the Source Control view."
|
|
451
404
|
)),
|
|
452
405
|
default: true
|
|
453
406
|
},
|
|
454
407
|
'scm.workingSets.enabled': {
|
|
455
408
|
type: 'boolean',
|
|
456
|
-
description: (
|
|
457
|
-
|
|
458
|
-
66,
|
|
409
|
+
description: ( localize(
|
|
410
|
+
2447,
|
|
459
411
|
"Controls whether to store editor working sets when switching between source control history item groups."
|
|
460
412
|
)),
|
|
461
413
|
default: false
|
|
@@ -464,38 +416,34 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
|
|
|
464
416
|
type: 'string',
|
|
465
417
|
enum: ['empty', 'current'],
|
|
466
418
|
enumDescriptions: [
|
|
467
|
-
(
|
|
468
|
-
|
|
469
|
-
67,
|
|
419
|
+
( localize(
|
|
420
|
+
2448,
|
|
470
421
|
"Use an empty working set when switching to a source control history item group that does not have a working set."
|
|
471
422
|
)),
|
|
472
|
-
(
|
|
473
|
-
|
|
474
|
-
68,
|
|
423
|
+
( localize(
|
|
424
|
+
2449,
|
|
475
425
|
"Use the current working set when switching to a source control history item group that does not have a working set."
|
|
476
426
|
))
|
|
477
427
|
],
|
|
478
|
-
description: (
|
|
479
|
-
|
|
480
|
-
69,
|
|
428
|
+
description: ( localize(
|
|
429
|
+
2450,
|
|
481
430
|
"Controls the default working set to use when switching to a source control history item group that does not have a working set."
|
|
482
431
|
)),
|
|
483
432
|
default: 'current'
|
|
484
433
|
},
|
|
485
|
-
'scm.
|
|
434
|
+
'scm.showHistoryGraph': {
|
|
486
435
|
type: 'boolean',
|
|
487
|
-
description: (
|
|
488
|
-
|
|
489
|
-
|
|
490
|
-
"Controls whether to show the history graph instead of incoming/outgoing changes in the Source Control view."
|
|
436
|
+
description: ( localize(
|
|
437
|
+
2451,
|
|
438
|
+
"Controls whether to render incoming/outgoing changes using a graph in the Source Control view."
|
|
491
439
|
)),
|
|
492
|
-
default:
|
|
440
|
+
default: true
|
|
493
441
|
}
|
|
494
442
|
}
|
|
495
443
|
});
|
|
496
444
|
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
497
445
|
id: 'scm.acceptInput',
|
|
498
|
-
metadata: { description: (
|
|
446
|
+
metadata: { description: ( localize(2452, "Source Control: Accept Input")), args: [] },
|
|
499
447
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
500
448
|
when: ( (ContextKeyExpr.has('scmRepository'))),
|
|
501
449
|
primary: KeyMod.CtrlCmd | KeyCode.Enter,
|
|
@@ -535,7 +483,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
535
483
|
}
|
|
536
484
|
});
|
|
537
485
|
const viewNextCommitCommand = {
|
|
538
|
-
description: { description: (
|
|
486
|
+
description: { description: ( localize(2453, "Source Control: View Next Commit")), args: [] },
|
|
539
487
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
540
488
|
handler: (accessor) => {
|
|
541
489
|
const contextKeyService = accessor.get(IContextKeyService);
|
|
@@ -547,7 +495,7 @@ const viewNextCommitCommand = {
|
|
|
547
495
|
}
|
|
548
496
|
};
|
|
549
497
|
const viewPreviousCommitCommand = {
|
|
550
|
-
description: { description: (
|
|
498
|
+
description: { description: ( localize(2454, "Source Control: View Previous Commit")), args: [] },
|
|
551
499
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
552
500
|
handler: (accessor) => {
|
|
553
501
|
const contextKeyService = accessor.get(IContextKeyService);
|
|
@@ -608,7 +556,7 @@ MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
|
|
|
608
556
|
group: '100_end',
|
|
609
557
|
command: {
|
|
610
558
|
id: 'scm.openInTerminal',
|
|
611
|
-
title: (
|
|
559
|
+
title: ( localize(2455, "Open in External Terminal"))
|
|
612
560
|
},
|
|
613
561
|
when: ( (ContextKeyExpr.and(
|
|
614
562
|
(ContextKeyExpr.equals('scmProviderHasRootUri', true)),
|
|
@@ -622,7 +570,7 @@ MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
|
|
|
622
570
|
group: '100_end',
|
|
623
571
|
command: {
|
|
624
572
|
id: 'scm.openInIntegratedTerminal',
|
|
625
|
-
title: (
|
|
573
|
+
title: ( localize(2456, "Open in Integrated Terminal"))
|
|
626
574
|
},
|
|
627
575
|
when: ( (ContextKeyExpr.and(
|
|
628
576
|
(ContextKeyExpr.equals('scmProviderHasRootUri', true)),
|