mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-08-02 00:54:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge main

Browse source
This commit is contained in:
Peter Cottle 2021-08-13 10:25:27 -06:00
commit af6c4c6145
7 changed files with 68 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
__tests__/git.spec.js
View file

@ -423,4 +423,27 @@ describe('Git', function() {
});
});
});
describe ('Git rebase onto', function () {
it('rebase onto with two arguments', function() {
return expectTreeAsync(
'git commit; git commit; git switch -c F1 main~2; git commit; git commit; git switch -c F2; git commit; git commit; git rebase --onto main F1;',
'%7B%22branches%22%3A%7B%22main%22%3A%7B%22target%22%3A%22C3%22%2C%22id%22%3A%22main%22%2C%22remoteTrackingBranchID%22%3Anull%7D%2C%22F1%22%3A%7B%22target%22%3A%22C5%22%2C%22id%22%3A%22F1%22%2C%22remoteTrackingBranchID%22%3Anull%7D%2C%22F2%22%3A%7B%22target%22%3A%22C7%27%22%2C%22id%22%3A%22F2%22%2C%22remoteTrackingBranchID%22%3Anull%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%22C3%22%3A%7B%22parents%22%3A%5B%22C2%22%5D%2C%22id%22%3A%22C3%22%7D%2C%22C4%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C4%22%7D%2C%22C5%22%3A%7B%22parents%22%3A%5B%22C4%22%5D%2C%22id%22%3A%22C5%22%7D%2C%22C6%22%3A%7B%22parents%22%3A%5B%22C5%22%5D%2C%22id%22%3A%22C6%22%7D%2C%22C7%22%3A%7B%22parents%22%3A%5B%22C6%22%5D%2C%22id%22%3A%22C7%22%7D%2C%22C6%27%22%3A%7B%22parents%22%3A%5B%22C3%22%5D%2C%22id%22%3A%22C6%27%22%7D%2C%22C7%27%22%3A%7B%22parents%22%3A%5B%22C6%27%22%5D%2C%22id%22%3A%22C7%27%22%7D%7D%2C%22tags%22%3A%7B%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22F2%22%2C%22id%22%3A%22HEAD%22%7D%7D'
);
});
it('rebase onto with three arguments', function() {
return expectTreeAsync(
'git commit; git commit; git switch -c F1 main~2; git commit; git commit; git switch -c F2; git commit; git commit; git checkout C1; git rebase --onto main F1 F2;',
'%7B%22branches%22%3A%7B%22main%22%3A%7B%22target%22%3A%22C3%22%2C%22id%22%3A%22main%22%2C%22remoteTrackingBranchID%22%3Anull%7D%2C%22F1%22%3A%7B%22target%22%3A%22C5%22%2C%22id%22%3A%22F1%22%2C%22remoteTrackingBranchID%22%3Anull%7D%2C%22F2%22%3A%7B%22target%22%3A%22C7%27%22%2C%22id%22%3A%22F2%22%2C%22remoteTrackingBranchID%22%3Anull%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%22C3%22%3A%7B%22parents%22%3A%5B%22C2%22%5D%2C%22id%22%3A%22C3%22%7D%2C%22C4%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C4%22%7D%2C%22C5%22%3A%7B%22parents%22%3A%5B%22C4%22%5D%2C%22id%22%3A%22C5%22%7D%2C%22C6%22%3A%7B%22parents%22%3A%5B%22C5%22%5D%2C%22id%22%3A%22C6%22%7D%2C%22C7%22%3A%7B%22parents%22%3A%5B%22C6%22%5D%2C%22id%22%3A%22C7%22%7D%2C%22C6%27%22%3A%7B%22parents%22%3A%5B%22C3%22%5D%2C%22id%22%3A%22C6%27%22%7D%2C%22C7%27%22%3A%7B%22parents%22%3A%5B%22C6%27%22%5D%2C%22id%22%3A%22C7%27%22%7D%7D%2C%22tags%22%3A%7B%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22F2%22%2C%22id%22%3A%22HEAD%22%7D%7D'
);
});
it('rebase onto fast forward', function() {
return expectTreeAsync(
'git switch -c F1; git commit; git rebase --onto F1 main;',
'{"branches":{"main":{"target":"C1","id":"main","remoteTrackingBranchID":null},"F1":{"target":"C2","id":"F1","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"tags":{},"HEAD":{"target":"F1","id":"HEAD"}}'
);
});
});
});

14
src/js/git/commands.js
View file

