mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-25 23:48:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

working on rebase datesortfunc

Browse source
This commit is contained in:
Peter Cottle 2013-01-03 15:03:49 -08:00
parent 984f139245
commit 1ec80eacf6
4 changed files with 45 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

50
build/bundle.js
View file

@ -4757,7 +4757,8 @@ var Level = Sandbox.extend({
this.goalTreeString = options.level.goalTree; this.goalTreeString = options.level.goalTree;
if (!this.goalTreeString) { if (!this.goalTreeString) {
console.warn('woah no goal, using random other one'); console.warn('woah no goal, using random other one');
this.goalTreeString = '{"branches":{"master":{"target":"C2","id":"master"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"master","id":"HEAD"}}'; this.goalTreeString = '{"branches":{"master":{"target":"C2","id":"master"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C30"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"master","id":"HEAD"}}';
//this.goalTreeString = '{"branches":{"master":{"target":"C2","id":"master"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"master","id":"HEAD"}}';
} }
Sandbox.prototype.initialize.apply(this, [options]); Sandbox.prototype.initialize.apply(this, [options]);
@ -7391,8 +7392,7 @@ GitEngine.prototype.numBackFrom = function(commit, numBack) {
// we use a special sorting function here that // we use a special sorting function here that
// prefers the later commits over the earlier ones // prefers the later commits over the earlier ones
var sortQueue = _.bind(function(queue) { var sortQueue = _.bind(function(queue) {
queue.sort(this.idSortFunc); queue.sort(this.dateSortFunc);
queue.reverse();
}, this); }, this);
var pQueue = [].concat(commit.get('parents') || []); var pQueue = [].concat(commit.get('parents') || []);
@ -7501,6 +7501,12 @@ GitEngine.prototype.idSortFunc = function(cA, cB) {
return getNumToSort(cA.get('id')) - getNumToSort(cB.get('id')); return getNumToSort(cA.get('id')) - getNumToSort(cB.get('id'));
}; };
GitEngine.prototype.dateSortFunc = function(cA, cB) {
var dateA = new Date(cA.get('createTime'));
var dateB = new Date(cB.get('createTime'));
return dateA - dateB;
};
GitEngine.prototype.rebaseInteractiveStarter = function() { GitEngine.prototype.rebaseInteractiveStarter = function() {
var args = this.commandOptions['-i']; var args = this.commandOptions['-i'];
this.twoArgsImpliedHead(args, ' -i'); this.twoArgsImpliedHead(args, ' -i');
@ -7573,8 +7579,8 @@ GitEngine.prototype.rebase = function(targetSource, currentLocation) {
// it's not in the set, so we need to rebase this commit // it's not in the set, so we need to rebase this commit
toRebaseRough.push(popped); toRebaseRough.push(popped);
toRebaseRough.sort(this.idSortFunc); toRebaseRough.sort(this.dateSortFunc);
toRebaseRough.reverse();
// keep searching // keep searching
pQueue = pQueue.concat(popped.get('parents')); pQueue = pQueue.concat(popped.get('parents'));
} }
@ -7610,10 +7616,10 @@ GitEngine.prototype.rebaseInteractive = function(targetSource, currentLocation)
toRebaseRough.push(popped); toRebaseRough.push(popped);
pQueue = pQueue.concat(popped.get('parents')); pQueue = pQueue.concat(popped.get('parents'));
pQueue.sort(this.idSortFunc); pQueue.sort(this.dateSortFunc);
} }
// throw our merge's real fast and see if we have anything to do // throw out merge's real fast and see if we have anything to do
var toRebase = []; var toRebase = [];
_.each(toRebaseRough, function(commit) { _.each(toRebaseRough, function(commit) {
if (commit.get('parents').length == 1) { if (commit.get('parents').length == 1) {
@ -7645,7 +7651,6 @@ GitEngine.prototype.rebaseInteractive = function(targetSource, currentLocation)
var animationData = this.rebaseFinish(userSpecifiedRebase, {}, targetSource, currentLocation); var animationData = this.rebaseFinish(userSpecifiedRebase, {}, targetSource, currentLocation);
this.animationFactory.rebaseAnimation(this.animationQueue, animationData, this, this.gitVisuals); this.animationFactory.rebaseAnimation(this.animationQueue, animationData, this, this.gitVisuals);
this.animationQueue.start(); this.animationQueue.start();
}, this)) }, this))
.fail(_.bind(function(err) { .fail(_.bind(function(err) {
this.filterError(err); this.filterError(err);
@ -8852,7 +8857,6 @@ var InteractiveRebaseView = ContainedBase.extend({
this.entryObjMap = {}; this.entryObjMap = {};
this.rebaseEntries = new RebaseEntryCollection(); this.rebaseEntries = new RebaseEntryCollection();
options.toRebase.reverse();
_.each(options.toRebase, function(commit) { _.each(options.toRebase, function(commit) {
var id = commit.get('id'); var id = commit.get('id');
this.rebaseMap[id] = commit; this.rebaseMap[id] = commit;
@ -8874,7 +8878,7 @@ var InteractiveRebaseView = ContainedBase.extend({
}, },
confirm: function() { confirm: function() {
this.hide(); this.die();
// get our ordering // get our ordering
var uiOrder = []; var uiOrder = [];
@ -8891,6 +8895,7 @@ var InteractiveRebaseView = ContainedBase.extend({
} }
}, this); }, this);
toRebase.reverse();
this.deferred.resolve(toRebase); this.deferred.resolve(toRebase);
// garbage collection will get us // garbage collection will get us
this.$el.html(''); this.$el.html('');
@ -16087,8 +16092,7 @@ GitEngine.prototype.numBackFrom = function(commit, numBack) {
// we use a special sorting function here that // we use a special sorting function here that
// prefers the later commits over the earlier ones // prefers the later commits over the earlier ones
var sortQueue = _.bind(function(queue) { var sortQueue = _.bind(function(queue) {
queue.sort(this.idSortFunc); queue.sort(this.dateSortFunc);
queue.reverse();
}, this); }, this);
var pQueue = [].concat(commit.get('parents') || []); var pQueue = [].concat(commit.get('parents') || []);
@ -16197,6 +16201,12 @@ GitEngine.prototype.idSortFunc = function(cA, cB) {
return getNumToSort(cA.get('id')) - getNumToSort(cB.get('id')); return getNumToSort(cA.get('id')) - getNumToSort(cB.get('id'));
}; };
GitEngine.prototype.dateSortFunc = function(cA, cB) {
var dateA = new Date(cA.get('createTime'));
var dateB = new Date(cB.get('createTime'));
return dateA - dateB;
};
GitEngine.prototype.rebaseInteractiveStarter = function() { GitEngine.prototype.rebaseInteractiveStarter = function() {
var args = this.commandOptions['-i']; var args = this.commandOptions['-i'];
this.twoArgsImpliedHead(args, ' -i'); this.twoArgsImpliedHead(args, ' -i');
@ -16269,8 +16279,8 @@ GitEngine.prototype.rebase = function(targetSource, currentLocation) {
// it's not in the set, so we need to rebase this commit // it's not in the set, so we need to rebase this commit
toRebaseRough.push(popped); toRebaseRough.push(popped);
toRebaseRough.sort(this.idSortFunc); toRebaseRough.sort(this.dateSortFunc);
toRebaseRough.reverse();
// keep searching // keep searching
pQueue = pQueue.concat(popped.get('parents')); pQueue = pQueue.concat(popped.get('parents'));
} }
@ -16306,10 +16316,10 @@ GitEngine.prototype.rebaseInteractive = function(targetSource, currentLocation)
toRebaseRough.push(popped); toRebaseRough.push(popped);
pQueue = pQueue.concat(popped.get('parents')); pQueue = pQueue.concat(popped.get('parents'));
pQueue.sort(this.idSortFunc); pQueue.sort(this.dateSortFunc);
} }
// throw our merge's real fast and see if we have anything to do // throw out merge's real fast and see if we have anything to do
var toRebase = []; var toRebase = [];
_.each(toRebaseRough, function(commit) { _.each(toRebaseRough, function(commit) {
if (commit.get('parents').length == 1) { if (commit.get('parents').length == 1) {
@ -16341,7 +16351,6 @@ GitEngine.prototype.rebaseInteractive = function(targetSource, currentLocation)
var animationData = this.rebaseFinish(userSpecifiedRebase, {}, targetSource, currentLocation); var animationData = this.rebaseFinish(userSpecifiedRebase, {}, targetSource, currentLocation);
this.animationFactory.rebaseAnimation(this.animationQueue, animationData, this, this.gitVisuals); this.animationFactory.rebaseAnimation(this.animationQueue, animationData, this, this.gitVisuals);
this.animationQueue.start(); this.animationQueue.start();
}, this)) }, this))
.fail(_.bind(function(err) { .fail(_.bind(function(err) {
this.filterError(err); this.filterError(err);
@ -17188,7 +17197,8 @@ var Level = Sandbox.extend({
this.goalTreeString = options.level.goalTree; this.goalTreeString = options.level.goalTree;
if (!this.goalTreeString) { if (!this.goalTreeString) {
console.warn('woah no goal, using random other one'); console.warn('woah no goal, using random other one');
this.goalTreeString = '{"branches":{"master":{"target":"C2","id":"master"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"master","id":"HEAD"}}'; this.goalTreeString = '{"branches":{"master":{"target":"C2","id":"master"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C30"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"master","id":"HEAD"}}';
//this.goalTreeString = '{"branches":{"master":{"target":"C2","id":"master"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"master","id":"HEAD"}}';
} }
Sandbox.prototype.initialize.apply(this, [options]); Sandbox.prototype.initialize.apply(this, [options]);
@ -19120,7 +19130,6 @@ var InteractiveRebaseView = ContainedBase.extend({
this.entryObjMap = {}; this.entryObjMap = {};
this.rebaseEntries = new RebaseEntryCollection(); this.rebaseEntries = new RebaseEntryCollection();
options.toRebase.reverse();
_.each(options.toRebase, function(commit) { _.each(options.toRebase, function(commit) {
var id = commit.get('id'); var id = commit.get('id');
this.rebaseMap[id] = commit; this.rebaseMap[id] = commit;
@ -19142,7 +19151,7 @@ var InteractiveRebaseView = ContainedBase.extend({
}, },
confirm: function() { confirm: function() {
this.hide(); this.die();
// get our ordering // get our ordering
var uiOrder = []; var uiOrder = [];
@ -19159,6 +19168,7 @@ var InteractiveRebaseView = ContainedBase.extend({
} }
}, this); }, this);
toRebase.reverse();
this.deferred.resolve(toRebase); this.deferred.resolve(toRebase);
// garbage collection will get us // garbage collection will get us
this.$el.html(''); this.$el.html('');

18
src/js/git/index.js
View file

@ -774,8 +774,7 @@ GitEngine.prototype.numBackFrom = function(commit, numBack) {
// we use a special sorting function here that // we use a special sorting function here that
// prefers the later commits over the earlier ones // prefers the later commits over the earlier ones
var sortQueue = _.bind(function(queue) { var sortQueue = _.bind(function(queue) {
queue.sort(this.idSortFunc); queue.sort(this.dateSortFunc);
queue.reverse();
}, this); }, this);
var pQueue = [].concat(commit.get('parents') || []); var pQueue = [].concat(commit.get('parents') || []);
@ -884,6 +883,12 @@ GitEngine.prototype.idSortFunc = function(cA, cB) {
return getNumToSort(cA.get('id')) - getNumToSort(cB.get('id')); return getNumToSort(cA.get('id')) - getNumToSort(cB.get('id'));
}; };
GitEngine.prototype.dateSortFunc = function(cA, cB) {
var dateA = new Date(cA.get('createTime'));
var dateB = new Date(cB.get('createTime'));
return dateA - dateB;
};
GitEngine.prototype.rebaseInteractiveStarter = function() { GitEngine.prototype.rebaseInteractiveStarter = function() {
var args = this.commandOptions['-i']; var args = this.commandOptions['-i'];
this.twoArgsImpliedHead(args, ' -i'); this.twoArgsImpliedHead(args, ' -i');
@ -956,8 +961,8 @@ GitEngine.prototype.rebase = function(targetSource, currentLocation) {
// it's not in the set, so we need to rebase this commit // it's not in the set, so we need to rebase this commit
toRebaseRough.push(popped); toRebaseRough.push(popped);
toRebaseRough.sort(this.idSortFunc); toRebaseRough.sort(this.dateSortFunc);
toRebaseRough.reverse();
// keep searching // keep searching
pQueue = pQueue.concat(popped.get('parents')); pQueue = pQueue.concat(popped.get('parents'));
} }
@ -993,10 +998,10 @@ GitEngine.prototype.rebaseInteractive = function(targetSource, currentLocation)
toRebaseRough.push(popped); toRebaseRough.push(popped);
pQueue = pQueue.concat(popped.get('parents')); pQueue = pQueue.concat(popped.get('parents'));
pQueue.sort(this.idSortFunc); pQueue.sort(this.dateSortFunc);
} }
// throw our merge's real fast and see if we have anything to do // throw out merge's real fast and see if we have anything to do
var toRebase = []; var toRebase = [];
_.each(toRebaseRough, function(commit) { _.each(toRebaseRough, function(commit) {
if (commit.get('parents').length == 1) { if (commit.get('parents').length == 1) {
@ -1028,7 +1033,6 @@ GitEngine.prototype.rebaseInteractive = function(targetSource, currentLocation)
var animationData = this.rebaseFinish(userSpecifiedRebase, {}, targetSource, currentLocation); var animationData = this.rebaseFinish(userSpecifiedRebase, {}, targetSource, currentLocation);
this.animationFactory.rebaseAnimation(this.animationQueue, animationData, this, this.gitVisuals); this.animationFactory.rebaseAnimation(this.animationQueue, animationData, this, this.gitVisuals);
this.animationQueue.start(); this.animationQueue.start();
}, this)) }, this))
.fail(_.bind(function(err) { .fail(_.bind(function(err) {
this.filterError(err); this.filterError(err);

3
src/js/level/index.js
View file

@ -32,7 +32,8 @@ var Level = Sandbox.extend({
this.goalTreeString = options.level.goalTree; this.goalTreeString = options.level.goalTree;
if (!this.goalTreeString) { if (!this.goalTreeString) {
console.warn('woah no goal, using random other one'); console.warn('woah no goal, using random other one');
this.goalTreeString = '{"branches":{"master":{"target":"C2","id":"master"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"master","id":"HEAD"}}'; this.goalTreeString = '{"branches":{"master":{"target":"C2","id":"master"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C30"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"master","id":"HEAD"}}';
//this.goalTreeString = '{"branches":{"master":{"target":"C2","id":"master"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"master","id":"HEAD"}}';
} }
Sandbox.prototype.initialize.apply(this, [options]); Sandbox.prototype.initialize.apply(this, [options]);

4
src/js/views/rebaseView.js
View file

@ -19,7 +19,6 @@ var InteractiveRebaseView = ContainedBase.extend({
this.entryObjMap = {}; this.entryObjMap = {};
this.rebaseEntries = new RebaseEntryCollection(); this.rebaseEntries = new RebaseEntryCollection();
options.toRebase.reverse();
_.each(options.toRebase, function(commit) { _.each(options.toRebase, function(commit) {
var id = commit.get('id'); var id = commit.get('id');
this.rebaseMap[id] = commit; this.rebaseMap[id] = commit;
@ -41,7 +40,7 @@ var InteractiveRebaseView = ContainedBase.extend({
}, },
confirm: function() { confirm: function() {
this.hide(); this.die();
// get our ordering // get our ordering
var uiOrder = []; var uiOrder = [];
@ -58,6 +57,7 @@ var InteractiveRebaseView = ContainedBase.extend({
} }
}, this); }, this);
toRebase.reverse();
this.deferred.resolve(toRebase); this.deferred.resolve(toRebase);
// garbage collection will get us // garbage collection will get us
this.$el.html(''); this.$el.html('');