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

now with hgdemo2

Browse source
This commit is contained in:
Peter Cottle 2013-08-01 11:21:25 -07:00
parent 173ccad92d
commit 3246649cb6
7 changed files with 120 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

82
build/bundle.js
View file

@ -6053,6 +6053,7 @@ var initRootEvents = function(eventBaton) {
var initDemo = function(sandbox) {
var params = util.parseQueryString(window.location.href);
console.log(params);
// being the smart programmer I am (not), I dont include a true value on demo, so
// I have to check if the key exists here
@ -6074,9 +6075,23 @@ var initDemo = function(sandbox) {
'git rebase master',
'delay 5000',
'undo',
'hg sum',
'delay 5000',
'hg rebase -d master'
];
commands = commands.join(';#').split('#');
commands = commands.join(';#').split('#'); // hax
} else if (params.hasOwnProperty('hgdemo2')) {
commands = [
'importTreeNow {"branches":{"master":{"target":"C3","id":"master"},"side":{"target":"C2","id":"side"},"debug":{"target":"C4","id":"debug"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"},"C4":{"parents":["C2"],"id":"C4"}},"HEAD":{"target":"debug","id":"HEAD"}}',
'delay 5000',
'git rebase master',
'delay 5000',
'undo',
'hg sum',
'delay 5000',
'hg rebase -d master'
];
commands = commands.join(';#').split('#'); // hax
} else if (!params.hasOwnProperty('NODEMO')) {
commands = [
"git help;",
@ -8471,6 +8486,11 @@ GitEngine.prototype.updateBranchesFromSet = function(commitSet) {
return this.updateBranchesForHg(branchList);
};
GitEngine.prototype.updateAllBranchesForHgAndPlay = function(branchList) {
return this.updateBranchesForHg(branchList) &&
this.animationFactory.playRefreshAnimationSlow(this.gitVisuals);
};
GitEngine.prototype.updateAllBranchesForHg = function() {
var branchList = this.branchCollection.map(function(branch) {
return branch.get('id');
@ -8769,7 +8789,20 @@ GitEngine.prototype.hgRebase = function(destination, base) {
masterSet[id] = true;
});
});
console.log(masterSet);
// we also need the branches POINTING to master set
var branchMap = {};
var upstreamSet = this.getUpstreamBranchSet();
_.each(masterSet, function(val, commitID) {
// now loop over that commits branches
_.each(upstreamSet[commitID], function(branchJSON) {
branchMap[branchJSON.id] = true;
});
});
var branchList = _.map(branchMap, function(val, id) {
return id;
});
chain = chain.then(_.bind(function() {
// now we just moved a bunch of commits, but we havent updated the
@ -8781,6 +8814,10 @@ GitEngine.prototype.hgRebase = function(destination, base) {
return this.animationFactory.playRefreshAnimationSlow(this.gitVisuals);
}, this));
chain = chain.then(_.bind(function() {
return this.updateAllBranchesForHgAndPlay(branchList);
}, this));
chain = chain.then(_.bind(function() {
// now that we have moved branches, lets prune
return this.pruneTreeAndPlay();
@ -24026,6 +24063,7 @@ var initRootEvents = function(eventBaton) {
var initDemo = function(sandbox) {
var params = util.parseQueryString(window.location.href);
console.log(params);
// being the smart programmer I am (not), I dont include a true value on demo, so
// I have to check if the key exists here
@ -24047,9 +24085,23 @@ var initDemo = function(sandbox) {
'git rebase master',
'delay 5000',
'undo',
'hg sum',
'delay 5000',
'hg rebase -d master'
];
commands = commands.join(';#').split('#');
commands = commands.join(';#').split('#'); // hax
} else if (params.hasOwnProperty('hgdemo2')) {
commands = [
'importTreeNow {"branches":{"master":{"target":"C3","id":"master"},"side":{"target":"C2","id":"side"},"debug":{"target":"C4","id":"debug"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"},"C4":{"parents":["C2"],"id":"C4"}},"HEAD":{"target":"debug","id":"HEAD"}}',
'delay 5000',
'git rebase master',
'delay 5000',
'undo',
'hg sum',
'delay 5000',
'hg rebase -d master'
];
commands = commands.join(';#').split('#'); // hax
} else if (!params.hasOwnProperty('NODEMO')) {
commands = [
"git help;",
@ -26759,6 +26811,11 @@ GitEngine.prototype.updateBranchesFromSet = function(commitSet) {
return this.updateBranchesForHg(branchList);
};
GitEngine.prototype.updateAllBranchesForHgAndPlay = function(branchList) {
return this.updateBranchesForHg(branchList) &&
this.animationFactory.playRefreshAnimationSlow(this.gitVisuals);
};
GitEngine.prototype.updateAllBranchesForHg = function() {
var branchList = this.branchCollection.map(function(branch) {
return branch.get('id');
@ -27057,7 +27114,20 @@ GitEngine.prototype.hgRebase = function(destination, base) {
masterSet[id] = true;
});
});
console.log(masterSet);
// we also need the branches POINTING to master set
var branchMap = {};
var upstreamSet = this.getUpstreamBranchSet();
_.each(masterSet, function(val, commitID) {
// now loop over that commits branches
_.each(upstreamSet[commitID], function(branchJSON) {
branchMap[branchJSON.id] = true;
});
});
var branchList = _.map(branchMap, function(val, id) {
return id;
});
chain = chain.then(_.bind(function() {
// now we just moved a bunch of commits, but we havent updated the
@ -27069,6 +27139,10 @@ GitEngine.prototype.hgRebase = function(destination, base) {
return this.animationFactory.playRefreshAnimationSlow(this.gitVisuals);
}, this));
chain = chain.then(_.bind(function() {
return this.updateAllBranchesForHgAndPlay(branchList);
}, this));
chain = chain.then(_.bind(function() {
// now that we have moved branches, lets prune
return this.pruneTreeAndPlay();

1
build/bundle.min.95b226a4.js Normal file
View file

File diff suppressed because one or more lines are too long

1
build/bundle.min.c3c3c828.js
View file

File diff suppressed because one or more lines are too long

2
build/bundle.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
index.html
View file

@ -445,7 +445,7 @@
For a much easier time perusing the source, see the individual files at:
https://github.com/pcottle/learnGitBranching
-->
<script src="build/bundle.min.c3c3c828.js"></script>
<script src="build/bundle.min.95b226a4.js"></script>
<!-- The advantage of github pages: super-easy, simple, slick static hostic.
The downside? No raw logs to parse for analytics, so I have to include

17
src/js/app/index.js
View file

@ -121,6 +121,7 @@ var initRootEvents = function(eventBaton) {
var initDemo = function(sandbox) {
var params = util.parseQueryString(window.location.href);
console.log(params);
// being the smart programmer I am (not), I dont include a true value on demo, so
// I have to check if the key exists here
@ -142,9 +143,23 @@ var initDemo = function(sandbox) {
'git rebase master',
'delay 5000',
'undo',
'hg sum',
'delay 5000',
'hg rebase -d master'
];
commands = commands.join(';#').split('#');
commands = commands.join(';#').split('#'); // hax
} else if (params.hasOwnProperty('hgdemo2')) {
commands = [
'importTreeNow {"branches":{"master":{"target":"C3","id":"master"},"side":{"target":"C2","id":"side"},"debug":{"target":"C4","id":"debug"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C1"],"id":"C3"},"C4":{"parents":["C2"],"id":"C4"}},"HEAD":{"target":"debug","id":"HEAD"}}',
'delay 5000',
'git rebase master',
'delay 5000',
'undo',
'hg sum',
'delay 5000',
'hg rebase -d master'
];
commands = commands.join(';#').split('#'); // hax
} else if (!params.hasOwnProperty('NODEMO')) {
commands = [
"git help;",

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

@ -1273,6 +1273,11 @@ GitEngine.prototype.updateBranchesFromSet = function(commitSet) {
return this.updateBranchesForHg(branchList);
};
GitEngine.prototype.updateAllBranchesForHgAndPlay = function(branchList) {
return this.updateBranchesForHg(branchList) &&
this.animationFactory.playRefreshAnimationSlow(this.gitVisuals);
};
GitEngine.prototype.updateAllBranchesForHg = function() {
var branchList = this.branchCollection.map(function(branch) {
return branch.get('id');
@ -1571,7 +1576,20 @@ GitEngine.prototype.hgRebase = function(destination, base) {
masterSet[id] = true;
});
});
console.log(masterSet);
// we also need the branches POINTING to master set
var branchMap = {};
var upstreamSet = this.getUpstreamBranchSet();
_.each(masterSet, function(val, commitID) {
// now loop over that commits branches
_.each(upstreamSet[commitID], function(branchJSON) {
branchMap[branchJSON.id] = true;
});
});
var branchList = _.map(branchMap, function(val, id) {
return id;
});
chain = chain.then(_.bind(function() {
// now we just moved a bunch of commits, but we havent updated the
@ -1583,6 +1601,10 @@ GitEngine.prototype.hgRebase = function(destination, base) {
return this.animationFactory.playRefreshAnimationSlow(this.gitVisuals);
}, this));
chain = chain.then(_.bind(function() {
return this.updateAllBranchesForHgAndPlay(branchList);
}, this));
chain = chain.then(_.bind(function() {
// now that we have moved branches, lets prune
return this.pruneTreeAndPlay();