Merge branch 'bugfix-149' of github.com:bcbcarl/learnGitBranching into zh-tw-2

solve the issue 149

src/js/commands/index.js

@@ -190,7 +190,7 @@ CommandOptionParser.prototype.explodeAndSet = function() {
       var next = exploded[i + 1];
       var optionArgs = [];
       if (next && next.slice(0,1) !== '-') {
-        // only store the next argument as this 
+        // only store the next argument as this
         // option value if its not another option
         i++;
         optionArgs = [next];

src/js/git/commands.js

@@ -620,7 +620,7 @@ var commandConfig = {
 
       var args = null;
       if (commandOptions['-b']) {
-        // the user is really trying to just make a 
+        // the user is really trying to just make a
         // branch and then switch to it. so first:
         args = commandOptions['-b'].concat(generalArgs);
         command.twoArgsImpliedHead(args, '-b');

src/js/mercurial/commands.js

@@ -58,14 +58,8 @@ var commandConfig = {
       '-r'
     ],
     delegate: function(engine, command) {
+      command.acceptNoGeneralArgs();
       command.prependOptionR();
-      var options = command.getOptionsMap();
-      if (!options['-r']) {
-        throw new GitError({
-          msg: intl.str('git-error-options')
-        });
-      }
-      command.setGeneralArgs(options['-r']);
       return {
         vcs: 'git',
         name: 'cherrypick'
@@ -140,7 +134,7 @@ var commandConfig = {
         if (options['-r']) {
           // we specified a revision with -r but
           // need to flip the order
-          var generalArgs = command.getGeneralArgs();
+          generalArgs = command.getGeneralArgs();
           branchName = generalArgs[0];
           rev = options['-r'][0];
           delegate.name = 'branch';

src/js/util/constants.js

@@ -25,7 +25,7 @@ var GRAPHICS = {
   defaultEasing: 'easeInOut',
   defaultAnimationTime: 400,
 
-  rectFill: 'hsb(0.8816909813322127,0.7,1)',
+  rectFill: 'hsb(0.8816909813322127,0.6,1)',
   headRectFill: '#2831FF',
   rectStroke: '#FFF',
   rectStrokeWidth: '3',
@@ -42,7 +42,7 @@ var GRAPHICS = {
   visBranchStrokeWidth: 2,
   visBranchStrokeColorNone: '#333',
 
-  defaultNodeFill: 'hsba(0.5,0.8,0.7,1)',
+  defaultNodeFill: 'hsba(0.5,0.6,0.7,1)',
   defaultNodeStrokeWidth: 2,
   defaultNodeStroke: '#FFF',
 

src/js/visuals/visBranch.js

@@ -7,7 +7,7 @@ var TreeCompare = require('../graph/treeCompare');
 
 var randomHueString = function() {
   var hue = Math.random();
-  var str = 'hsb(' + String(hue) + ',0.7,1)';
+  var str = 'hsb(' + String(hue) + ',0.6,1)';
   return str;
 };