mirror of
https://github.com/pcottle/learnGitBranching.git
synced 2025-06-27 16:38:50 +02:00
better refreshing
This commit is contained in:
parent
f78e77e5c6
commit
bc4b9246eb
3 changed files with 9 additions and 4 deletions
|
@ -37,6 +37,10 @@ var Command = Backbone.Model.extend({
|
|||
}
|
||||
},
|
||||
|
||||
setResult: function(msg) {
|
||||
this.set('result', msg);
|
||||
},
|
||||
|
||||
addWarning: function(msg) {
|
||||
this.get('warnings').push(msg);
|
||||
// change numWarnings so the change event fires. This is bizarre -- Backbone can't
|
||||
|
|
|
@ -492,9 +492,10 @@ GitEngine.prototype.rebase = function(targetSource, currentLocation) {
|
|||
if (this.isUpstreamOf(currentLocation, targetSource)) {
|
||||
// just set the target of this current location to the source
|
||||
this.setLocationTarget(currentLocation, this.getCommitFromRef(targetSource));
|
||||
throw new CommandResult({
|
||||
msg: 'Fast-forwarding...'
|
||||
});
|
||||
// we need the refresh tree animation to happen, so set the result directly
|
||||
// instead of throwing
|
||||
this.command.setResult('Fast-forwarding...');
|
||||
return;
|
||||
}
|
||||
|
||||
// now the part of actually rebasing.
|
||||
|
|
2
todo.txt
2
todo.txt
|
@ -17,5 +17,5 @@ ALSO other big things:
|
|||
- Division in their rings based on how many / what branches they are part of
|
||||
- Color on branch edges??
|
||||
|
||||
- sizing on visedge arrowheads, also fill most likely.
|
||||
- sizing on visedge arrowheads, also fill most likely
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue