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

now multi origin fetch works

Browse source
This commit is contained in:
Peter Cottle 2013-09-01 11:55:28 -07:00
parent d6c89f913f
commit 7cec1bcaab
5 changed files with 91 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -881,7 +881,7 @@ GitEngine.prototype.push = function(options) {
// HAX HAX update master and remote tracking for master
chain = chain.then(_.bind(function() {
var localCommit = this.getCommitFromRef(localBranch);
var remoteBranchID = localBranch.getRemoteBranchID();
var remoteBranchID = ORIGIN_PREFIX + localBranch.getID();
// less hacks hax
this.setTargetLocation(this.refs[remoteBranchID], localCommit);
return this.animationFactory.playRefreshAnimation(this.gitVisuals);
@ -895,13 +895,11 @@ GitEngine.prototype.push = function(options) {
GitEngine.prototype.fetch = function(options) {
options = options || {};
var localBranch = this.refs['o/master'];
var remoteBranch = this.origin.refs['master'];
// fetch all local branches
var allRemotes = this.branchCollection.filter(function(branch) {
return branch.getIsRemote();
});
console.log(allRemotes);
// first check if our local remote branch is upstream of the origin branch set.
// this check essentially pretends the local remote branch is in origin and
@ -911,19 +909,22 @@ GitEngine.prototype.fetch = function(options) {
this,
this.origin,
localRemoteBranch,
localRemoteBranch.getRemoteBranchFromEngine(this.origin)
this.origin.refs[localRemoteBranch.getBaseID()]
);
}, this);
// then we get the difference in commits between these two graphs, ordered by
// depth. TODO -- make work for all branches
var commitsToMake = this.getTargetGraphDifference(
this,
this.origin,
localBranch,
remoteBranch,
options
);
var commitsToMake = [];
_.each(allRemotes, function(localRemoteBranch) {
commitsToMake = commitsToMake.concat(this.getTargetGraphDifference(
this,
this.origin,
localRemoteBranch,
this.origin.refs[localRemoteBranch.getBaseID()],
options
));
}, this);
if (commitsToMake.length === 0) {
this.command.addWarning(intl.str(
@ -975,10 +976,17 @@ GitEngine.prototype.fetch = function(options) {
}, this);
chain = chain.then(_.bind(function() {
var originLocationID = remoteBranch.get('target').get('id');
var localCommit = this.refs[originLocationID];
this.setTargetLocation(localBranch, localCommit);
// unhighlight origin
// update all the remote branches
_.each(allRemotes, function(localRemoteBranch) {
var remoteBranch = this.origin.refs[localRemoteBranch.getBaseID()];
var remoteLocationID = remoteBranch.get('target').get('id');
// by definition we just made the commit with this id,
// so we can grab it now
var localCommit = this.refs[remoteLocationID];
this.setTargetLocation(localRemoteBranch, localCommit);
}, this);
// unhighlight origin by refreshing
this.animationFactory.playRefreshAnimation(this.origin.gitVisuals);
return this.animationFactory.playRefreshAnimation(this.gitVisuals);
}, this));
@ -2315,15 +2323,18 @@ var Branch = Ref.extend({
return this.get('localBranchesThatTrackThis') || [];
},
getRemoteBranchID: function() {
getPrefixedID: function() {
if (this.getIsRemote()) {
throw new Error('I am a remote branch! dont try to get remote from me');
throw new Error('im already remote');
}
return ORIGIN_PREFIX + this.get('id');
},
getRemoteBranchFromEngine: function(engine) {
return engine.refs[this.getRemoteBranchID()];
getBaseID: function() {
if (!this.getIsRemote()) {
throw new Error('im not remote so cant get base');
}
return this.get('id').replace(ORIGIN_PREFIX, '');
},
getIsRemote: function() {