@codingame/monaco-vscode-scm-service-override 8.0.2 → 8.0.3
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 +4 -4
- package/vscode/src/vs/workbench/contrib/scm/browser/menus.js +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/scm.contribution.js +77 -77
- package/vscode/src/vs/workbench/contrib/scm/browser/scmHistory.js +7 -7
- package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.js +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPane.js +58 -58
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPaneContainer.js +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codingame/monaco-vscode-scm-service-override",
|
|
3
|
-
"version": "8.0.
|
|
3
|
+
"version": "8.0.3",
|
|
4
4
|
"keywords": [],
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "CodinGame",
|
|
@@ -26,6 +26,6 @@
|
|
|
26
26
|
}
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"vscode": "npm:@codingame/monaco-vscode-api@8.0.
|
|
29
|
+
"vscode": "npm:@codingame/monaco-vscode-api@8.0.3"
|
|
30
30
|
}
|
|
31
31
|
}
|
|
@@ -113,7 +113,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
|
|
|
113
113
|
if (count === 0) {
|
|
114
114
|
return;
|
|
115
115
|
}
|
|
116
|
-
const badge = ( (new NumberBadge(count, num => ( localize(
|
|
116
|
+
const badge = ( (new NumberBadge(count, num => ( localize(6641, '{0} pending changes', num)))));
|
|
117
117
|
store.add(this.activityService.showViewActivity(VIEW_PANE_ID, { badge }));
|
|
118
118
|
}
|
|
119
119
|
_updateStatusBar(repository, commands, store) {
|
|
@@ -139,7 +139,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
|
|
|
139
139
|
repoAgnosticActionName = '';
|
|
140
140
|
}
|
|
141
141
|
const statusbarEntry = {
|
|
142
|
-
name: ( localize(
|
|
142
|
+
name: ( localize(6642, "Source Control")) + (repoAgnosticActionName ? ` ${repoAgnosticActionName}` : ''),
|
|
143
143
|
text: command.title,
|
|
144
144
|
ariaLabel: tooltip,
|
|
145
145
|
tooltip,
|
|
@@ -172,8 +172,8 @@ let SCMActiveResourceContextKeyController = class SCMActiveResourceContextKeyCon
|
|
|
172
172
|
this.uriIdentityService = uriIdentityService;
|
|
173
173
|
this._repositories = observableFromEvent(this, Event.any(this.scmService.onDidAddRepository, this.scmService.onDidRemoveRepository), () => this.scmService.repositories);
|
|
174
174
|
this._onDidRepositoryChange = ( (new Emitter()));
|
|
175
|
-
const activeResourceHasChangesContextKey = ( (new RawContextKey('scmActiveResourceHasChanges', false, ( localize(
|
|
176
|
-
const activeResourceRepositoryContextKey = ( (new RawContextKey('scmActiveResourceRepository', undefined, ( localize(
|
|
175
|
+
const activeResourceHasChangesContextKey = ( (new RawContextKey('scmActiveResourceHasChanges', false, ( localize(6643, "Whether the active resource has changes")))));
|
|
176
|
+
const activeResourceRepositoryContextKey = ( (new RawContextKey('scmActiveResourceRepository', undefined, ( localize(6644, "The active resource's repository")))));
|
|
177
177
|
this._store.add(autorunWithStore((reader, store) => {
|
|
178
178
|
for (const repository of this._repositories.read(reader)) {
|
|
179
179
|
store.add(Event.runAndSubscribe(repository.provider.onDidChangeResources, () => {
|
|
@@ -284,7 +284,7 @@ SCMMenus = ( (__decorate([
|
|
|
284
284
|
( (__param(1, IInstantiationService)))
|
|
285
285
|
], SCMMenus)));
|
|
286
286
|
MenuRegistry.appendMenuItem(MenuId.SCMResourceContext, {
|
|
287
|
-
title: ( localize(
|
|
287
|
+
title: ( localize(6617, "Share")),
|
|
288
288
|
submenu: MenuId.SCMResourceContextShare,
|
|
289
289
|
group: '45_share',
|
|
290
290
|
order: 3,
|
|
@@ -41,10 +41,10 @@ ModesRegistry.registerLanguage({
|
|
|
41
41
|
});
|
|
42
42
|
( (Registry.as(Extensions.Workbench)))
|
|
43
43
|
.registerWorkbenchContribution(DirtyDiffWorkbenchController, LifecyclePhase.Restored);
|
|
44
|
-
const sourceControlViewIcon = registerIcon('source-control-view-icon', Codicon.sourceControl, ( localize(
|
|
44
|
+
const sourceControlViewIcon = registerIcon('source-control-view-icon', Codicon.sourceControl, ( localize(2907, 'View icon of the Source Control view.')));
|
|
45
45
|
const viewContainer = ( (Registry.as(Extensions$1.ViewContainersRegistry))).registerViewContainer({
|
|
46
46
|
id: VIEWLET_ID,
|
|
47
|
-
title: ( localize2(
|
|
47
|
+
title: ( localize2(2908, 'Source Control')),
|
|
48
48
|
ctorDescriptor: ( (new SyncDescriptor(SCMViewPaneContainer))),
|
|
49
49
|
storageId: 'workbench.scm.views.state',
|
|
50
50
|
icon: sourceControlViewIcon,
|
|
@@ -54,12 +54,12 @@ const viewContainer = ( (Registry.as(Extensions$1.ViewContainersRegistry))).regi
|
|
|
54
54
|
}, ViewContainerLocation.Sidebar, { doNotRegisterOpenCommand: true });
|
|
55
55
|
const viewsRegistry = ( (Registry.as(Extensions$1.ViewsRegistry)));
|
|
56
56
|
viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
|
|
57
|
-
content: ( localize(
|
|
57
|
+
content: ( localize(2909, "No source control providers registered.")),
|
|
58
58
|
when: 'default'
|
|
59
59
|
});
|
|
60
60
|
viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
|
|
61
61
|
content: ( localize(
|
|
62
|
-
|
|
62
|
+
2910,
|
|
63
63
|
"None of the registered source control providers work in Restricted Mode."
|
|
64
64
|
)),
|
|
65
65
|
when: ( (ContextKeyExpr.and(
|
|
@@ -69,7 +69,7 @@ viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
|
|
|
69
69
|
)))
|
|
70
70
|
});
|
|
71
71
|
viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
|
|
72
|
-
content: `[${( localize(
|
|
72
|
+
content: `[${( localize(2911, "Manage Workspace Trust"))}](command:${MANAGE_TRUST_COMMAND_ID})`,
|
|
73
73
|
when: ( (ContextKeyExpr.and(
|
|
74
74
|
(ContextKeyExpr.equals('scm.providerCount', 0)),
|
|
75
75
|
WorkspaceTrustContext.IsEnabled,
|
|
@@ -78,7 +78,7 @@ viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
|
|
|
78
78
|
});
|
|
79
79
|
viewsRegistry.registerViews([{
|
|
80
80
|
id: VIEW_PANE_ID,
|
|
81
|
-
name: ( localize2(
|
|
81
|
+
name: ( localize2(2908, 'Source Control')),
|
|
82
82
|
ctorDescriptor: ( (new SyncDescriptor(SCMViewPane))),
|
|
83
83
|
canToggleVisibility: true,
|
|
84
84
|
canMoveView: true,
|
|
@@ -87,7 +87,7 @@ viewsRegistry.registerViews([{
|
|
|
87
87
|
containerIcon: sourceControlViewIcon,
|
|
88
88
|
openCommandActionDescriptor: {
|
|
89
89
|
id: viewContainer.id,
|
|
90
|
-
mnemonicTitle: ( localize(
|
|
90
|
+
mnemonicTitle: ( localize(2912, "Source &&Control")),
|
|
91
91
|
keybindings: {
|
|
92
92
|
primary: 0,
|
|
93
93
|
win: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyG },
|
|
@@ -99,7 +99,7 @@ viewsRegistry.registerViews([{
|
|
|
99
99
|
}], viewContainer);
|
|
100
100
|
viewsRegistry.registerViews([{
|
|
101
101
|
id: REPOSITORIES_VIEW_PANE_ID,
|
|
102
|
-
name: ( localize2(
|
|
102
|
+
name: ( localize2(2913, "Source Control Repositories")),
|
|
103
103
|
ctorDescriptor: ( (new SyncDescriptor(SCMRepositoriesViewPane))),
|
|
104
104
|
canToggleVisibility: true,
|
|
105
105
|
hideByDefault: true,
|
|
@@ -120,7 +120,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
|
|
|
120
120
|
( (Registry.as(Extensions$2.Configuration))).registerConfiguration({
|
|
121
121
|
id: 'scm',
|
|
122
122
|
order: 5,
|
|
123
|
-
title: ( localize(
|
|
123
|
+
title: ( localize(2914, "Source Control")),
|
|
124
124
|
type: 'object',
|
|
125
125
|
scope: ConfigurationScope.RESOURCE,
|
|
126
126
|
properties: {
|
|
@@ -128,21 +128,21 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
|
|
|
128
128
|
type: 'string',
|
|
129
129
|
enum: ['all', 'gutter', 'overview', 'minimap', 'none'],
|
|
130
130
|
enumDescriptions: [
|
|
131
|
-
( localize(
|
|
132
|
-
( localize(
|
|
133
|
-
( localize(
|
|
134
|
-
( localize(
|
|
135
|
-
( localize(
|
|
131
|
+
( localize(2915, "Show the diff decorations in all available locations.")),
|
|
132
|
+
( localize(2916, "Show the diff decorations only in the editor gutter.")),
|
|
133
|
+
( localize(2917, "Show the diff decorations only in the overview ruler.")),
|
|
134
|
+
( localize(2918, "Show the diff decorations only in the minimap.")),
|
|
135
|
+
( localize(2919, "Do not show the diff decorations."))
|
|
136
136
|
],
|
|
137
137
|
default: 'all',
|
|
138
|
-
description: ( localize(
|
|
138
|
+
description: ( localize(2920, "Controls diff decorations in the editor."))
|
|
139
139
|
},
|
|
140
140
|
'scm.diffDecorationsGutterWidth': {
|
|
141
141
|
type: 'number',
|
|
142
142
|
enum: [1, 2, 3, 4, 5],
|
|
143
143
|
default: 3,
|
|
144
144
|
description: ( localize(
|
|
145
|
-
|
|
145
|
+
2921,
|
|
146
146
|
"Controls the width(px) of diff decorations in gutter (added & modified)."
|
|
147
147
|
))
|
|
148
148
|
},
|
|
@@ -150,11 +150,11 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
|
|
|
150
150
|
type: 'string',
|
|
151
151
|
enum: ['always', 'hover'],
|
|
152
152
|
enumDescriptions: [
|
|
153
|
-
( localize(
|
|
154
|
-
( localize(
|
|
153
|
+
( localize(2922, "Show the diff decorator in the gutter at all times.")),
|
|
154
|
+
( localize(2923, "Show the diff decorator in the gutter only on hover."))
|
|
155
155
|
],
|
|
156
156
|
description: ( localize(
|
|
157
|
-
|
|
157
|
+
2924,
|
|
158
158
|
"Controls the visibility of the Source Control diff decorator in the gutter."
|
|
159
159
|
)),
|
|
160
160
|
default: 'always'
|
|
@@ -163,27 +163,27 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
|
|
|
163
163
|
type: 'string',
|
|
164
164
|
enum: ['diff', 'none'],
|
|
165
165
|
enumDescriptions: [
|
|
166
|
-
( localize(
|
|
167
|
-
( localize(
|
|
166
|
+
( localize(2925, "Show the inline diff Peek view on click.")),
|
|
167
|
+
( localize(2926, "Do nothing."))
|
|
168
168
|
],
|
|
169
|
-
description: ( localize(
|
|
169
|
+
description: ( localize(2927, "Controls the behavior of Source Control diff gutter decorations.")),
|
|
170
170
|
default: 'diff'
|
|
171
171
|
},
|
|
172
172
|
'scm.diffDecorationsGutterPattern': {
|
|
173
173
|
type: 'object',
|
|
174
174
|
description: ( localize(
|
|
175
|
-
|
|
175
|
+
2928,
|
|
176
176
|
"Controls whether a pattern is used for the diff decorations in gutter."
|
|
177
177
|
)),
|
|
178
178
|
additionalProperties: false,
|
|
179
179
|
properties: {
|
|
180
180
|
'added': {
|
|
181
181
|
type: 'boolean',
|
|
182
|
-
description: ( localize(
|
|
182
|
+
description: ( localize(2929, "Use pattern for the diff decorations in gutter for added lines.")),
|
|
183
183
|
},
|
|
184
184
|
'modified': {
|
|
185
185
|
type: 'boolean',
|
|
186
|
-
description: ( localize(
|
|
186
|
+
description: ( localize(2930, "Use pattern for the diff decorations in gutter for modified lines.")),
|
|
187
187
|
},
|
|
188
188
|
},
|
|
189
189
|
default: {
|
|
@@ -195,12 +195,12 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
|
|
|
195
195
|
type: 'string',
|
|
196
196
|
enum: ['true', 'false', 'inherit'],
|
|
197
197
|
enumDescriptions: [
|
|
198
|
-
( localize(
|
|
199
|
-
( localize(
|
|
200
|
-
( localize(
|
|
198
|
+
( localize(2931, "Ignore leading and trailing whitespace.")),
|
|
199
|
+
( localize(2932, "Do not ignore leading and trailing whitespace.")),
|
|
200
|
+
( localize(2933, "Inherit from `diffEditor.ignoreTrimWhitespace`."))
|
|
201
201
|
],
|
|
202
202
|
description: ( localize(
|
|
203
|
-
|
|
203
|
+
2934,
|
|
204
204
|
"Controls whether leading and trailing whitespace is ignored in Source Control diff gutter decorations."
|
|
205
205
|
)),
|
|
206
206
|
default: 'false'
|
|
@@ -208,7 +208,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
|
|
|
208
208
|
'scm.alwaysShowActions': {
|
|
209
209
|
type: 'boolean',
|
|
210
210
|
description: ( localize(
|
|
211
|
-
|
|
211
|
+
2935,
|
|
212
212
|
"Controls whether inline actions are always visible in the Source Control view."
|
|
213
213
|
)),
|
|
214
214
|
default: false
|
|
@@ -217,12 +217,12 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
|
|
|
217
217
|
type: 'string',
|
|
218
218
|
enum: ['all', 'focused', 'off'],
|
|
219
219
|
enumDescriptions: [
|
|
220
|
-
( localize(
|
|
221
|
-
( localize(
|
|
222
|
-
( localize(
|
|
220
|
+
( localize(2936, "Show the sum of all Source Control Provider count badges.")),
|
|
221
|
+
( localize(2937, "Show the count badge of the focused Source Control Provider.")),
|
|
222
|
+
( localize(2938, "Disable the Source Control count badge."))
|
|
223
223
|
],
|
|
224
224
|
description: ( localize(
|
|
225
|
-
|
|
225
|
+
2939,
|
|
226
226
|
"Controls the count badge on the Source Control icon on the Activity Bar."
|
|
227
227
|
)),
|
|
228
228
|
default: 'all'
|
|
@@ -231,12 +231,12 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
|
|
|
231
231
|
type: 'string',
|
|
232
232
|
enum: ['hidden', 'auto', 'visible'],
|
|
233
233
|
enumDescriptions: [
|
|
234
|
-
( localize(
|
|
235
|
-
( localize(
|
|
236
|
-
( localize(
|
|
234
|
+
( localize(2940, "Hide Source Control Provider count badges.")),
|
|
235
|
+
( localize(2941, "Only show count badge for Source Control Provider when non-zero.")),
|
|
236
|
+
( localize(2942, "Show Source Control Provider count badges."))
|
|
237
237
|
],
|
|
238
238
|
markdownDescription: ( localize(
|
|
239
|
-
|
|
239
|
+
2943,
|
|
240
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.",
|
|
241
241
|
'\`#scm.alwaysShowRepositories#\`'
|
|
242
242
|
)),
|
|
@@ -246,22 +246,22 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
|
|
|
246
246
|
type: 'string',
|
|
247
247
|
enum: ['tree', 'list'],
|
|
248
248
|
enumDescriptions: [
|
|
249
|
-
( localize(
|
|
250
|
-
( localize(
|
|
249
|
+
( localize(2944, "Show the repository changes as a tree.")),
|
|
250
|
+
( localize(2945, "Show the repository changes as a list."))
|
|
251
251
|
],
|
|
252
|
-
description: ( localize(
|
|
252
|
+
description: ( localize(2946, "Controls the default Source Control repository view mode.")),
|
|
253
253
|
default: 'list'
|
|
254
254
|
},
|
|
255
255
|
'scm.defaultViewSortKey': {
|
|
256
256
|
type: 'string',
|
|
257
257
|
enum: ['name', 'path', 'status'],
|
|
258
258
|
enumDescriptions: [
|
|
259
|
-
( localize(
|
|
260
|
-
( localize(
|
|
261
|
-
( localize(
|
|
259
|
+
( localize(2947, "Sort the repository changes by file name.")),
|
|
260
|
+
( localize(2948, "Sort the repository changes by path.")),
|
|
261
|
+
( localize(2949, "Sort the repository changes by Source Control status."))
|
|
262
262
|
],
|
|
263
263
|
description: ( localize(
|
|
264
|
-
|
|
264
|
+
2950,
|
|
265
265
|
"Controls the default Source Control repository changes sort order when viewed as a list."
|
|
266
266
|
)),
|
|
267
267
|
default: 'path'
|
|
@@ -269,7 +269,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
|
|
|
269
269
|
'scm.autoReveal': {
|
|
270
270
|
type: 'boolean',
|
|
271
271
|
description: ( localize(
|
|
272
|
-
|
|
272
|
+
2951,
|
|
273
273
|
"Controls whether the Source Control view should automatically reveal and select files when opening them."
|
|
274
274
|
)),
|
|
275
275
|
default: true
|
|
@@ -277,20 +277,20 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
|
|
|
277
277
|
'scm.inputFontFamily': {
|
|
278
278
|
type: 'string',
|
|
279
279
|
markdownDescription: ( localize(
|
|
280
|
-
|
|
280
|
+
2952,
|
|
281
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."
|
|
282
282
|
)),
|
|
283
283
|
default: 'default'
|
|
284
284
|
},
|
|
285
285
|
'scm.inputFontSize': {
|
|
286
286
|
type: 'number',
|
|
287
|
-
markdownDescription: ( localize(
|
|
287
|
+
markdownDescription: ( localize(2953, "Controls the font size for the input message in pixels.")),
|
|
288
288
|
default: 13
|
|
289
289
|
},
|
|
290
290
|
'scm.inputMaxLineCount': {
|
|
291
291
|
type: 'number',
|
|
292
292
|
markdownDescription: ( localize(
|
|
293
|
-
|
|
293
|
+
2954,
|
|
294
294
|
"Controls the maximum number of lines that the input will auto-grow to."
|
|
295
295
|
)),
|
|
296
296
|
minimum: 1,
|
|
@@ -300,7 +300,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
|
|
|
300
300
|
'scm.inputMinLineCount': {
|
|
301
301
|
type: 'number',
|
|
302
302
|
markdownDescription: ( localize(
|
|
303
|
-
|
|
303
|
+
2955,
|
|
304
304
|
"Controls the minimum number of lines that the input will auto-grow from."
|
|
305
305
|
)),
|
|
306
306
|
minimum: 1,
|
|
@@ -310,7 +310,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
|
|
|
310
310
|
'scm.alwaysShowRepositories': {
|
|
311
311
|
type: 'boolean',
|
|
312
312
|
markdownDescription: ( localize(
|
|
313
|
-
|
|
313
|
+
2956,
|
|
314
314
|
"Controls whether repositories should always be visible in the Source Control view."
|
|
315
315
|
)),
|
|
316
316
|
default: false
|
|
@@ -320,20 +320,20 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
|
|
|
320
320
|
enum: ['discovery time', 'name', 'path'],
|
|
321
321
|
enumDescriptions: [
|
|
322
322
|
( localize(
|
|
323
|
-
|
|
323
|
+
2957,
|
|
324
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."
|
|
325
325
|
)),
|
|
326
326
|
( localize(
|
|
327
|
-
|
|
327
|
+
2958,
|
|
328
328
|
"Repositories in the Source Control Repositories and Source Control views are sorted by repository name."
|
|
329
329
|
)),
|
|
330
330
|
( localize(
|
|
331
|
-
|
|
331
|
+
2959,
|
|
332
332
|
"Repositories in the Source Control Repositories and Source Control views are sorted by repository path."
|
|
333
333
|
))
|
|
334
334
|
],
|
|
335
335
|
description: ( localize(
|
|
336
|
-
|
|
336
|
+
2960,
|
|
337
337
|
"Controls the sort order of the repositories in the source control repositories view."
|
|
338
338
|
)),
|
|
339
339
|
default: 'discovery time'
|
|
@@ -341,7 +341,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
|
|
|
341
341
|
'scm.repositories.visible': {
|
|
342
342
|
type: 'number',
|
|
343
343
|
description: ( localize(
|
|
344
|
-
|
|
344
|
+
2961,
|
|
345
345
|
"Controls how many repositories are visible in the Source Control Repositories section. Set to 0, to be able to manually resize the view."
|
|
346
346
|
)),
|
|
347
347
|
default: 10
|
|
@@ -349,7 +349,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
|
|
|
349
349
|
'scm.showActionButton': {
|
|
350
350
|
type: 'boolean',
|
|
351
351
|
markdownDescription: ( localize(
|
|
352
|
-
|
|
352
|
+
2962,
|
|
353
353
|
"Controls whether an action button can be shown in the Source Control view."
|
|
354
354
|
)),
|
|
355
355
|
default: true
|
|
@@ -357,7 +357,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
|
|
|
357
357
|
'scm.showInputActionButton': {
|
|
358
358
|
type: 'boolean',
|
|
359
359
|
markdownDescription: ( localize(
|
|
360
|
-
|
|
360
|
+
2963,
|
|
361
361
|
"Controls whether an action button can be shown in the Source Control input."
|
|
362
362
|
)),
|
|
363
363
|
default: true
|
|
@@ -366,15 +366,15 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
|
|
|
366
366
|
type: 'string',
|
|
367
367
|
enum: ['always', 'never', 'auto'],
|
|
368
368
|
enumDescriptions: [
|
|
369
|
-
( localize(
|
|
370
|
-
( localize(
|
|
369
|
+
( localize(2964, "Always show incoming changes in the Source Control view.")),
|
|
370
|
+
( localize(2965, "Never show incoming changes in the Source Control view.")),
|
|
371
371
|
( localize(
|
|
372
|
-
|
|
372
|
+
2966,
|
|
373
373
|
"Only show incoming changes in the Source Control view when any exist."
|
|
374
374
|
)),
|
|
375
375
|
],
|
|
376
376
|
description: ( localize(
|
|
377
|
-
|
|
377
|
+
2967,
|
|
378
378
|
"Controls whether incoming changes are shown in the Source Control view."
|
|
379
379
|
)),
|
|
380
380
|
default: 'auto'
|
|
@@ -383,15 +383,15 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
|
|
|
383
383
|
type: 'string',
|
|
384
384
|
enum: ['always', 'never', 'auto'],
|
|
385
385
|
enumDescriptions: [
|
|
386
|
-
( localize(
|
|
387
|
-
( localize(
|
|
386
|
+
( localize(2968, "Always show outgoing changes in the Source Control view.")),
|
|
387
|
+
( localize(2969, "Never show outgoing changes in the Source Control view.")),
|
|
388
388
|
( localize(
|
|
389
|
-
|
|
389
|
+
2970,
|
|
390
390
|
"Only show outgoing changes in the Source Control view when any exist."
|
|
391
391
|
)),
|
|
392
392
|
],
|
|
393
393
|
description: ( localize(
|
|
394
|
-
|
|
394
|
+
2971,
|
|
395
395
|
"Controls whether outgoing changes are shown in the Source Control view."
|
|
396
396
|
)),
|
|
397
397
|
default: 'auto'
|
|
@@ -399,7 +399,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
|
|
|
399
399
|
'scm.showChangesSummary': {
|
|
400
400
|
type: 'boolean',
|
|
401
401
|
description: ( localize(
|
|
402
|
-
|
|
402
|
+
2972,
|
|
403
403
|
"Controls whether the All Changes entry is shown for incoming/outgoing changes in the Source Control view."
|
|
404
404
|
)),
|
|
405
405
|
default: true
|
|
@@ -407,7 +407,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
|
|
|
407
407
|
'scm.workingSets.enabled': {
|
|
408
408
|
type: 'boolean',
|
|
409
409
|
description: ( localize(
|
|
410
|
-
|
|
410
|
+
2973,
|
|
411
411
|
"Controls whether to store editor working sets when switching between source control history item groups."
|
|
412
412
|
)),
|
|
413
413
|
default: false
|
|
@@ -417,16 +417,16 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
|
|
|
417
417
|
enum: ['empty', 'current'],
|
|
418
418
|
enumDescriptions: [
|
|
419
419
|
( localize(
|
|
420
|
-
|
|
420
|
+
2974,
|
|
421
421
|
"Use an empty working set when switching to a source control history item group that does not have a working set."
|
|
422
422
|
)),
|
|
423
423
|
( localize(
|
|
424
|
-
|
|
424
|
+
2975,
|
|
425
425
|
"Use the current working set when switching to a source control history item group that does not have a working set."
|
|
426
426
|
))
|
|
427
427
|
],
|
|
428
428
|
description: ( localize(
|
|
429
|
-
|
|
429
|
+
2976,
|
|
430
430
|
"Controls the default working set to use when switching to a source control history item group that does not have a working set."
|
|
431
431
|
)),
|
|
432
432
|
default: 'current'
|
|
@@ -434,7 +434,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
|
|
|
434
434
|
'scm.showHistoryGraph': {
|
|
435
435
|
type: 'boolean',
|
|
436
436
|
description: ( localize(
|
|
437
|
-
|
|
437
|
+
2977,
|
|
438
438
|
"Controls whether to render incoming/outgoing changes using a graph in the Source Control view."
|
|
439
439
|
)),
|
|
440
440
|
default: true
|
|
@@ -443,7 +443,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
|
|
|
443
443
|
});
|
|
444
444
|
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
445
445
|
id: 'scm.acceptInput',
|
|
446
|
-
metadata: { description: ( localize(
|
|
446
|
+
metadata: { description: ( localize(2978, "Source Control: Accept Input")), args: [] },
|
|
447
447
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
448
448
|
when: ( (ContextKeyExpr.has('scmRepository'))),
|
|
449
449
|
primary: KeyMod.CtrlCmd | KeyCode.Enter,
|
|
@@ -483,7 +483,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
483
483
|
}
|
|
484
484
|
});
|
|
485
485
|
const viewNextCommitCommand = {
|
|
486
|
-
description: { description: ( localize(
|
|
486
|
+
description: { description: ( localize(2979, "Source Control: View Next Commit")), args: [] },
|
|
487
487
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
488
488
|
handler: (accessor) => {
|
|
489
489
|
const contextKeyService = accessor.get(IContextKeyService);
|
|
@@ -495,7 +495,7 @@ const viewNextCommitCommand = {
|
|
|
495
495
|
}
|
|
496
496
|
};
|
|
497
497
|
const viewPreviousCommitCommand = {
|
|
498
|
-
description: { description: ( localize(
|
|
498
|
+
description: { description: ( localize(2980, "Source Control: View Previous Commit")), args: [] },
|
|
499
499
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
500
500
|
handler: (accessor) => {
|
|
501
501
|
const contextKeyService = accessor.get(IContextKeyService);
|
|
@@ -556,7 +556,7 @@ MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
|
|
|
556
556
|
group: '100_end',
|
|
557
557
|
command: {
|
|
558
558
|
id: 'scm.openInTerminal',
|
|
559
|
-
title: ( localize(
|
|
559
|
+
title: ( localize(2981, "Open in External Terminal"))
|
|
560
560
|
},
|
|
561
561
|
when: ( (ContextKeyExpr.and(
|
|
562
562
|
(ContextKeyExpr.equals('scmProviderHasRootUri', true)),
|
|
@@ -570,7 +570,7 @@ MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
|
|
|
570
570
|
group: '100_end',
|
|
571
571
|
command: {
|
|
572
572
|
id: 'scm.openInIntegratedTerminal',
|
|
573
|
-
title: ( localize(
|
|
573
|
+
title: ( localize(2982, "Open in Integrated Terminal"))
|
|
574
574
|
},
|
|
575
575
|
when: ( (ContextKeyExpr.and(
|
|
576
576
|
(ContextKeyExpr.equals('scmProviderHasRootUri', true)),
|
|
@@ -19,14 +19,14 @@ const SWIMLANE_HEIGHT = 22;
|
|
|
19
19
|
const SWIMLANE_WIDTH = 11;
|
|
20
20
|
const CIRCLE_RADIUS = 4;
|
|
21
21
|
const SWIMLANE_CURVE_RADIUS = 5;
|
|
22
|
-
const historyItemGroupLocal = registerColor('scm.historyGraph.historyItemGroupLocal', chartsBlue, ( localize(
|
|
23
|
-
const historyItemGroupRemote = registerColor('scm.historyGraph.historyItemGroupRemote', chartsPurple, ( localize(
|
|
24
|
-
const historyItemGroupBase = registerColor('scm.historyGraph.historyItemGroupBase', chartsOrange, ( localize(
|
|
25
|
-
const historyItemGroupHoverLabelForeground = registerColor('scm.historyGraph.historyItemGroupHoverLabelForeground', buttonForeground, ( localize(
|
|
22
|
+
const historyItemGroupLocal = registerColor('scm.historyGraph.historyItemGroupLocal', chartsBlue, ( localize(10524, "Local history item group color.")));
|
|
23
|
+
const historyItemGroupRemote = registerColor('scm.historyGraph.historyItemGroupRemote', chartsPurple, ( localize(10525, "Remote history item group color.")));
|
|
24
|
+
const historyItemGroupBase = registerColor('scm.historyGraph.historyItemGroupBase', chartsOrange, ( localize(10526, "Base history item group color.")));
|
|
25
|
+
const historyItemGroupHoverLabelForeground = registerColor('scm.historyGraph.historyItemGroupHoverLabelForeground', buttonForeground, ( localize(10527, "History item group hover label foreground color.")));
|
|
26
26
|
const colorRegistry = [
|
|
27
|
-
registerColor('scm.historyGraph.green', chartsGreen, ( localize(
|
|
28
|
-
registerColor('scm.historyGraph.red', chartsRed, ( localize(
|
|
29
|
-
registerColor('scm.historyGraph.yellow', chartsYellow, ( localize(
|
|
27
|
+
registerColor('scm.historyGraph.green', chartsGreen, ( localize(10528, "The green color used in history graph."))),
|
|
28
|
+
registerColor('scm.historyGraph.red', chartsRed, ( localize(10529, "The red color used in history graph."))),
|
|
29
|
+
registerColor('scm.historyGraph.yellow', chartsYellow, ( localize(10530, "The yellow color used in history graph."))),
|
|
30
30
|
];
|
|
31
31
|
function getLabelColorIdentifier(historyItem, colorMap) {
|
|
32
32
|
for (const label of historyItem.labels ?? []) {
|
|
@@ -59,7 +59,7 @@ let SCMRepositoriesViewPane = class SCMRepositoriesViewPane extends ViewPane {
|
|
|
59
59
|
return r.provider.label;
|
|
60
60
|
},
|
|
61
61
|
getWidgetAriaLabel() {
|
|
62
|
-
return ( localize(
|
|
62
|
+
return ( localize(6646, "Source Control Repositories"));
|
|
63
63
|
}
|
|
64
64
|
}
|
|
65
65
|
});
|
|
@@ -119,10 +119,10 @@ import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/lay
|
|
|
119
119
|
import { fromNow } from 'vscode/vscode/vs/base/common/date';
|
|
120
120
|
|
|
121
121
|
var ActionButtonRenderer_1, InputRenderer_1, ResourceGroupRenderer_1, ResourceRenderer_1, HistoryItemGroupRenderer_1, HistoryItemRenderer_1, HistoryItem2Renderer_1, HistoryItemChangeRenderer_1, SeparatorRenderer_1, SCMInputWidget_1;
|
|
122
|
-
const historyItemAdditionsForeground = registerColor('scm.historyItemAdditionsForeground', 'gitDecoration.addedResourceForeground', ( localize(
|
|
123
|
-
const historyItemDeletionsForeground = registerColor('scm.historyItemDeletionsForeground', 'gitDecoration.deletedResourceForeground', ( localize(
|
|
124
|
-
registerColor('scm.historyItemStatisticsBorder', ( (transparent(foreground, 0.2))), ( localize(
|
|
125
|
-
registerColor('scm.historyItemSelectedStatisticsBorder', ( (transparent(listActiveSelectionForeground, 0.2))), ( localize(
|
|
122
|
+
const historyItemAdditionsForeground = registerColor('scm.historyItemAdditionsForeground', 'gitDecoration.addedResourceForeground', ( localize(6699, "History item additions foreground color.")));
|
|
123
|
+
const historyItemDeletionsForeground = registerColor('scm.historyItemDeletionsForeground', 'gitDecoration.deletedResourceForeground', ( localize(6700, "History item deletions foreground color.")));
|
|
124
|
+
registerColor('scm.historyItemStatisticsBorder', ( (transparent(foreground, 0.2))), ( localize(6701, "History item statistics border color.")));
|
|
125
|
+
registerColor('scm.historyItemSelectedStatisticsBorder', ( (transparent(listActiveSelectionForeground, 0.2))), ( localize(6702, "History item selected statistics border color.")));
|
|
126
126
|
function processResourceFilterData(uri, filterData) {
|
|
127
127
|
if (!filterData) {
|
|
128
128
|
return [undefined, undefined];
|
|
@@ -809,12 +809,12 @@ let HistoryItemRenderer = class HistoryItemRenderer {
|
|
|
809
809
|
if (historyItem.statistics) {
|
|
810
810
|
const statsAriaLabel = [
|
|
811
811
|
historyItem.statistics.files === 1 ?
|
|
812
|
-
( localize(
|
|
813
|
-
( localize(
|
|
814
|
-
historyItem.statistics.insertions === 1 ? ( localize(
|
|
815
|
-
historyItem.statistics.insertions > 1 ? ( localize(
|
|
816
|
-
historyItem.statistics.deletions === 1 ? ( localize(
|
|
817
|
-
historyItem.statistics.deletions > 1 ? ( localize(
|
|
812
|
+
( localize(6703, "{0} file changed", historyItem.statistics.files)) :
|
|
813
|
+
( localize(6704, "{0} files changed", historyItem.statistics.files)),
|
|
814
|
+
historyItem.statistics.insertions === 1 ? ( localize(6705, "{0} insertion{1}", historyItem.statistics.insertions, '(+)')) :
|
|
815
|
+
historyItem.statistics.insertions > 1 ? ( localize(6706, "{0} insertions{1}", historyItem.statistics.insertions, '(+)')) : '',
|
|
816
|
+
historyItem.statistics.deletions === 1 ? ( localize(6707, "{0} deletion{1}", historyItem.statistics.deletions, '(-)')) :
|
|
817
|
+
historyItem.statistics.deletions > 1 ? ( localize(6708, "{0} deletions{1}", historyItem.statistics.deletions, '(-)')) : ''
|
|
818
818
|
];
|
|
819
819
|
const statsTitle = statsAriaLabel.filter(l => l !== '').join(', ');
|
|
820
820
|
templateData.statsContainer.setAttribute('aria-label', statsTitle);
|
|
@@ -902,19 +902,19 @@ let HistoryItem2Renderer = class HistoryItem2Renderer {
|
|
|
902
902
|
if (historyItem.statistics) {
|
|
903
903
|
markdown.appendMarkdown(`---\n\n`);
|
|
904
904
|
markdown.appendMarkdown(`<span>${historyItem.statistics.files === 1 ?
|
|
905
|
-
( localize(
|
|
906
|
-
( localize(
|
|
905
|
+
( localize(6703, "{0} file changed", historyItem.statistics.files)) :
|
|
906
|
+
( localize(6704, "{0} files changed", historyItem.statistics.files))}</span>`);
|
|
907
907
|
if (historyItem.statistics.insertions) {
|
|
908
908
|
const historyItemAdditionsForegroundColor = colorTheme.getColor(historyItemAdditionsForeground);
|
|
909
909
|
markdown.appendMarkdown(`, <span style="color:${historyItemAdditionsForegroundColor};">${historyItem.statistics.insertions === 1 ?
|
|
910
|
-
( localize(
|
|
911
|
-
( localize(
|
|
910
|
+
( localize(6705, "{0} insertion{1}", historyItem.statistics.insertions, '(+)')) :
|
|
911
|
+
( localize(6706, "{0} insertions{1}", historyItem.statistics.insertions, '(+)'))}</span>`);
|
|
912
912
|
}
|
|
913
913
|
if (historyItem.statistics.deletions) {
|
|
914
914
|
const historyItemDeletionsForegroundColor = colorTheme.getColor(historyItemDeletionsForeground);
|
|
915
915
|
markdown.appendMarkdown(`, <span style="color:${historyItemDeletionsForegroundColor};">${historyItem.statistics.deletions === 1 ?
|
|
916
|
-
( localize(
|
|
917
|
-
( localize(
|
|
916
|
+
( localize(6707, "{0} deletion{1}", historyItem.statistics.deletions, '(-)')) :
|
|
917
|
+
( localize(6708, "{0} deletions{1}", historyItem.statistics.deletions, '(-)'))}</span>`);
|
|
918
918
|
}
|
|
919
919
|
}
|
|
920
920
|
if (historyItem.labels) {
|
|
@@ -1341,7 +1341,7 @@ let SCMAccessibilityProvider = class SCMAccessibilityProvider {
|
|
|
1341
1341
|
this.labelService = labelService;
|
|
1342
1342
|
}
|
|
1343
1343
|
getWidgetAriaLabel() {
|
|
1344
|
-
return ( localize(
|
|
1344
|
+
return ( localize(6709, "Source Control Management"));
|
|
1345
1345
|
}
|
|
1346
1346
|
getAriaLabel(element) {
|
|
1347
1347
|
if (ResourceTree.isResourceNode(element)) {
|
|
@@ -1351,7 +1351,7 @@ let SCMAccessibilityProvider = class SCMAccessibilityProvider {
|
|
|
1351
1351
|
return `${element.provider.name} ${element.provider.label}`;
|
|
1352
1352
|
}
|
|
1353
1353
|
else if (isSCMInput(element)) {
|
|
1354
|
-
return ( localize(
|
|
1354
|
+
return ( localize(6710, "Source Control Input"));
|
|
1355
1355
|
}
|
|
1356
1356
|
else if (isSCMActionButton(element)) {
|
|
1357
1357
|
return element.button?.command.title ?? '';
|
|
@@ -1430,7 +1430,7 @@ const ContextKeys = {
|
|
|
1430
1430
|
}
|
|
1431
1431
|
};
|
|
1432
1432
|
MenuRegistry.appendMenuItem(MenuId.SCMTitle, {
|
|
1433
|
-
title: ( localize(
|
|
1433
|
+
title: ( localize(6711, "View & Sort")),
|
|
1434
1434
|
submenu: Menus.ViewSort,
|
|
1435
1435
|
when: ( (ContextKeyExpr.and(
|
|
1436
1436
|
(ContextKeyExpr.equals('view', VIEW_PANE_ID)),
|
|
@@ -1440,7 +1440,7 @@ MenuRegistry.appendMenuItem(MenuId.SCMTitle, {
|
|
|
1440
1440
|
order: 1
|
|
1441
1441
|
});
|
|
1442
1442
|
MenuRegistry.appendMenuItem(MenuId.SCMTitle, {
|
|
1443
|
-
title: ( localize(
|
|
1443
|
+
title: ( localize(6712, "Incoming & Outgoing")),
|
|
1444
1444
|
submenu: Menus.ChangesSettings,
|
|
1445
1445
|
when: ( (ContextKeyExpr.and(
|
|
1446
1446
|
(ContextKeyExpr.equals('view', VIEW_PANE_ID)),
|
|
@@ -1451,7 +1451,7 @@ MenuRegistry.appendMenuItem(MenuId.SCMTitle, {
|
|
|
1451
1451
|
order: 2
|
|
1452
1452
|
});
|
|
1453
1453
|
MenuRegistry.appendMenuItem(Menus.ViewSort, {
|
|
1454
|
-
title: ( localize(
|
|
1454
|
+
title: ( localize(6713, "Repositories")),
|
|
1455
1455
|
submenu: Menus.Repositories,
|
|
1456
1456
|
when: ContextKeyExpr.greater(ContextKeys.RepositoryCount.key, 1),
|
|
1457
1457
|
group: '0_repositories'
|
|
@@ -1472,14 +1472,14 @@ class SCMChangesSettingAction extends Action2 {
|
|
|
1472
1472
|
}
|
|
1473
1473
|
}
|
|
1474
1474
|
MenuRegistry.appendMenuItem(MenuId.SCMChangesSeparator, {
|
|
1475
|
-
title: ( localize(
|
|
1475
|
+
title: ( localize(6714, "Show Incoming Changes")),
|
|
1476
1476
|
submenu: MenuId.SCMIncomingChangesSetting,
|
|
1477
1477
|
group: '1_incoming&outgoing',
|
|
1478
1478
|
order: 1,
|
|
1479
1479
|
when: ( (ContextKeyExpr.equals('config.scm.showHistoryGraph', false)))
|
|
1480
1480
|
});
|
|
1481
1481
|
MenuRegistry.appendMenuItem(Menus.ChangesSettings, {
|
|
1482
|
-
title: ( localize(
|
|
1482
|
+
title: ( localize(6714, "Show Incoming Changes")),
|
|
1483
1483
|
submenu: MenuId.SCMIncomingChangesSetting,
|
|
1484
1484
|
group: '1_incoming&outgoing',
|
|
1485
1485
|
order: 1,
|
|
@@ -1489,7 +1489,7 @@ registerAction2(class extends SCMChangesSettingAction {
|
|
|
1489
1489
|
constructor() {
|
|
1490
1490
|
super('scm.showIncomingChanges', 'always', {
|
|
1491
1491
|
id: 'workbench.scm.action.showIncomingChanges.always',
|
|
1492
|
-
title: ( localize(
|
|
1492
|
+
title: ( localize(6715, "Always")),
|
|
1493
1493
|
menu: { id: MenuId.SCMIncomingChangesSetting },
|
|
1494
1494
|
});
|
|
1495
1495
|
}
|
|
@@ -1498,7 +1498,7 @@ registerAction2(class extends SCMChangesSettingAction {
|
|
|
1498
1498
|
constructor() {
|
|
1499
1499
|
super('scm.showIncomingChanges', 'auto', {
|
|
1500
1500
|
id: 'workbench.scm.action.showIncomingChanges.auto',
|
|
1501
|
-
title: ( localize(
|
|
1501
|
+
title: ( localize(6716, "Auto")),
|
|
1502
1502
|
menu: {
|
|
1503
1503
|
id: MenuId.SCMIncomingChangesSetting,
|
|
1504
1504
|
}
|
|
@@ -1509,7 +1509,7 @@ registerAction2(class extends SCMChangesSettingAction {
|
|
|
1509
1509
|
constructor() {
|
|
1510
1510
|
super('scm.showIncomingChanges', 'never', {
|
|
1511
1511
|
id: 'workbench.scm.action.showIncomingChanges.never',
|
|
1512
|
-
title: ( localize(
|
|
1512
|
+
title: ( localize(6717, "Never")),
|
|
1513
1513
|
menu: {
|
|
1514
1514
|
id: MenuId.SCMIncomingChangesSetting,
|
|
1515
1515
|
}
|
|
@@ -1517,14 +1517,14 @@ registerAction2(class extends SCMChangesSettingAction {
|
|
|
1517
1517
|
}
|
|
1518
1518
|
});
|
|
1519
1519
|
MenuRegistry.appendMenuItem(MenuId.SCMChangesSeparator, {
|
|
1520
|
-
title: ( localize(
|
|
1520
|
+
title: ( localize(6718, "Show Outgoing Changes")),
|
|
1521
1521
|
submenu: MenuId.SCMOutgoingChangesSetting,
|
|
1522
1522
|
group: '1_incoming&outgoing',
|
|
1523
1523
|
order: 2,
|
|
1524
1524
|
when: ( (ContextKeyExpr.equals('config.scm.showHistoryGraph', false)))
|
|
1525
1525
|
});
|
|
1526
1526
|
MenuRegistry.appendMenuItem(Menus.ChangesSettings, {
|
|
1527
|
-
title: ( localize(
|
|
1527
|
+
title: ( localize(6718, "Show Outgoing Changes")),
|
|
1528
1528
|
submenu: MenuId.SCMOutgoingChangesSetting,
|
|
1529
1529
|
group: '1_incoming&outgoing',
|
|
1530
1530
|
order: 2,
|
|
@@ -1534,7 +1534,7 @@ registerAction2(class extends SCMChangesSettingAction {
|
|
|
1534
1534
|
constructor() {
|
|
1535
1535
|
super('scm.showOutgoingChanges', 'always', {
|
|
1536
1536
|
id: 'workbench.scm.action.showOutgoingChanges.always',
|
|
1537
|
-
title: ( localize(
|
|
1537
|
+
title: ( localize(6715, "Always")),
|
|
1538
1538
|
menu: {
|
|
1539
1539
|
id: MenuId.SCMOutgoingChangesSetting,
|
|
1540
1540
|
}
|
|
@@ -1545,7 +1545,7 @@ registerAction2(class extends SCMChangesSettingAction {
|
|
|
1545
1545
|
constructor() {
|
|
1546
1546
|
super('scm.showOutgoingChanges', 'auto', {
|
|
1547
1547
|
id: 'workbench.scm.action.showOutgoingChanges.auto',
|
|
1548
|
-
title: ( localize(
|
|
1548
|
+
title: ( localize(6716, "Auto")),
|
|
1549
1549
|
menu: {
|
|
1550
1550
|
id: MenuId.SCMOutgoingChangesSetting,
|
|
1551
1551
|
}
|
|
@@ -1556,7 +1556,7 @@ registerAction2(class extends SCMChangesSettingAction {
|
|
|
1556
1556
|
constructor() {
|
|
1557
1557
|
super('scm.showOutgoingChanges', 'never', {
|
|
1558
1558
|
id: 'workbench.scm.action.showOutgoingChanges.never',
|
|
1559
|
-
title: ( localize(
|
|
1559
|
+
title: ( localize(6717, "Never")),
|
|
1560
1560
|
menu: {
|
|
1561
1561
|
id: MenuId.SCMOutgoingChangesSetting,
|
|
1562
1562
|
}
|
|
@@ -1567,7 +1567,7 @@ registerAction2(class extends Action2 {
|
|
|
1567
1567
|
constructor() {
|
|
1568
1568
|
super({
|
|
1569
1569
|
id: 'workbench.scm.action.scm.showChangesSummary',
|
|
1570
|
-
title: ( localize(
|
|
1570
|
+
title: ( localize(6719, "Show Changes Summary")),
|
|
1571
1571
|
f1: false,
|
|
1572
1572
|
toggled: ( (ContextKeyExpr.equals('config.scm.showChangesSummary', true))),
|
|
1573
1573
|
menu: [
|
|
@@ -1594,7 +1594,7 @@ registerAction2(class extends Action2 {
|
|
|
1594
1594
|
constructor() {
|
|
1595
1595
|
super({
|
|
1596
1596
|
id: 'workbench.scm.action.scm.viewChanges',
|
|
1597
|
-
title: ( localize(
|
|
1597
|
+
title: ( localize(6720, "View Changes")),
|
|
1598
1598
|
f1: false,
|
|
1599
1599
|
menu: [
|
|
1600
1600
|
{
|
|
@@ -1627,7 +1627,7 @@ registerAction2(class extends Action2 {
|
|
|
1627
1627
|
const title = historyItems.length === 1 ?
|
|
1628
1628
|
`${historyItems[0].id.substring(0, 8)} - ${historyItems[0].message}` :
|
|
1629
1629
|
( localize(
|
|
1630
|
-
|
|
1630
|
+
6721,
|
|
1631
1631
|
"All Changes ({0} ↔ {1})",
|
|
1632
1632
|
historyItem.id.substring(0, 8),
|
|
1633
1633
|
historyItemLast.id.substring(0, 8)
|
|
@@ -1730,7 +1730,7 @@ class SetListViewModeAction extends ViewAction {
|
|
|
1730
1730
|
constructor(id = 'workbench.scm.action.setListViewMode', menu = {}) {
|
|
1731
1731
|
super({
|
|
1732
1732
|
id,
|
|
1733
|
-
title: ( localize(
|
|
1733
|
+
title: ( localize(6722, "View as List")),
|
|
1734
1734
|
viewId: VIEW_PANE_ID,
|
|
1735
1735
|
f1: false,
|
|
1736
1736
|
icon: Codicon.listTree,
|
|
@@ -1760,7 +1760,7 @@ class SetTreeViewModeAction extends ViewAction {
|
|
|
1760
1760
|
constructor(id = 'workbench.scm.action.setTreeViewMode', menu = {}) {
|
|
1761
1761
|
super({
|
|
1762
1762
|
id,
|
|
1763
|
-
title: ( localize(
|
|
1763
|
+
title: ( localize(6723, "View as Tree")),
|
|
1764
1764
|
viewId: VIEW_PANE_ID,
|
|
1765
1765
|
f1: false,
|
|
1766
1766
|
icon: Codicon.listFlat,
|
|
@@ -1817,17 +1817,17 @@ class RepositorySortAction extends ViewAction {
|
|
|
1817
1817
|
}
|
|
1818
1818
|
class RepositorySortByDiscoveryTimeAction extends RepositorySortAction {
|
|
1819
1819
|
constructor() {
|
|
1820
|
-
super(ISCMRepositorySortKey.DiscoveryTime, ( localize(
|
|
1820
|
+
super(ISCMRepositorySortKey.DiscoveryTime, ( localize(6724, "Sort by Discovery Time")));
|
|
1821
1821
|
}
|
|
1822
1822
|
}
|
|
1823
1823
|
class RepositorySortByNameAction extends RepositorySortAction {
|
|
1824
1824
|
constructor() {
|
|
1825
|
-
super(ISCMRepositorySortKey.Name, ( localize(
|
|
1825
|
+
super(ISCMRepositorySortKey.Name, ( localize(6725, "Sort by Name")));
|
|
1826
1826
|
}
|
|
1827
1827
|
}
|
|
1828
1828
|
class RepositorySortByPathAction extends RepositorySortAction {
|
|
1829
1829
|
constructor() {
|
|
1830
|
-
super(ISCMRepositorySortKey.Path, ( localize(
|
|
1830
|
+
super(ISCMRepositorySortKey.Path, ( localize(6726, "Sort by Path")));
|
|
1831
1831
|
}
|
|
1832
1832
|
}
|
|
1833
1833
|
registerAction2(RepositorySortByDiscoveryTimeAction);
|
|
@@ -1852,17 +1852,17 @@ class SetSortKeyAction extends ViewAction {
|
|
|
1852
1852
|
}
|
|
1853
1853
|
class SetSortByNameAction extends SetSortKeyAction {
|
|
1854
1854
|
constructor() {
|
|
1855
|
-
super(ViewSortKey.Name, ( localize(
|
|
1855
|
+
super(ViewSortKey.Name, ( localize(6727, "Sort Changes by Name")));
|
|
1856
1856
|
}
|
|
1857
1857
|
}
|
|
1858
1858
|
class SetSortByPathAction extends SetSortKeyAction {
|
|
1859
1859
|
constructor() {
|
|
1860
|
-
super(ViewSortKey.Path, ( localize(
|
|
1860
|
+
super(ViewSortKey.Path, ( localize(6728, "Sort Changes by Path")));
|
|
1861
1861
|
}
|
|
1862
1862
|
}
|
|
1863
1863
|
class SetSortByStatusAction extends SetSortKeyAction {
|
|
1864
1864
|
constructor() {
|
|
1865
|
-
super(ViewSortKey.Status, ( localize(
|
|
1865
|
+
super(ViewSortKey.Status, ( localize(6729, "Sort Changes by Status")));
|
|
1866
1866
|
}
|
|
1867
1867
|
}
|
|
1868
1868
|
registerAction2(SetSortByNameAction);
|
|
@@ -1872,7 +1872,7 @@ class CollapseAllRepositoriesAction extends ViewAction {
|
|
|
1872
1872
|
constructor() {
|
|
1873
1873
|
super({
|
|
1874
1874
|
id: `workbench.scm.action.collapseAllRepositories`,
|
|
1875
|
-
title: ( localize(
|
|
1875
|
+
title: ( localize(6730, "Collapse All Repositories")),
|
|
1876
1876
|
viewId: VIEW_PANE_ID,
|
|
1877
1877
|
f1: false,
|
|
1878
1878
|
icon: Codicon.collapseAll,
|
|
@@ -1895,7 +1895,7 @@ class ExpandAllRepositoriesAction extends ViewAction {
|
|
|
1895
1895
|
constructor() {
|
|
1896
1896
|
super({
|
|
1897
1897
|
id: `workbench.scm.action.expandAllRepositories`,
|
|
1898
|
-
title: ( localize(
|
|
1898
|
+
title: ( localize(6731, "Expand All Repositories")),
|
|
1899
1899
|
viewId: VIEW_PANE_ID,
|
|
1900
1900
|
f1: false,
|
|
1901
1901
|
icon: Codicon.expandAll,
|
|
@@ -1974,10 +1974,10 @@ let SCMInputWidgetToolbar = class SCMInputWidgetToolbar extends WorkbenchToolBar
|
|
|
1974
1974
|
this._onDidChange = ( (new Emitter()));
|
|
1975
1975
|
this.onDidChange = this._onDidChange.event;
|
|
1976
1976
|
this._disposables = this._register(( (new MutableDisposable())));
|
|
1977
|
-
this._dropdownAction = ( (new Action('scmInputMoreActions', ( localize(
|
|
1977
|
+
this._dropdownAction = ( (new Action('scmInputMoreActions', ( localize(6732, "More Actions...")), 'codicon-chevron-down')));
|
|
1978
1978
|
this._cancelAction = ( (new MenuItemAction({
|
|
1979
1979
|
id: SCMInputWidgetCommandId.CancelAction,
|
|
1980
|
-
title: ( localize(
|
|
1980
|
+
title: ( localize(6733, "Cancel")),
|
|
1981
1981
|
icon: Codicon.debugStop,
|
|
1982
1982
|
}, undefined, undefined, undefined, undefined, contextKeyService, commandService)));
|
|
1983
1983
|
}
|
|
@@ -2427,7 +2427,7 @@ let SCMInputWidget = class SCMInputWidget {
|
|
|
2427
2427
|
}
|
|
2428
2428
|
const actionsContainer = append(validationContainer, $('.scm-editor-validation-actions'));
|
|
2429
2429
|
const actionbar = ( (new ActionBar(actionsContainer)));
|
|
2430
|
-
const action = ( (new Action('scmInputWidget.validationMessage.close', ( localize(
|
|
2430
|
+
const action = ( (new Action('scmInputWidget.validationMessage.close', ( localize(6734, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => {
|
|
2431
2431
|
this.contextViewService.hideContextView();
|
|
2432
2432
|
this.element.style.borderBottomLeftRadius = '2px';
|
|
2433
2433
|
this.element.style.borderBottomRightRadius = '2px';
|
|
@@ -3264,7 +3264,7 @@ let SCMTreeHistoryProviderDataSource = class SCMTreeHistoryProviderDataSource ex
|
|
|
3264
3264
|
incomingHistoryItemGroup = currentHistoryItemGroup.remote ? {
|
|
3265
3265
|
id: currentHistoryItemGroup.remote.id,
|
|
3266
3266
|
label: currentHistoryItemGroup.remote.name,
|
|
3267
|
-
ariaLabel: ( localize(
|
|
3267
|
+
ariaLabel: ( localize(6735, "Incoming changes from {0}", currentHistoryItemGroup.remote.name)),
|
|
3268
3268
|
icon: Codicon.arrowCircleDown,
|
|
3269
3269
|
direction: 'incoming',
|
|
3270
3270
|
ancestor: ancestor.id,
|
|
@@ -3275,7 +3275,7 @@ let SCMTreeHistoryProviderDataSource = class SCMTreeHistoryProviderDataSource ex
|
|
|
3275
3275
|
outgoingHistoryItemGroup = {
|
|
3276
3276
|
id: currentHistoryItemGroup.id,
|
|
3277
3277
|
label: currentHistoryItemGroup.name,
|
|
3278
|
-
ariaLabel: ( localize(
|
|
3278
|
+
ariaLabel: ( localize(6736, "Outgoing changes to {0}", currentHistoryItemGroup.name)),
|
|
3279
3279
|
icon: Codicon.arrowCircleUp,
|
|
3280
3280
|
direction: 'outgoing',
|
|
3281
3281
|
ancestor: ancestor.id,
|
|
@@ -3337,7 +3337,7 @@ let SCMTreeHistoryProviderDataSource = class SCMTreeHistoryProviderDataSource ex
|
|
|
3337
3337
|
children.push({
|
|
3338
3338
|
...historyItemsElement[0],
|
|
3339
3339
|
icon: historyItemsElement[0].icon ?? Codicon.files,
|
|
3340
|
-
message: ( localize(
|
|
3340
|
+
message: ( localize(6737, "All Changes")),
|
|
3341
3341
|
historyItemGroup: element,
|
|
3342
3342
|
type: 'allChanges'
|
|
3343
3343
|
});
|
|
@@ -3522,25 +3522,25 @@ let SCMTreeDataSource = class SCMTreeDataSource extends Disposable {
|
|
|
3522
3522
|
}
|
|
3523
3523
|
const historyItemGroups = await this.historyProviderDataSource.getHistoryItemGroups(inputOrElement);
|
|
3524
3524
|
if (historyItemGroups.length > 0) {
|
|
3525
|
-
let label = ( localize(
|
|
3526
|
-
let ariaLabel = ( localize(
|
|
3525
|
+
let label = ( localize(6738, "Incoming/Outgoing"));
|
|
3526
|
+
let ariaLabel = ( localize(6739, "Incoming and outgoing changes"));
|
|
3527
3527
|
const incomingHistoryItems = historyItemGroups.find(g => g.direction === 'incoming');
|
|
3528
3528
|
const outgoingHistoryItems = historyItemGroups.find(g => g.direction === 'outgoing');
|
|
3529
3529
|
if (incomingHistoryItems && !outgoingHistoryItems) {
|
|
3530
|
-
label = ( localize(
|
|
3531
|
-
ariaLabel = ( localize(
|
|
3530
|
+
label = ( localize(6740, "Incoming"));
|
|
3531
|
+
ariaLabel = ( localize(6741, "Incoming changes"));
|
|
3532
3532
|
}
|
|
3533
3533
|
else if (!incomingHistoryItems && outgoingHistoryItems) {
|
|
3534
|
-
label = ( localize(
|
|
3535
|
-
ariaLabel = ( localize(
|
|
3534
|
+
label = ( localize(6742, "Outgoing"));
|
|
3535
|
+
ariaLabel = ( localize(6743, "Outgoing changes"));
|
|
3536
3536
|
}
|
|
3537
3537
|
children.push({ label, ariaLabel, repository: inputOrElement, type: 'separator' });
|
|
3538
3538
|
}
|
|
3539
3539
|
children.push(...historyItemGroups);
|
|
3540
3540
|
const historyItems = await this.historyProviderDataSource.getHistoryItems2(inputOrElement);
|
|
3541
3541
|
if (historyItems.length > 0) {
|
|
3542
|
-
const label = ( localize(
|
|
3543
|
-
const ariaLabel = ( localize(
|
|
3542
|
+
const label = ( localize(6738, "Incoming/Outgoing"));
|
|
3543
|
+
const ariaLabel = ( localize(6739, "Incoming and outgoing changes"));
|
|
3544
3544
|
children.push({ label, ariaLabel, repository: inputOrElement, type: 'separator' });
|
|
3545
3545
|
}
|
|
3546
3546
|
children.push(...historyItems);
|
|
@@ -28,7 +28,7 @@ let SCMViewPaneContainer = class SCMViewPaneContainer extends ViewPaneContainer
|
|
|
28
28
|
return 400;
|
|
29
29
|
}
|
|
30
30
|
getTitle() {
|
|
31
|
-
return ( localize(
|
|
31
|
+
return ( localize(6645, "Source Control"));
|
|
32
32
|
}
|
|
33
33
|
getActionsContext() {
|
|
34
34
|
return this.scmViewService.visibleRepositories.length === 1 ? this.scmViewService.visibleRepositories[0].provider : undefined;
|