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

before tests

Browse source
This commit is contained in:
Peter Cottle 2012-12-17 10:31:28 -08:00
parent f34c606d87
commit 565142048c
4 changed files with 20 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

24
build/bundle.js
View file

@ -5174,12 +5174,6 @@ var CommandEntryCollection = Backbone.Collection.extend({
localStorage: (Backbone.LocalStorage) ? new Backbone.LocalStorage('CommandEntries') : null localStorage: (Backbone.LocalStorage) ? new Backbone.LocalStorage('CommandEntries') : null
}); });
if (Backbone.LocalStorage) {
console.log('local storage there');
} else {
console.log('not htere');
}
var CommandBuffer = Backbone.Model.extend({ var CommandBuffer = Backbone.Model.extend({
defaults: { defaults: {
collection: null collection: null
@ -7619,7 +7613,7 @@ var Command = Backbone.Model.extend({
return { return {
'git commit': /^gc($|\s)/, 'git commit': /^gc($|\s)/,
'git add': /^ga($|\s)/, 'git add': /^ga($|\s)/,
'git checkout': /^gchk($|\s)/, 'git checkout': /^go($|\s)/,
'git rebase': /^gr($|\s)/, 'git rebase': /^gr($|\s)/,
'git branch': /^gb($|\s)/ 'git branch': /^gb($|\s)/
}; };
@ -7727,6 +7721,7 @@ var Command = Backbone.Model.extend({
var regex = tuple[0]; var regex = tuple[0];
var results = regex.exec(str); var results = regex.exec(str);
if (results) { if (results) {
// this will throw a result
tuple[1](results); tuple[1](results);
} }
}); });
@ -7738,7 +7733,8 @@ var Command = Backbone.Model.extend({
if (results) { if (results) {
str = method + ' ' + str.slice(results[0].length); str = method + ' ' + str.slice(results[0].length);
} }
}); this.set('rawStr', str);
}, this);
// see if begins with git // see if begins with git
if (str.slice(0,3) !== 'git') { if (str.slice(0,3) !== 'git') {
@ -11372,12 +11368,6 @@ var CommandEntryCollection = Backbone.Collection.extend({
localStorage: (Backbone.LocalStorage) ? new Backbone.LocalStorage('CommandEntries') : null localStorage: (Backbone.LocalStorage) ? new Backbone.LocalStorage('CommandEntries') : null
}); });
if (Backbone.LocalStorage) {
console.log('local storage there');
} else {
console.log('not htere');
}
var CommandBuffer = Backbone.Model.extend({ var CommandBuffer = Backbone.Model.extend({
defaults: { defaults: {
collection: null collection: null
@ -11579,7 +11569,7 @@ var Command = Backbone.Model.extend({
return { return {
'git commit': /^gc($|\s)/, 'git commit': /^gc($|\s)/,
'git add': /^ga($|\s)/, 'git add': /^ga($|\s)/,
'git checkout': /^gchk($|\s)/, 'git checkout': /^go($|\s)/,
'git rebase': /^gr($|\s)/, 'git rebase': /^gr($|\s)/,
'git branch': /^gb($|\s)/ 'git branch': /^gb($|\s)/
}; };
@ -11687,6 +11677,7 @@ var Command = Backbone.Model.extend({
var regex = tuple[0]; var regex = tuple[0];
var results = regex.exec(str); var results = regex.exec(str);
if (results) { if (results) {
// this will throw a result
tuple[1](results); tuple[1](results);
} }
}); });
@ -11698,7 +11689,8 @@ var Command = Backbone.Model.extend({
if (results) { if (results) {
str = method + ' ' + str.slice(results[0].length); str = method + ' ' + str.slice(results[0].length);
} }
}); this.set('rawStr', str);
}, this);
// see if begins with git // see if begins with git
if (str.slice(0,3) !== 'git') { if (str.slice(0,3) !== 'git') {

6
src/js/models/collections.js
View file

@ -33,12 +33,6 @@ var CommandEntryCollection = Backbone.Collection.extend({
localStorage: (Backbone.LocalStorage) ? new Backbone.LocalStorage('CommandEntries') : null localStorage: (Backbone.LocalStorage) ? new Backbone.LocalStorage('CommandEntries') : null
}); });
if (Backbone.LocalStorage) {
console.log('local storage there');
} else {
console.log('not htere');
}
var CommandBuffer = Backbone.Model.extend({ var CommandBuffer = Backbone.Model.extend({
defaults: { defaults: {
collection: null collection: null

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

@ -116,7 +116,7 @@ var Command = Backbone.Model.extend({
return { return {
'git commit': /^gc($|\s)/, 'git commit': /^gc($|\s)/,
'git add': /^ga($|\s)/, 'git add': /^ga($|\s)/,
'git checkout': /^gchk($|\s)/, 'git checkout': /^go($|\s)/,
'git rebase': /^gr($|\s)/, 'git rebase': /^gr($|\s)/,
'git branch': /^gb($|\s)/ 'git branch': /^gb($|\s)/
}; };
@ -224,6 +224,7 @@ var Command = Backbone.Model.extend({
var regex = tuple[0]; var regex = tuple[0];
var results = regex.exec(str); var results = regex.exec(str);
if (results) { if (results) {
// this will throw a result
tuple[1](results); tuple[1](results);
} }
}); });
@ -235,7 +236,8 @@ var Command = Backbone.Model.extend({
if (results) { if (results) {
str = method + ' ' + str.slice(results[0].length); str = method + ' ' + str.slice(results[0].length);
} }
}); this.set('rawStr', str);
}, this);
// see if begins with git // see if begins with git
if (str.slice(0,3) !== 'git') { if (str.slice(0,3) !== 'git') {

15
todo.txt
View file

@ -3,12 +3,13 @@ Big things:
Big Graphic things: Big Graphic things:
~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~
- better dialog support (above / below the fold) [ ] better dialog support (above / below the fold)
Medium things: Medium things:
~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
- gitEngine loads from tree immediately, not the weird thing we have now! [ ] gitEngine loads from tree immediately, not the weird thing we have now!
- headless Git for testing (send it commands and expected trees) [.] headless Git for testing (send it commands and expected trees)
[.] few tests
Small things to implement: Small things to implement:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -25,8 +26,8 @@ Big Bugs to fix:
- cross browser support... ? - cross browser support... ?
- fix terminal input when extra long - fix terminal input when extra long
2013 Things Done things:
~~~~~~~~~~~~~~~~~~~~~~~~~~~ (I only started this on Dec 17th 2012 to get a better sense of what was done)
Tree layout with the layout engine provided in d3.js, that white-paper algorithm. Only tricky thing is that merge commits mess up the "tree" aspect and it doesn't directly support weighting, but I can probably throw that in. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Would require mixing both algorthims and probably some real time dedication [x] aliases replace when put into commands