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

tag loading from trees now works

Browse source
This commit is contained in:
Peter Cottle 2013-10-29 09:57:46 -07:00
parent 5a66b762ce
commit 7bbc81de97
2 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -211,7 +211,6 @@ GitEngine.prototype.exportTree = function() {
_.each(this.branchCollection.toJSON(), function(branch) {
branch.target = branch.target.get('id');
branch.visBranch = undefined;
branch.visTag = undefined;
totalExport.branches[branch.id] = branch;
});
@ -232,6 +231,13 @@ GitEngine.prototype.exportTree = function() {
totalExport.commits[commit.id] = commit;
}, this);
_.each(this.tagCollection.toJSON(), function(tag) {
tag.visTag = undefined;
tag.target = tag.target.get('id');
totalExport.tags[tag.id] = tag;
}, this);
var HEAD = this.HEAD.toJSON();
HEAD.lastTarget = HEAD.lastLastTarget = HEAD.visBranch = HEAD.visTag =undefined;
HEAD.target = HEAD.target.get('id');
@ -473,7 +479,11 @@ GitEngine.prototype.setLocalToTrackRemote = function(localBranch, remoteBranch)
this.command.addWarning(intl.todo(msg));
};
GitEngine.prototype.getOrMakeRecursive = function(tree, createdSoFar, objID) {
GitEngine.prototype.getOrMakeRecursive = function(
tree,
createdSoFar,
objID
) {
if (createdSoFar[objID]) {
// base case
return createdSoFar[objID];
@ -486,6 +496,8 @@ GitEngine.prototype.getOrMakeRecursive = function(tree, createdSoFar, objID) {
return 'branch';
} else if (id == 'HEAD') {
return 'HEAD';
} else if (tree.tags[id]) {
return 'tag';
}
throw new Error("bad type for " + id);
};
@ -983,13 +995,7 @@ GitEngine.prototype.getTargetGraphDifference = function(
// filter because we werent doing graph search
var differenceUnique = Graph.getUniqueObjects(difference);
return this.descendSortDepth(differenceUnique);
};
GitEngine.prototype.descendSortDepth = function(objects) {
return objects.sort(function(oA, oB) {
return oB.depth - oA.depth;
});
return Graph.descendSortDepth(differenceUnique);
};
GitEngine.prototype.push = function(options) {
@ -1207,7 +1213,7 @@ GitEngine.prototype.fetchCore = function(sourceDestPairs, options) {
// commits that are upstream of multiple branches (since the fakeTeamwork
// command simply commits), but we are doing it anyways for correctness
commitsToMake = Graph.getUniqueObjects(commitsToMake);
commitsToMake = this.descendSortDepth(commitsToMake);
commitsToMake = Graph.descendSortDepth(commitsToMake);
// now here is the tricky part -- the difference between local master
// and remote master might be commits C2, C3, and C4, but we