From 7ac852dae56024723399bf8414f87dd8660e9eea Mon Sep 17 00:00:00 2001 From: Peter Cottle Date: Sun, 8 Dec 2013 10:36:19 -0800 Subject: [PATCH 1/6] package.json update and .gitignore --- .gitignore | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index c427bb84..4cbb205f 100644 --- a/.gitignore +++ b/.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 diff --git a/package.json b/package.json index 4e547ab6..07213033 100644 --- a/package.json +++ b/package.json @@ -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" From 598f8263b32321932b5e9af1bd12bec19d9adf50 Mon Sep 17 00:00:00 2001 From: Peter Cottle Date: Sun, 8 Dec 2013 10:37:10 -0800 Subject: [PATCH 2/6] whitespace warnings --- src/js/commands/index.js | 2 +- src/js/git/commands.js | 2 +- src/js/mercurial/commands.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/js/commands/index.js b/src/js/commands/index.js index fbe26316..a6045417 100644 --- a/src/js/commands/index.js +++ b/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]; diff --git a/src/js/git/commands.js b/src/js/git/commands.js index 911b1ab8..c2676020 100644 --- a/src/js/git/commands.js +++ b/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'); diff --git a/src/js/mercurial/commands.js b/src/js/mercurial/commands.js index c69d33c3..27729cdd 100644 --- a/src/js/mercurial/commands.js +++ b/src/js/mercurial/commands.js @@ -140,7 +140,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'; From 940e7eda6baadd5cdcacc731b8326134a01a4cb9 Mon Sep 17 00:00:00 2001 From: Peter Cottle Date: Sun, 8 Dec 2013 10:39:31 -0800 Subject: [PATCH 3/6] readme update for Issue #149 --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8223b910..93e1ff8e 100644 --- a/README.md +++ b/README.md @@ -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 +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 From 3b19e96333f50298ef08a99d3ceee5baf809ba3a Mon Sep 17 00:00:00 2001 From: Peter Cottle Date: Sun, 8 Dec 2013 10:45:27 -0800 Subject: [PATCH 4/6] temp --- spec/mercurial.spec.js | 6 ++++++ src/js/mercurial/commands.js | 8 +------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spec/mercurial.spec.js b/spec/mercurial.spec.js index e204d0a6..d02162ef 100644 --- a/spec/mercurial.spec.js +++ b/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' + ); + }); diff --git a/src/js/mercurial/commands.js b/src/js/mercurial/commands.js index 27729cdd..5bd6461c 100644 --- a/src/js/mercurial/commands.js +++ 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' From 1908e533d0cbd989288d0f9c1672c2698290cbcb Mon Sep 17 00:00:00 2001 From: Peter Cottle Date: Sun, 8 Dec 2013 10:52:00 -0800 Subject: [PATCH 5/6] Turn down saturation a bit Resolves #148 --- src/js/util/constants.js | 4 ++-- src/js/visuals/visBranch.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/js/util/constants.js b/src/js/util/constants.js index c2a43261..b3ba9c5a 100644 --- a/src/js/util/constants.js +++ b/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', diff --git a/src/js/visuals/visBranch.js b/src/js/visuals/visBranch.js index ce5d4d21..803a0173 100644 --- a/src/js/visuals/visBranch.js +++ b/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; }; From 378deb57fac6a7853aff9f470dfbfb19c692c71a Mon Sep 17 00:00:00 2001 From: "Carl X. Su" Date: Tue, 10 Dec 2013 22:25:32 +0800 Subject: [PATCH 6/6] Fix Issue #149 --- README.md | 4 ++-- package.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 93e1ff8e..b10ba8ae 100644 --- a/README.md +++ b/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 @@ -72,7 +72,7 @@ git checkout -b newAwesomeFeature # 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 # build runs the tests and lint as well +./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 diff --git a/package.json b/package.json index 07213033..23d7934b 100644 --- a/package.json +++ b/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",