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

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

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();