diff --git a/src/commandline.js b/src/commandline.js index f14b88b8..7d57bc56 100644 --- a/src/commandline.js +++ b/src/commandline.js @@ -122,7 +122,6 @@ function OptionParser(method, options) { this.options = options; this.supportedMap = this.getMasterOptionMap()[method]; - this.unsupportedOptions = []; if (this.supportedMap === undefined) { throw new Error('No option map for ' + method); @@ -167,7 +166,8 @@ OptionParser.prototype.explodeAndSet = function() { if (this.supportedMap[option] !== undefined) { this.supportedMap[option] = true; } else { - this.unsupportedOptions.push(option); + // this option is not supported + throw new CommandProcessError('The option "' + option + '" is not supported'); } }, this); // done! diff --git a/src/git.js b/src/git.js index 15b58ce3..f648657e 100644 --- a/src/git.js +++ b/src/git.js @@ -206,8 +206,11 @@ GitEngine.prototype.numBackFrom = function(commit, numBack) { }; GitEngine.prototype.checkout = function(idOrTarget) { + console.log('the target', idOrTarget); var target = this.resolveId(idOrTarget); + console.log(target); if (target.get('id') === 'HEAD') { + // git checkout HEAD is a // meaningless command but i used to do this back in the day return; } @@ -253,6 +256,7 @@ GitEngine.prototype.deleteBranch = function(name) { GitEngine.prototype.dispatch = function(commandObj) { // TODO: parse arguments as well + console.log(commandObj); this[commandObj.method](); }; @@ -333,12 +337,11 @@ var Commit = Backbone.Model.extend({ }, addNodeToVisuals: function() { - // TODO: arbor stuff - // this.set('node', sys.addNode(this.get('id'))); + this.set('arborNode', sys.addNode(this.get('id'))); }, addEdgeToVisuals: function(parent) { - + sys.addEdge(this.get('arborNode'), parent.get('arborNode')); }, initialize: function() { diff --git a/src/style/main.css b/src/style/main.css index df585acc..892f16c8 100644 --- a/src/style/main.css +++ b/src/style/main.css @@ -39,7 +39,7 @@ p.commandResult { color: blue; } -p.commandError { +p.commandError, p.errorResult { color: red; }