Merge commit 'refs/pull/81982/head' of github.com:microsoft/vscode into pr/81982

This commit is contained in:
João Moreno
2020-04-20 14:25:59 +02:00
3 changed files with 16 additions and 0 deletions
+6
View File
@@ -1663,6 +1663,12 @@
"default": "mixed",
"description": "%config.untrackedChanges%",
"scope": "resource"
},
"git.showCommitInput": {
"type": "boolean",
"scope": "resource",
"default": true,
"description": "%config.showCommitInput%"
}
}
},
+1
View File
@@ -143,6 +143,7 @@
"config.untrackedChanges.mixed": "All changes, tracked and untracked, appear together and behave equally.",
"config.untrackedChanges.separate": "Untracked changes appear separately in the Source Control view. They are also excluded from several actions.",
"config.untrackedChanges.hidden": "Untracked changes are hidden and excluded from several actions.",
"config.showCommitInput": "Controls whether to show the commit input in the Git source control panel.",
"colors.added": "Color for added resources.",
"colors.modified": "Color for modified resources.",
"colors.deleted": "Color for deleted resources.",
+9
View File
@@ -743,6 +743,15 @@ export class Repository implements Disposable {
const onConfigListenerForUntracked = filterEvent(workspace.onDidChangeConfiguration, e => e.affectsConfiguration('git.untrackedChanges', root));
onConfigListenerForUntracked(this.updateModelState, this, this.disposables);
const updateInputBoxVisibility = () => {
const config = workspace.getConfiguration('git', root);
this._sourceControl.inputBox.visible = config.get<boolean>('showCommitInput', true);
};
const onConfigListenerForInputBoxVisibility = filterEvent(workspace.onDidChangeConfiguration, e => e.affectsConfiguration('git.showCommitInput', root));
onConfigListenerForInputBoxVisibility(updateInputBoxVisibility, this, this.disposables);
updateInputBoxVisibility();
this.mergeGroup.hideWhenEmpty = true;
this.untrackedGroup.hideWhenEmpty = true;