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

fake teamwork done

Browse source
This commit is contained in:
Peter Cottle 2013-05-26 21:58:57 -07:00
parent cbcd489a31
commit 3a23973a9a
7 changed files with 127 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/js/git/commands.js
View file

@ -62,6 +62,7 @@ var regexMap = {
'git show': /^git +show($|\s)/,
'git status': /^git +status($|\s)/,
'git cherry-pick': /^git +cherry-pick($|\s)/,
'git fakeTeamwork': /^git +fakeTeamwork *?$/,
'git originInit': /^git +originInit *?$/
};
@ -147,7 +148,8 @@ GitOptionParser.prototype.getMasterOptionMap = function() {
},
revert: {},
show: {},
originInit: {}
originInit: {},
fakeTeamwork: {}
};
};

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

@ -207,7 +207,7 @@ GitEngine.prototype.instantiateFromTree = function(tree) {
GitEngine.prototype.makeOrigin = function(treeString) {
if (this.hasOrigin()) {
throw new GitError({
msg: intl.str('git-error-options')
msg: intl.str('git-error-origin-exists')
});
}
@ -437,15 +437,20 @@ GitEngine.prototype.printBranches = function(branches) {
});
};
GitEngine.prototype.getUniqueID = function() {
var id = this.uniqueId('C');
while (this.refs[id]) {
id = this.uniqueId('C');
}
return id;
};
GitEngine.prototype.makeCommit = function(parents, id, options) {
// ok we need to actually manually create commit IDs now because
// people like nikita (thanks for finding this!) could
// make branches named C2 before creating the commit C2
if (!id) {
id = this.uniqueId('C');
while (this.refs[id]) {
id = this.uniqueId('C');
}
id = this.getUniqueID();
}
var commit = new Commit(_.extend({
@ -661,6 +666,27 @@ GitEngine.prototype.cherrypickStarter = function() {
this.animationFactory.rebaseAnimation(this.animationQueue, animationResponse, this, this.gitVisuals);
};
GitEngine.prototype.fakeTeamworkStarter = function() {
if (!this.hasOrigin()) {
throw new GitError({
msg: intl.str('git-error-origin-required')
});
}
var id = this.getUniqueID();
// fill refs so it is not grabbed again
this.refs[id] = {};
this.origin.receiveTeamwork(id, this.animationQueue);
};
GitEngine.prototype.receiveTeamwork = function(id, animationQueue) {
var newCommit = this.makeCommit([this.getCommitFromRef('HEAD')], id);
this.setTargetLocation(this.HEAD, newCommit);
this.animationFactory.genCommitBirthAnimation(animationQueue, newCommit, this.gitVisuals);
};
GitEngine.prototype.cherrypick = function(ref) {
var commit = this.getCommitFromRef(ref);