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

Better helper bar with float and more room for options

Browse source
This commit is contained in:
Peter Cottle 2013-12-30 10:23:58 -08:00
parent af12fe19f0
commit 17fda94aff
6 changed files with 49 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/js/graph/index.js
View file

@ -14,6 +14,13 @@ var Graph = {
objID,
gitVisuals
) {
// circular dependency, should move these base models OUT of
// the git class to resolve this
var Git = require('../git');
var Commit = Git.Commit;
var Ref = Git.Ref;
var Branch = Git.Branch;
var Tag = Git.Tag;
if (createdSoFar[objID]) {
// base case
return createdSoFar[objID];
@ -82,7 +89,6 @@ var Graph = {
parentObjs.push(this.getOrMakeRecursive(tree, createdSoFar, parentID));
}, this);
var Commit = require('../git').Commit;
var commit = new Commit(_.extend(
commitJSON,
{
@ -121,8 +127,6 @@ var Graph = {
},
getUpstreamSet: function(engine, ancestor) {
invariant(typeof ancestor === 'string', 'pass in string');
var commit = engine.getCommitFromRef(ancestor);
var ancestorID = commit.get('id');
var queue = [commit];