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

rebase onto implemented

Browse source
This commit is contained in:
Qusijue 2021-08-13 19:11:00 +05:00
parent 592399b1db
commit 521cc0e809
3 changed files with 41 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -615,7 +615,8 @@ var commandConfig = {
'--interactive-test', '--interactive-test',
'--aboveAll', '--aboveAll',
'-p', '-p',
'--preserve-merges' '--preserve-merges',
'--onto'
], ],
regex: /^git +rebase($|\s)/, regex: /^git +rebase($|\s)/,
execute: function(engine, command) { execute: function(engine, command) {
@ -645,6 +646,17 @@ var commandConfig = {
return; 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); command.twoArgsImpliedHead(generalArgs);
engine.rebase(generalArgs[0], generalArgs[1], { engine.rebase(generalArgs[0], generalArgs[1], {
preserveMerges: commandOptions['-p'] || commandOptions['--preserve-merges'] 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); 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) { GitEngine.prototype.getUpstreamDiffSetFromSet = function(stopSet, location) {
var set = {}; var set = {};
this.getUpstreamDiffFromSet(stopSet, location).forEach(function (commit) { this.getUpstreamDiffFromSet(stopSet, location).forEach(function (commit) {

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

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