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

rebuild fix

Browse source
This commit is contained in:
Peter Cottle 2013-08-01 00:27:08 -07:00
parent 8b66edc878
commit d52830f3d2
3 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
build/bundle.js
View file

@ -8490,7 +8490,7 @@ GitEngine.prototype.updateCommitParentsForHgRebase = function(commitSet) {
}; };
GitEngine.prototype.pruneTreeAndPlay = function() { GitEngine.prototype.pruneTreeAndPlay = function() {
return this.pruneTree() && return this.pruneTree() &&
this.animationFactory.playRefreshAnimationSlow(this.gitVisuals); this.animationFactory.playRefreshAnimationSlow(this.gitVisuals);
}; };
@ -8520,9 +8520,11 @@ GitEngine.prototype.pruneTree = function() {
_.each(toDelete, function(commit) { _.each(toDelete, function(commit) {
commit.removeFromParents(); commit.removeFromParents();
this.commitCollection.remove(commit); this.commitCollection.remove(commit);
var ID = commit.get('id'); var ID = commit.get('id');
this.refs[ID] = undefined; this.refs[ID] = undefined;
delete this.refs[ID]; delete this.refs[ID];
var visNode = commit.get('visNode'); var visNode = commit.get('visNode');
if (visNode) { if (visNode) {
visNode.removeAll(); visNode.removeAll();
@ -26767,7 +26769,7 @@ GitEngine.prototype.updateCommitParentsForHgRebase = function(commitSet) {
}; };
GitEngine.prototype.pruneTreeAndPlay = function() { GitEngine.prototype.pruneTreeAndPlay = function() {
return this.pruneTree() && return this.pruneTree() &&
this.animationFactory.playRefreshAnimationSlow(this.gitVisuals); this.animationFactory.playRefreshAnimationSlow(this.gitVisuals);
}; };
@ -26797,9 +26799,11 @@ GitEngine.prototype.pruneTree = function() {
_.each(toDelete, function(commit) { _.each(toDelete, function(commit) {
commit.removeFromParents(); commit.removeFromParents();
this.commitCollection.remove(commit); this.commitCollection.remove(commit);
var ID = commit.get('id'); var ID = commit.get('id');
this.refs[ID] = undefined; this.refs[ID] = undefined;
delete this.refs[ID]; delete this.refs[ID];
var visNode = commit.get('visNode'); var visNode = commit.get('visNode');
if (visNode) { if (visNode) {
visNode.removeAll(); visNode.removeAll();

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

@ -1351,9 +1351,11 @@ GitEngine.prototype.pruneTree = function() {
_.each(toDelete, function(commit) { _.each(toDelete, function(commit) {
commit.removeFromParents(); commit.removeFromParents();
this.commitCollection.remove(commit); this.commitCollection.remove(commit);
var ID = commit.get('id'); var ID = commit.get('id');
this.refs[ID] = undefined; this.refs[ID] = undefined;
delete this.refs[ID]; delete this.refs[ID];
var visNode = commit.get('visNode'); var visNode = commit.get('visNode');
if (visNode) { if (visNode) {
visNode.removeAll(); visNode.removeAll();

1
todo.txt
View file

@ -41,6 +41,7 @@ Ideas for cleaning
Done things: Done things:
(I only started this on Dec 17th 2012 to get a better sense of what was done) (I only started this on Dec 17th 2012 to get a better sense of what was done)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[x] TONS of hg stuff
[x] finally work on an upload / download animation [x] finally work on an upload / download animation
[x] factor out golf thing too [x] factor out golf thing too
[x] factor regexes and instant commands into one module [x] factor regexes and instant commands into one module