@ -615,7 +615,8 @@ var commandConfig = {
'--interactive-test',
'--aboveAll',
'-p',
'--preserve-merges'
'--preserve-merges',
'--onto'
],
regex: /^git +rebase($|\s)/,
execute: function(engine, command) {
@ -645,6 +646,17 @@ var commandConfig = {
return;
}
if (commandOptions['--onto']) {
var args = commandOptions['--onto'].concat(generalArgs);
command.threeArgsImpliedHead(args, ' --onto');
engine.rebaseOnto(args[0], args[1], args[2], {
preserveMerges: commandOptions['-p'] || commandOptions['--preserve-merges']
});
return;
}
command.twoArgsImpliedHead(generalArgs);
engine.rebase(generalArgs[0], generalArgs[1], {
preserveMerges: commandOptions['-p'] || commandOptions['--preserve-merges']

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

@ -2165,6 +2165,21 @@ GitEngine.prototype.rebase = function(targetSource, currentLocation, options) {
return this.rebaseFinish(toRebaseRough, stopSet, targetSource, currentLocation, options);
};
GitEngine.prototype.rebaseOnto = function(targetSource, oldSource, unit, options) {
if (this.isUpstreamOf(unit, targetSource)) {
this.setTargetLocation(unit, this.getCommitFromRef(targetSource));
this.command.setResult(intl.str('git-result-fastforward'));
this.checkout(unit);
return;
}
var stopSet = Graph.getUpstreamSet(this, targetSource);
var oldBranchSet = Graph.getUpstreamSet(this, oldSource);
var toRebaseRough = this.getUpstreamDiffFromSet(oldBranchSet, unit);
return this.rebaseFinish(toRebaseRough, stopSet, targetSource, unit, options);
};
GitEngine.prototype.getUpstreamDiffSetFromSet = function(stopSet, location) {
var set = {};
this.getUpstreamDiffFromSet(stopSet, location).forEach(function (commit) {

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

@ -57,7 +57,7 @@ var str = exports.str = function(key, params) {
var getIntlKey = exports.getIntlKey = function(obj, key, overrideLocale) {
if (!obj || !obj[key]) {
throw new Error('that key ' + key + 'doesn\'t exist in this blob' + obj);
throw new Error('that key ' + key + ' doesn\'t exist in this blob ' + obj);
}
if (!obj[key][getDefaultLocale()]) {
console.warn(

20
src/js/models/commandModel.js
View file

@ -124,17 +124,23 @@ var Command = Backbone.Model.extend({
}
},
oneArgImpliedHead: function(args, option) {
this.validateArgBounds(args, 0, 1, option);
argImpliedHead: function (args, lower, upper, option) {
// our args we expect to be between {lower} and {upper}
this.validateArgBounds(args, lower, upper, option);
// and if it's one, add a HEAD to the back
this.impliedHead(args, 0);
this.impliedHead(args, lower);
},
oneArgImpliedHead: function(args, option) {
this.argImpliedHead(args, 0, 1, option);
},
twoArgsImpliedHead: function(args, option) {
// our args we expect to be between 1 and 2
this.validateArgBounds(args, 1, 2, option);
// and if it's one, add a HEAD to the back
this.impliedHead(args, 1);
this.argImpliedHead(args, 1, 2, option);
},
threeArgsImpliedHead: function(args, option) {
this.argImpliedHead(args, 2, 3, option);
},
oneArgImpliedOrigin: function(args) {

2
src/js/stores/LevelStore.js
View file

@ -143,7 +143,7 @@ AppConstants.StoreSubscribePrototype,
getLevelsInSequence: function(sequenceName) {
if (!levelSequences[sequenceName]) {
throw new Error('that sequecne name ' + sequenceName + 'does not exist');
throw new Error('that sequence name ' + sequenceName + ' does not exist');
}
return levelSequences[sequenceName];
},

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

@ -219,7 +219,7 @@ GitVisuals.prototype.animateAllAttrKeys = function(keys, attr, speed, easing) {
GitVisuals.prototype.finishAnimation = function(speed) {
speed = speed || 1.0;
if (!speed) {
throw new Error('need speed by time i finish animation' + speed);
throw new Error('need speed by time i finish animation ' + speed);
}
var _this = this;
@ -309,7 +309,7 @@ GitVisuals.prototype.finishAnimation = function(speed) {
animationDone.resolve();
})
.fail(function(reason) {
console.warn('animation error' + reason);
console.warn('animation error ' + reason);
})
.done();