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

solve the issue 149

.gitignore

@@ -4,6 +4,7 @@ build/bundle.js
 build/bundle.*.js
 build/main.*.css
 screens
+.DS_STORE
 search_replace.sh
 FontAwesome-Vectors.pdf
 index.html

README.md

@@ -52,7 +52,7 @@ Here is the high level process of the build:
 
 Thus, if you build the app locally, all you have to do in order to run the app is just open up `index.html` in the root directory of the repo. Pretty simple
 
-## Building yourself / Contributing Functionality 
+## Building yourself / Contributing Functionality
 
 For contributing core functionality in the app, you'll probably want to test your changes
 at least once before submitting a pull request. That means you'll need the `grunt` build tool. It's a fairly
@@ -68,10 +68,11 @@ cd learnGitBranching
 npm install # to install all the node modules I depend on
 git checkout -b newAwesomeFeature
 # some changes
-grunt build # now you can open up your browser to the index.html and see your changes
+./node_modules/grunt/bin/grunt fastBuild # to use the npm version of grunt
+# after building you can open up your browser to the index.html that is generated and see your changes
 grunt watch # will keep watch over files and fastBuild whenever they change. lot of CPU though
 # more changes
-grunt build
+./node_modules/grunt/bin/grunt build # build runs the tests and lint as well
 git commit -am "My new sweet feature!"
 git push
 # go online and request a pull

package.json

@@ -3,10 +3,10 @@
   "version": "0.5.0",
   "devDependencies": {
     "grunt": "~0.3.17",
-    "jasmine-node": "~1.0.28",
+    "jasmine-node": "~1.11.0",
     "grunt-browserify": "0.1.1",
     "grunt-jslint": "~0.2.2-1",
-    "grunt-jasmine-node": "0.0.6",
+    "grunt-jasmine-node": "0.1.0",
     "grunt-hash": "0.2.2",
     "grunt-rm": "~0.0.3",
     "grunt-shell": "0.1.4",
@@ -15,7 +15,7 @@
   "dependencies": {
     "backbone": "~0.9.9",
     "underscore": "~1.4.3",
-    "jquery": "~1.8.3",
+    "jquery": "~1.7.3",
     "q": "~0.8.11",
     "markdown": "~0.4.0",
     "grunt-shell": "~0.1.4"

spec/mercurial.spec.js

@@ -56,5 +56,11 @@ describe('Mercurial', function() {
     '%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C2%22%2C%22id%22%3A%22master%22%7D%2C%22feature%22%3A%7B%22target%22%3A%22C4%22%2C%22id%22%3A%22feature%22%7D%2C%22debug%22%3A%7B%22target%22%3A%22C3%27%22%2C%22id%22%3A%22debug%22%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C2%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%22%7D%2C%22C4%22%3A%7B%22parents%22%3A%5B%22C3%27%22%5D%2C%22id%22%3A%22C4%22%7D%2C%22C3%27%22%3A%7B%22parents%22%3A%5B%22C2%22%5D%2C%22id%22%3A%22C3%27%22%7D%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22debug%22%2C%22id%22%3A%22HEAD%22%7D%7D'
   );
 
+  assert(
+    'grafts commits down',
+    'hg book foo;hg commit; hg update master; hg commit;hg graft -r C2;hg update foo; hg graft -r C3',
+    '%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C2%27%22%2C%22id%22%3A%22master%22%2C%22remoteTrackingBranchID%22%3Anull%7D%2C%22foo%22%3A%7B%22target%22%3A%22C3%27%22%2C%22id%22%3A%22foo%22%2C%22remoteTrackingBranchID%22%3Anull%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C2%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%22%7D%2C%22C3%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C3%22%7D%2C%22C2%27%22%3A%7B%22parents%22%3A%5B%22C3%22%5D%2C%22id%22%3A%22C2%27%22%7D%2C%22C3%27%22%3A%7B%22parents%22%3A%5B%22C2%22%5D%2C%22id%22%3A%22C3%27%22%7D%7D%2C%22tags%22%3A%7B%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22foo%22%2C%22id%22%3A%22HEAD%22%7D%7D'
+  );
+
 });
 

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;
 };