mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-08-21 01:59:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge main

Browse source
This commit is contained in:
Peter Cottle 2021-06-11 09:33:31 -06:00
commit 32220d2126
2 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/js/sandbox/commands.js
View file

@ -115,6 +115,20 @@ var instantCommands = [
}], }],
[/^show +commands$/, function(bits) { [/^show +commands$/, function(bits) {
var allCommands = getAllCommands(); var allCommands = getAllCommands();
var allOptions = Commands.commands.getOptionMap();
var commandToOptions = {};
Object.keys(allOptions).forEach(function(vcs) {
var vcsMap = allOptions[vcs];
Object.keys(vcsMap).forEach(function(method) {
var options = vcsMap[method];
if (options) {
commandToOptions[vcs + ' ' + method] = Object.keys(options).filter(option => option.length > 1);
}
});
});
var lines = [ var lines = [
intl.str('show-all-commands'), intl.str('show-all-commands'),
'<br/>' '<br/>'
@ -122,6 +136,9 @@ var instantCommands = [
Object.keys(allCommands) Object.keys(allCommands)
.forEach(function(command) { .forEach(function(command) {
lines.push(command); lines.push(command);
if (commandToOptions[command]) {
commandToOptions[command].forEach(option => lines.push('&nbsp;&nbsp;&nbsp;&nbsp;' + option));
}
}); });
throw new CommandResult({ throw new CommandResult({

6
yarn.lock
View file

@ -3338,9 +3338,9 @@ normalize-path@^3.0.0:
integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
normalize-url@^4.1.0: normalize-url@^4.1.0:
version "4.5.0" version "4.5.1"
resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz#453354087e6ca96957bd8f5baf753f5982142129" resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a"
integrity sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ== integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==
now-and-later@^2.0.0: now-and-later@^2.0.0:
version "2.0.1" version "2.0.1"