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

ugly ugly bug with circular fields

Browse source
This commit is contained in:
Peter Cottle 2013-10-06 15:12:21 -07:00
parent 1ed8a2524a
commit bbf837a4b2
6 changed files with 36 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

36
build/bundle.js
View file

@ -7585,7 +7585,7 @@ GitEngine.prototype.makeOrigin = function(treeString) {
}; };
GitEngine.prototype.setLocalToTrackRemote = function(localBranch, remoteBranch) { GitEngine.prototype.setLocalToTrackRemote = function(localBranch, remoteBranch) {
remoteBranch.addLocalBranchThatTracksThis(localBranch); remoteBranch.addLocalBranchThatTracksThis(localBranch.get('id'));
localBranch.setRemoteTrackingBranchID(remoteBranch.get('id')); localBranch.setRemoteTrackingBranchID(remoteBranch.get('id'));
if (!this.command) { if (!this.command) {
@ -9911,6 +9911,9 @@ AnimationFactory.refreshTree = function(animationQueue, gitVisuals) {
AnimationFactory.genHighlightPromiseAnimation = function(commit, destObj) { AnimationFactory.genHighlightPromiseAnimation = function(commit, destObj) {
// could be branch or node // could be branch or node
var visObj = destObj.get('visBranch') || destObj.get('visNode'); var visObj = destObj.get('visBranch') || destObj.get('visNode');
if (!visObj) {
debugger;
}
var visNode = commit.get('visNode'); var visNode = commit.get('visNode');
return new PromiseAnimation(makeHighlightAnimation(visNode, visObj)); return new PromiseAnimation(makeHighlightAnimation(visNode, visObj));
}; };
@ -15042,8 +15045,8 @@ var Command = Backbone.Model.extend({
} }
}, },
oneArgImpliedHead: function(args, option) { oneArgImpliedHead: function(args) {
this.validateArgBounds(args, 0, 1, option); this.validateArgBounds(args, 0, 1);
// and if it's one, add a HEAD to the back // and if it's one, add a HEAD to the back
if (args.length === 0) { if (args.length === 0) {
args.push('HEAD'); args.push('HEAD');
@ -17533,9 +17536,6 @@ var VisNode = VisBase.extend({
}, },
highlightTo: function(visObj, speed, easing) { highlightTo: function(visObj, speed, easing) {
if (!visObj) {
debugger;
}
// a small function to highlight the color of a node for demonstration purposes // a small function to highlight the color of a node for demonstration purposes
var color = visObj.get('fill'); var color = visObj.get('fill');
@ -18010,6 +18010,12 @@ var VisBranch = VisBase.extend({
} }
this.get('branch').set('visBranch', this); this.get('branch').set('visBranch', this);
if (this.get('branch').get('id') === 'o/master') {
console.log('set visbranch on this', this.get('branch'), this);
window.debugVisBranch = this;
window.debugBranch = this.get('branch');
debugger;
}
var id = this.get('branch').get('id'); var id = this.get('branch').get('id');
if (id == 'HEAD') { if (id == 'HEAD') {
@ -26263,7 +26269,7 @@ GitEngine.prototype.makeOrigin = function(treeString) {
}; };
GitEngine.prototype.setLocalToTrackRemote = function(localBranch, remoteBranch) { GitEngine.prototype.setLocalToTrackRemote = function(localBranch, remoteBranch) {
remoteBranch.addLocalBranchThatTracksThis(localBranch); remoteBranch.addLocalBranchThatTracksThis(localBranch.get('id'));
localBranch.setRemoteTrackingBranchID(remoteBranch.get('id')); localBranch.setRemoteTrackingBranchID(remoteBranch.get('id'));
if (!this.command) { if (!this.command) {
@ -31349,8 +31355,8 @@ var Command = Backbone.Model.extend({
} }
}, },
oneArgImpliedHead: function(args, option) { oneArgImpliedHead: function(args) {
this.validateArgBounds(args, 0, 1, option); this.validateArgBounds(args, 0, 1);
// and if it's one, add a HEAD to the back // and if it's one, add a HEAD to the back
if (args.length === 0) { if (args.length === 0) {
args.push('HEAD'); args.push('HEAD');
@ -35462,6 +35468,9 @@ AnimationFactory.refreshTree = function(animationQueue, gitVisuals) {
AnimationFactory.genHighlightPromiseAnimation = function(commit, destObj) { AnimationFactory.genHighlightPromiseAnimation = function(commit, destObj) {
// could be branch or node // could be branch or node
var visObj = destObj.get('visBranch') || destObj.get('visNode'); var visObj = destObj.get('visBranch') || destObj.get('visNode');
if (!visObj) {
debugger;
}
var visNode = commit.get('visNode'); var visNode = commit.get('visNode');
return new PromiseAnimation(makeHighlightAnimation(visNode, visObj)); return new PromiseAnimation(makeHighlightAnimation(visNode, visObj));
}; };
@ -36699,6 +36708,12 @@ var VisBranch = VisBase.extend({
} }
this.get('branch').set('visBranch', this); this.get('branch').set('visBranch', this);
if (this.get('branch').get('id') === 'o/master') {
console.log('set visbranch on this', this.get('branch'), this);
window.debugVisBranch = this;
window.debugBranch = this.get('branch');
debugger;
}
var id = this.get('branch').get('id'); var id = this.get('branch').get('id');
if (id == 'HEAD') { if (id == 'HEAD') {
@ -37551,9 +37566,6 @@ var VisNode = VisBase.extend({
}, },
highlightTo: function(visObj, speed, easing) { highlightTo: function(visObj, speed, easing) {
if (!visObj) {
debugger;
}
// a small function to highlight the color of a node for demonstration purposes // a small function to highlight the color of a node for demonstration purposes
var color = visObj.get('fill'); var color = visObj.get('fill');

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

@ -363,7 +363,7 @@ GitEngine.prototype.makeOrigin = function(treeString) {
}; };
GitEngine.prototype.setLocalToTrackRemote = function(localBranch, remoteBranch) { GitEngine.prototype.setLocalToTrackRemote = function(localBranch, remoteBranch) {
remoteBranch.addLocalBranchThatTracksThis(localBranch); remoteBranch.addLocalBranchThatTracksThis(localBranch.get('id'));
localBranch.setRemoteTrackingBranchID(remoteBranch.get('id')); localBranch.setRemoteTrackingBranchID(remoteBranch.get('id'));
if (!this.command) { if (!this.command) {

4
src/js/models/commandModel.js
View file

@ -116,8 +116,8 @@ var Command = Backbone.Model.extend({
} }
}, },
oneArgImpliedHead: function(args, option) { oneArgImpliedHead: function(args) {
this.validateArgBounds(args, 0, 1, option); this.validateArgBounds(args, 0, 1);
// and if it's one, add a HEAD to the back // and if it's one, add a HEAD to the back
if (args.length === 0) { if (args.length === 0) {
args.push('HEAD'); args.push('HEAD');

3
src/js/visuals/animation/animationFactory.js
View file

@ -138,6 +138,9 @@ AnimationFactory.refreshTree = function(animationQueue, gitVisuals) {
AnimationFactory.genHighlightPromiseAnimation = function(commit, destObj) { AnimationFactory.genHighlightPromiseAnimation = function(commit, destObj) {
// could be branch or node // could be branch or node
var visObj = destObj.get('visBranch') || destObj.get('visNode'); var visObj = destObj.get('visBranch') || destObj.get('visNode');
if (!visObj) {
debugger;
}
var visNode = commit.get('visNode'); var visNode = commit.get('visNode');
return new PromiseAnimation(makeHighlightAnimation(visNode, visObj)); return new PromiseAnimation(makeHighlightAnimation(visNode, visObj));
}; };

6
src/js/visuals/visBranch.js
View file

@ -60,6 +60,12 @@ var VisBranch = VisBase.extend({
} }
this.get('branch').set('visBranch', this); this.get('branch').set('visBranch', this);
if (this.get('branch').get('id') === 'o/master') {
console.log('set visbranch on this', this.get('branch'), this);
window.debugVisBranch = this;
window.debugBranch = this.get('branch');
debugger;
}
var id = this.get('branch').get('id'); var id = this.get('branch').get('id');
if (id == 'HEAD') { if (id == 'HEAD') {

3
src/js/visuals/visNode.js
View file

@ -141,9 +141,6 @@ var VisNode = VisBase.extend({
}, },
highlightTo: function(visObj, speed, easing) { highlightTo: function(visObj, speed, easing) {
if (!visObj) {
debugger;
}
// a small function to highlight the color of a node for demonstration purposes // a small function to highlight the color of a node for demonstration purposes
var color = visObj.get('fill'); var color = visObj.get('fill');