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

changed SupportedMap to OptionsMap

Browse source
This commit is contained in:
Peter Cottle 2013-08-04 13:30:08 -07:00
parent bf132f8f09
commit 4a41fbeba4
4 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/js/commands/index.js
View file

@ -36,7 +36,7 @@ var commands = {
// a different command at each step // a different command at each step
_.each(result.multiDelegate, function(delConfig) { _.each(result.multiDelegate, function(delConfig) {
// copy command, and then set opts // copy command, and then set opts
commandObj.setSupportedMap(delConfig.options || {}); commandObj.setOptionsMap(delConfig.options || {});
commandObj.setGeneralArgs(delConfig.args || []); commandObj.setGeneralArgs(delConfig.args || []);
commandConfigs[delConfig.vcs][delConfig.name].execute.call(this, engine, commandObj); commandConfigs[delConfig.vcs][delConfig.name].execute.call(this, engine, commandObj);

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

@ -18,7 +18,7 @@ var commandConfig = {
'-m' '-m'
], ],
execute: function(engine, command) { execute: function(engine, command) {
var commandOptions = command.getSupportedMap(); var commandOptions = command.getOptionsMap();
command.acceptNoGeneralArgs(); command.acceptNoGeneralArgs();
if (commandOptions['-am'] && ( if (commandOptions['-am'] && (
@ -70,7 +70,7 @@ var commandConfig = {
displayName: 'cherry-pick', displayName: 'cherry-pick',
regex: /^git +cherry-pick($|\s)/, regex: /^git +cherry-pick($|\s)/,
execute: function(engine, command) { execute: function(engine, command) {
var commandOptions = command.getSupportedMap(); var commandOptions = command.getOptionsMap();
var generalArgs = command.getGeneralArgs(); var generalArgs = command.getGeneralArgs();
command.validateArgBounds(generalArgs, 1, Number.MAX_VALUE); command.validateArgBounds(generalArgs, 1, Number.MAX_VALUE);
@ -107,7 +107,7 @@ var commandConfig = {
}); });
} }
var commandOptions = command.getSupportedMap(); var commandOptions = command.getOptionsMap();
command.acceptNoGeneralArgs(); command.acceptNoGeneralArgs();
engine.pull({ engine.pull({
isRebase: commandOptions['--rebase'] isRebase: commandOptions['--rebase']
@ -176,7 +176,7 @@ var commandConfig = {
'--contains' '--contains'
], ],
execute: function(engine, command) { execute: function(engine, command) {
var commandOptions = command.getSupportedMap(); var commandOptions = command.getOptionsMap();
var generalArgs = command.getGeneralArgs(); var generalArgs = command.getGeneralArgs();
var args = null; var args = null;
@ -244,7 +244,7 @@ var commandConfig = {
'--soft' '--soft'
], ],
execute: function(engine, command) { execute: function(engine, command) {
var commandOptions = command.getSupportedMap(); var commandOptions = command.getOptionsMap();
var generalArgs = command.getGeneralArgs(); var generalArgs = command.getGeneralArgs();
if (commandOptions['--soft']) { if (commandOptions['--soft']) {
@ -344,7 +344,7 @@ var commandConfig = {
], ],
regex: /^git +rebase($|\s)/, regex: /^git +rebase($|\s)/,
execute: function(engine, command) { execute: function(engine, command) {
var commandOptions = command.getSupportedMap(); var commandOptions = command.getOptionsMap();
var generalArgs = command.getGeneralArgs(); var generalArgs = command.getGeneralArgs();
if (commandOptions['-i']) { if (commandOptions['-i']) {
@ -383,7 +383,7 @@ var commandConfig = {
'-' '-'
], ],
execute: function(engine, command) { execute: function(engine, command) {
var commandOptions = command.getSupportedMap(); var commandOptions = command.getOptionsMap();
var generalArgs = command.getGeneralArgs(); var generalArgs = command.getGeneralArgs();
var args = null; var args = null;

18
src/js/mercurial/commands.js
View file

@ -18,7 +18,7 @@ var commandConfig = {
'-m' '-m'
], ],
delegate: function(engine, command) { delegate: function(engine, command) {
var options = command.getSupportedMap(); var options = command.getOptionsMap();
if (options['-A']) { if (options['-A']) {
command.addWarning(intl.str('hg-a-option')); command.addWarning(intl.str('hg-a-option'));
} }
@ -59,7 +59,7 @@ var commandConfig = {
], ],
delegate: function(engine, command) { delegate: function(engine, command) {
command.appendOptionR(); command.appendOptionR();
var options = command.getSupportedMap(); var options = command.getOptionsMap();
if (!options['-r']) { if (!options['-r']) {
throw new GitError({ throw new GitError({
msg: intl.str('git-error-options') msg: intl.str('git-error-options')
@ -80,7 +80,7 @@ var commandConfig = {
], ],
dontCountForGolf: true, dontCountForGolf: true,
delegate: function(engine, command) { delegate: function(engine, command) {
var options = command.getSupportedMap(); var options = command.getOptionsMap();
command.acceptNoGeneralArgs(); command.acceptNoGeneralArgs();
if (!options['-f']) { if (!options['-f']) {
@ -104,7 +104,7 @@ var commandConfig = {
'-d' '-d'
], ],
delegate: function(engine, command) { delegate: function(engine, command) {
var options = command.getSupportedMap(); var options = command.getOptionsMap();
var generalArgs = command.getGeneralArgs(); var generalArgs = command.getGeneralArgs();
var branchName; var branchName;
var rev; var rev;
@ -145,7 +145,7 @@ var commandConfig = {
delegate.name = 'branch'; delegate.name = 'branch';
command.setGeneralArgs([branchName, rev]); command.setGeneralArgs([branchName, rev]);
} else if (generalArgs.length > 0) { } else if (generalArgs.length > 0) {
command.setSupportedMap({'-b': [generalArgs[0]]}); command.setOptionsMap({'-b': [generalArgs[0]]});
delegate.name = 'checkout'; delegate.name = 'checkout';
command.setGeneralArgs([]); command.setGeneralArgs([]);
} else { } else {
@ -171,7 +171,7 @@ var commandConfig = {
}); });
}; };
var options = command.getSupportedMap(); var options = command.getOptionsMap();
// if we have both OR if we have neither // if we have both OR if we have neither
if ((options['-d'] && options['-s']) || if ((options['-d'] && options['-s']) ||
(!options['-d'] && !options['-s'])) { (!options['-d'] && !options['-s'])) {
@ -181,9 +181,9 @@ var commandConfig = {
options['-b'] = ['.']; options['-b'] = ['.'];
} }
command.setSupportedMap(options); command.setOptionsMap(options);
command.mapDotToHead(); command.mapDotToHead();
options = command.getSupportedMap(); options = command.getOptionsMap();
if (options['-d']) { if (options['-d']) {
var dest = options['-d'][0] || throwE(); var dest = options['-d'][0] || throwE();
@ -229,7 +229,7 @@ var commandConfig = {
delegate: function(engine, command) { delegate: function(engine, command) {
var args = command.getGeneralArgs(); var args = command.getGeneralArgs();
command.validateArgBounds(args, 1, 1); command.validateArgBounds(args, 1, 1);
command.setSupportedMap({ command.setOptionsMap({
'-i': args '-i': args
}); });
command.setGeneralArgs([]); command.setGeneralArgs([]);

14
src/js/models/commandModel.js
View file

@ -61,7 +61,7 @@ var Command = Backbone.Model.extend({
* args for git * args for git
*/ */
appendOptionR: function() { appendOptionR: function() {
var rOptions = this.getSupportedMap()['-r'] || []; var rOptions = this.getOptionsMap()['-r'] || [];
this.setGeneralArgs( this.setGeneralArgs(
this.getGeneralArgs().concat(rOptions) this.getGeneralArgs().concat(rOptions)
); );
@ -69,7 +69,7 @@ var Command = Backbone.Model.extend({
mapDotToHead: function() { mapDotToHead: function() {
var generalArgs = this.getGeneralArgs(); var generalArgs = this.getGeneralArgs();
var options = this.getSupportedMap(); var options = this.getOptionsMap();
generalArgs = _.map(generalArgs, function(arg) { generalArgs = _.map(generalArgs, function(arg) {
return this.replaceDotWithHead(arg); return this.replaceDotWithHead(arg);
@ -81,15 +81,15 @@ var Command = Backbone.Model.extend({
}, this); }, this);
}, this); }, this);
this.setGeneralArgs(generalArgs); this.setGeneralArgs(generalArgs);
this.setSupportedMap(newMap); this.setOptionsMap(newMap);
}, },
deleteOptions: function(options) { deleteOptions: function(options) {
var map = this.getSupportedMap(); var map = this.getOptionsMap();
_.each(options, function(option) { _.each(options, function(option) {
delete map[option]; delete map[option];
}, this); }, this);
this.setSupportedMap(map); this.setOptionsMap(map);
}, },
getGeneralArgs: function() { getGeneralArgs: function() {
@ -100,11 +100,11 @@ var Command = Backbone.Model.extend({
this.set('generalArgs', args); this.set('generalArgs', args);
}, },
setSupportedMap: function(map) { setOptionsMap: function(map) {
this.set('supportedMap', map); this.set('supportedMap', map);
}, },
getSupportedMap: function() { getOptionsMap: function() {
return this.get('supportedMap'); return this.get('supportedMap');
}, },