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

got tags making commits not faded out or orphaned anymore

Browse source
This commit is contained in:
Peter Cottle 2013-11-01 10:01:13 -07:00
parent e9e2cda241
commit 9fbe654cb2
3 changed files with 37 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1747,6 +1747,14 @@ GitEngine.prototype.pruneTree = function() {
};
GitEngine.prototype.getUpstreamBranchSet = function() {
return this.getUpstreamCollectionSet(this.branchCollection);
};
GitEngine.prototype.getUpstreamTagSet = function() {
return this.getUpstreamCollectionSet(this.tagCollection);
};
GitEngine.prototype.getUpstreamCollectionSet = function(collection) {
// this is expensive!! so only call once in a while
var commitToSet = {};
@ -1775,16 +1783,16 @@ GitEngine.prototype.getUpstreamBranchSet = function() {
return set;
};
this.branchCollection.each(function(branch) {
var set = bfsSearch(branch.get('target'));
collection.each(function(ref) {
var set = bfsSearch(ref.get('target'));
_.each(set, function(id) {
commitToSet[id] = commitToSet[id] || [];
// only add it if it's not there, so hue blending is ok
if (!inArray(commitToSet[id], branch.get('id'))) {
if (!inArray(commitToSet[id], ref.get('id'))) {
commitToSet[id].push({
obj: branch,
id: branch.get('id')
obj: ref,
id: ref.get('id')
});
}
});