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

add a vcs level to the option map

Browse source
This commit is contained in:
Siddharth Agarwal 2013-07-31 00:06:47 -07:00
parent d3f933ff2d
commit 3abe620cf1
2 changed files with 18 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

62
build/bundle.js
View file

@ -9903,15 +9903,15 @@ var commands = {
}, },
getOptionMap: function() { getOptionMap: function() {
var optionMap = {}; var optionMap = {'git': {}};
this.loop(function(config, name) { this.loop(function(config, name, vcs) {
var displayName = config.displayName || name; var displayName = config.displayName || name;
var thisMap = {}; var thisMap = {};
// start all options off as disabled // start all options off as disabled
_.each(config.options, function(option) { _.each(config.options, function(option) {
thisMap[option] = false; thisMap[option] = false;
}); });
optionMap[displayName] = thisMap; optionMap[vcs][displayName] = thisMap;
}); });
return optionMap; return optionMap;
}, },
@ -10403,7 +10403,7 @@ var instantCommands = [
intl.str('git-supported-commands'), intl.str('git-supported-commands'),
'<br/>' '<br/>'
]; ];
var commands = commands.getOptionMap(); var commands = commands.getOptionMap()['git'];
// build up a nice display of what we support // build up a nice display of what we support
_.each(commands, function(commandOptions, command) { _.each(commands, function(commandOptions, command) {
lines.push('git ' + command); lines.push('git ' + command);
@ -10430,7 +10430,7 @@ var parse = function(str) {
_.each(commands.getRegexMap(), function(regex, thisMethod) { _.each(commands.getRegexMap(), function(regex, thisMethod) {
if (regex.exec(str)) { if (regex.exec(str)) {
vcs = 'git'; // XXX get from regex map vcs = 'git'; // XXX get from regex map
options = str.slice(vcs.length + 1 + thisMethod.length + 1); options = str.slice(thisMethod.length + 1);
method = thisMethod.slice(vcs.length + 1); method = thisMethod.slice(vcs.length + 1);
} }
}); });
@ -10441,7 +10441,7 @@ var parse = function(str) {
// we support this command! // we support this command!
// parse off the options and assemble the map / general args // parse off the options and assemble the map / general args
var parsedOptions = new CommandOptionParser(method, options); var parsedOptions = new CommandOptionParser(vcs, method, options);
return { return {
toSet: { toSet: {
generalArgs: parsedOptions.generalArgs, generalArgs: parsedOptions.generalArgs,
@ -10457,11 +10457,12 @@ var parse = function(str) {
/** /**
* CommandOptionParser * CommandOptionParser
*/ */
function CommandOptionParser(method, options) { function CommandOptionParser(vcs, method, options) {
this.vcs = vcs;
this.method = method; this.method = method;
this.rawOptions = options; this.rawOptions = options;
this.supportedMap = commands.getOptionMap()[method]; this.supportedMap = commands.getOptionMap()[vcs][method];
if (this.supportedMap === undefined) { if (this.supportedMap === undefined) {
throw new Error('No option map for ' + method); throw new Error('No option map for ' + method);
} }
@ -10470,20 +10471,6 @@ function CommandOptionParser(method, options) {
this.explodeAndSet(); this.explodeAndSet();
} }
var optionMap = {};
commands.loop(function(config, name) {
var displayName = config.displayName || name;
if (optionMap[displayName] !== undefined) {
return;
}
var thisMap = {};
_.each(config.options, function(option) {
thisMap[option] = false;
});
optionMap[displayName] = thisMap;
});
CommandOptionParser.prototype.explodeAndSet = function() { CommandOptionParser.prototype.explodeAndSet = function() {
// TODO -- this is ugly // TODO -- this is ugly
// split on spaces, except when inside quotes // split on spaces, except when inside quotes
@ -23802,15 +23789,15 @@ var commands = {
}, },
getOptionMap: function() { getOptionMap: function() {
var optionMap = {}; var optionMap = {'git': {}};
this.loop(function(config, name) { this.loop(function(config, name, vcs) {
var displayName = config.displayName || name; var displayName = config.displayName || name;
var thisMap = {}; var thisMap = {};
// start all options off as disabled // start all options off as disabled
_.each(config.options, function(option) { _.each(config.options, function(option) {
thisMap[option] = false; thisMap[option] = false;
}); });
optionMap[displayName] = thisMap; optionMap[vcs][displayName] = thisMap;
}); });
return optionMap; return optionMap;
}, },
@ -24302,7 +24289,7 @@ var instantCommands = [
intl.str('git-supported-commands'), intl.str('git-supported-commands'),
'<br/>' '<br/>'
]; ];
var commands = commands.getOptionMap(); var commands = commands.getOptionMap()['git'];
// build up a nice display of what we support // build up a nice display of what we support
_.each(commands, function(commandOptions, command) { _.each(commands, function(commandOptions, command) {
lines.push('git ' + command); lines.push('git ' + command);
@ -24329,7 +24316,7 @@ var parse = function(str) {
_.each(commands.getRegexMap(), function(regex, thisMethod) { _.each(commands.getRegexMap(), function(regex, thisMethod) {
if (regex.exec(str)) { if (regex.exec(str)) {
vcs = 'git'; // XXX get from regex map vcs = 'git'; // XXX get from regex map
options = str.slice(vcs.length + 1 + thisMethod.length + 1); options = str.slice(thisMethod.length + 1);
method = thisMethod.slice(vcs.length + 1); method = thisMethod.slice(vcs.length + 1);
} }
}); });
@ -24340,7 +24327,7 @@ var parse = function(str) {
// we support this command! // we support this command!
// parse off the options and assemble the map / general args // parse off the options and assemble the map / general args
var parsedOptions = new CommandOptionParser(method, options); var parsedOptions = new CommandOptionParser(vcs, method, options);
return { return {
toSet: { toSet: {
generalArgs: parsedOptions.generalArgs, generalArgs: parsedOptions.generalArgs,
@ -24356,11 +24343,12 @@ var parse = function(str) {
/** /**
* CommandOptionParser * CommandOptionParser
*/ */
function CommandOptionParser(method, options) { function CommandOptionParser(vcs, method, options) {
this.vcs = vcs;
this.method = method; this.method = method;
this.rawOptions = options; this.rawOptions = options;
this.supportedMap = commands.getOptionMap()[method]; this.supportedMap = commands.getOptionMap()[vcs][method];
if (this.supportedMap === undefined) { if (this.supportedMap === undefined) {
throw new Error('No option map for ' + method); throw new Error('No option map for ' + method);
} }
@ -24369,20 +24357,6 @@ function CommandOptionParser(method, options) {
this.explodeAndSet(); this.explodeAndSet();
} }
var optionMap = {};
commands.loop(function(config, name) {
var displayName = config.displayName || name;
if (optionMap[displayName] !== undefined) {
return;
}
var thisMap = {};
_.each(config.options, function(option) {
thisMap[option] = false;
});
optionMap[displayName] = thisMap;
});
CommandOptionParser.prototype.explodeAndSet = function() { CommandOptionParser.prototype.explodeAndSet = function() {
// TODO -- this is ugly // TODO -- this is ugly
// split on spaces, except when inside quotes // split on spaces, except when inside quotes

14
src/js/git/commands.js
View file

@ -604,20 +604,6 @@ function CommandOptionParser(vcs, method, options) {
this.explodeAndSet(); this.explodeAndSet();
} }
var optionMap = {};
commands.loop(function(config, name) {
var displayName = config.displayName || name;
if (optionMap[displayName] !== undefined) {
return;
}
var thisMap = {};
_.each(config.options, function(option) {
thisMap[option] = false;
});
optionMap[displayName] = thisMap;
});
CommandOptionParser.prototype.explodeAndSet = function() { CommandOptionParser.prototype.explodeAndSet = function() {
// TODO -- this is ugly // TODO -- this is ugly
// split on spaces, except when inside quotes // split on spaces, except when inside quotes