mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-07-13 16:14:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

now rebase coverage

Browse source
This commit is contained in:
Peter Cottle 2013-08-04 14:35:38 -07:00
parent cb47dd2728
commit 6a48f2fff4
4 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -2,4 +2,5 @@ node_modules/
screens
search_replace.sh
FontAwesome-Vectors.pdf
*.sw*

2
spec/mercurial.spec.js
View file

@ -44,8 +44,6 @@ describe('Mercurial', function() {
'%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C2%27%22%2C%22id%22%3A%22master%22%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C2%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%22%7D%2C%22C2%27%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%27%22%7D%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22master%22%2C%22id%22%3A%22HEAD%22%7D%7D'
);
return;
// TODO -- need to shim out more animation factory things
assert(
'rebases with -d',
'hg ci; hg book -r C1 feature; hg update feature; hg ci;hg book debug;hg ci;hg rebase -d master;',

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

@ -2383,8 +2383,19 @@ var Commit = Backbone.Model.extend({
this.removeFromParents();
this.set('parents', [newParent]);
newParent.get('children').push(this);
this.get('visNode').removeAllEdges();
this.get('gitVisuals').addEdge(this.get('id'), newestID);
// when we run in test mode, our visnode and
// visuals will be undefined so we need to check for their existence
var visNode = this.get('visNode');
if (visNode) {
visNode.removeAllEdges();
}
var gitVisuals = this.get('gitVisuals');
if (gitVisuals) {
gitVisuals.addEdge(this.get('id'), newestID);
}
return true;
},

4
src/js/visuals/animation/index.js
View file

@ -45,6 +45,10 @@ var AnimationQueue = Backbone.Model.extend({
promise.then(_.bind(function() {
this.finish();
}, this));
promise.fail(function(e) {
console.log('uncaught error', e);
throw e;
});
this.set('promiseBased', true);
if (deferred) {
deferred.resolve();