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

fake teamwork better

Browse source
This commit is contained in:
Peter Cottle 2013-07-16 09:11:26 -07:00
parent f7af08c5fe
commit 62867c9f43
9 changed files with 44 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1057,9 +1057,9 @@ GitEngine.prototype.pullFinishWithRebase = function(
// delay a bit after the intense refresh animation from
// fetch
chain = chain.then(function() {
chain = chain.then(_.bind(function() {
return this.animationFactory.getDelayedPromise(300);
});
}, this));
chain = chain.then(_.bind(function() {
// highlight last commit on o/master to color of
@ -1088,9 +1088,9 @@ GitEngine.prototype.pullFinishWithMerge = function(
// delay a bit after the intense refresh animation from
// fetch
chain = chain.then(function() {
chain = chain.then(_.bind(function() {
return this.animationFactory.getDelayedPromise(300);
});
}, this));
chain = chain.then(_.bind(function() {
// highlight last commit on o/master to color of
@ -1110,9 +1110,9 @@ GitEngine.prototype.pullFinishWithMerge = function(
}, this));
// delay and merge
chain = chain.then(function() {
chain = chain.then(_.bind(function() {
return this.animationFactory.getDelayedPromise(700);
});
}, this));
chain = chain.then(_.bind(function() {
var newCommit = this.merge('o/master');
if (!newCommit) {
@ -1142,8 +1142,12 @@ GitEngine.prototype.fakeTeamworkStarter = function() {
}
this.validateArgBounds(this.generalArgs, 0, 2);
// ugly command line arg parsing
var branch = this.generalArgs[0] || 'master';
var numToMake = this.generalArgs[1] || 1;
if (!this.origin.refs[branch]) {
branch = 'master';
}
var numToMake = parseInt(this.generalArgs[0], 10) || this.generalArgs[1] || 1;
// make sure its a branch and exists
var destBranch = this.origin.resolveID(branch);