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

have cherry pick but forgot highlight

Browse source
This commit is contained in:
Peter Cottle 2013-06-04 14:58:49 -10:00
parent 733ad7d648
commit f400ac238e
2 changed files with 48 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

78
build/bundle.js
View file

@ -7753,33 +7753,26 @@ GitEngine.prototype.cherrypickStarter = function() {
}, this);
// error checks are all good, lets go!
// hack up the rebase response to animate this better
var animationResponse = {};
animationResponse.destinationBranch = this.resolveID('HEAD');
animationResponse.toRebaseArray = [];
animationResponse.rebaseSteps = [];
var destinationBranch = this.resolveID('HEAD');
var deferred = Q.defer();
var chain = deferred.promise;
// now lets start going through
var beforeSnapshot = this.gitVisuals.genSnapshot();
var afterSnapshot;
var newCommit;
_.each(this.generalArgs, function(arg) {
var chainStep = _.bind(function(arg) {
var oldCommit = this.getCommitFromRef(arg);
animationResponse.toRebaseArray.push(oldCommit);
newCommit = this.cherrypick(arg);
afterSnapshot = this.gitVisuals.genSnapshot();
animationResponse.rebaseSteps.push({
oldCommit: oldCommit,
newCommit: newCommit,
beforeSnapshot: beforeSnapshot,
afterSnapshot: this.gitVisuals.genSnapshot()
});
beforeSnapshot = afterSnapshot;
var newCommit = this.cherrypick(arg);
return this.animationFactory.playCommitBirthPromiseAnimation(
newCommit,
this.gitVisuals
);
}, this);
this.animationFactory.rebaseAnimation(this.animationQueue, animationResponse, this, this.gitVisuals);
_.each(this.generalArgs, function(arg) {
chain = chain.then(function() {
return chainStep(arg);
});
}, this);
this.animationQueue.thenFinish(chain, deferred);
};
/*************************************
@ -23697,33 +23690,26 @@ GitEngine.prototype.cherrypickStarter = function() {
}, this);
// error checks are all good, lets go!
// hack up the rebase response to animate this better
var animationResponse = {};
animationResponse.destinationBranch = this.resolveID('HEAD');
animationResponse.toRebaseArray = [];
animationResponse.rebaseSteps = [];
var destinationBranch = this.resolveID('HEAD');
var deferred = Q.defer();
var chain = deferred.promise;
// now lets start going through
var beforeSnapshot = this.gitVisuals.genSnapshot();
var afterSnapshot;
var newCommit;
_.each(this.generalArgs, function(arg) {
var chainStep = _.bind(function(arg) {
var oldCommit = this.getCommitFromRef(arg);
animationResponse.toRebaseArray.push(oldCommit);
newCommit = this.cherrypick(arg);
afterSnapshot = this.gitVisuals.genSnapshot();
animationResponse.rebaseSteps.push({
oldCommit: oldCommit,
newCommit: newCommit,
beforeSnapshot: beforeSnapshot,
afterSnapshot: this.gitVisuals.genSnapshot()
});
beforeSnapshot = afterSnapshot;
var newCommit = this.cherrypick(arg);
return this.animationFactory.playCommitBirthPromiseAnimation(
newCommit,
this.gitVisuals
);
}, this);
this.animationFactory.rebaseAnimation(this.animationQueue, animationResponse, this, this.gitVisuals);
_.each(this.generalArgs, function(arg) {
chain = chain.then(function() {
return chainStep(arg);
});
}, this);
this.animationQueue.thenFinish(chain, deferred);
};
/*************************************

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

@ -700,33 +700,26 @@ GitEngine.prototype.cherrypickStarter = function() {
}, this);
// error checks are all good, lets go!
// hack up the rebase response to animate this better
var animationResponse = {};
animationResponse.destinationBranch = this.resolveID('HEAD');
animationResponse.toRebaseArray = [];
animationResponse.rebaseSteps = [];
var destinationBranch = this.resolveID('HEAD');
var deferred = Q.defer();
var chain = deferred.promise;
// now lets start going through
var beforeSnapshot = this.gitVisuals.genSnapshot();
var afterSnapshot;
var newCommit;
_.each(this.generalArgs, function(arg) {
var chainStep = _.bind(function(arg) {
var oldCommit = this.getCommitFromRef(arg);
animationResponse.toRebaseArray.push(oldCommit);
newCommit = this.cherrypick(arg);
afterSnapshot = this.gitVisuals.genSnapshot();
animationResponse.rebaseSteps.push({
oldCommit: oldCommit,
newCommit: newCommit,
beforeSnapshot: beforeSnapshot,
afterSnapshot: this.gitVisuals.genSnapshot()
});
beforeSnapshot = afterSnapshot;
var newCommit = this.cherrypick(arg);
return this.animationFactory.playCommitBirthPromiseAnimation(
newCommit,
this.gitVisuals
);
}, this);
this.animationFactory.rebaseAnimation(this.animationQueue, animationResponse, this, this.gitVisuals);
_.each(this.generalArgs, function(arg) {
chain = chain.then(function() {
return chainStep(arg);
});
}, this);
this.animationQueue.thenFinish(chain, deferred);
};
/*************************************