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

Issue #129 pushing to different remote branches

Browse source
This commit is contained in:
Peter Cottle 2013-10-07 11:29:08 -07:00
parent 7034eb76fa
commit bfd8483d90
8 changed files with 165 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,7 +11,17 @@ var crappyUnescape = function(str) {
return str.replace(/'/g, "'").replace(///g, "/");
};
var ensureBranchIsRemoteTracking = function(engine, branchName) {
var assertOriginSpecified = function(generalArgs) {
if (generalArgs[0] !== 'origin') {
throw new GitError({
msg: intl.todo(
generalArgs[0] + ' is not a remote in your repository! try origin'
)
});
}
};
var assertBranchIsRemoteTracking = function(engine, branchName) {
branchName = crappyUnescape(branchName);
if (!engine.refs[branchName]) {
throw new GitError({
@ -147,37 +157,28 @@ var commandConfig = {
// so lets switch on A/B here
var commandOptions = command.getOptionsMap();
var options = {
isRebase: commandOptions['--rebase']
};
var generalArgs = command.getGeneralArgs();
command.twoArgsImpliedOrigin(generalArgs);
if (generalArgs[0] !== 'origin') {
throw new GitError({
msg: intl.todo(
generalArgs[0] + ' is not a remote in your repository! try origin'
)
});
}
assertOriginSpecified(generalArgs);
var tracking;
if (generalArgs[1]) {
tracking = ensureBranchIsRemoteTracking(engine, generalArgs[1]);
options.source = tracking;
tracking = assertBranchIsRemoteTracking(engine, generalArgs[1]);
} else {
// cant be detached
if (engine.getDetachedHead()) {
throw new GitError({
msg: intl.todo('Git pull can not be executed in detached HEAD mode!')
msg: intl.todo('Git pull can not be executed in detached HEAD mode if no remote branch specified!')
});
}
var oneBefore = engine.getOneBeforeCommit('HEAD');
tracking = ensureBranchIsRemoteTracking(engine, oneBefore.get('id'));
options.source = tracking;
tracking = assertBranchIsRemoteTracking(engine, oneBefore.get('id'));
}
engine.pull(options);
engine.pull({
source: tracking,
isRebase: commandOptions['--rebase']
});
}
},
@ -249,16 +250,10 @@ var commandConfig = {
var generalArgs = command.getGeneralArgs();
command.twoArgsImpliedOrigin(generalArgs);
if (generalArgs[0] !== 'origin') {
throw new GitError({
msg: intl.todo(
generalArgs[0] + ' is not a remote in your repository! try origin'
)
});
}
assertOriginSpecified(generalArgs);
if (generalArgs[1]) {
var tracking = ensureBranchIsRemoteTracking(engine, generalArgs[1]);
var tracking = assertBranchIsRemoteTracking(engine, generalArgs[1]);
options.branches = [engine.refs[tracking]];
}
@ -541,8 +536,26 @@ var commandConfig = {
msg: intl.str('git-error-origin-required')
});
}
command.acceptNoGeneralArgs();
engine.push();
var options = {};
// git push is pretty complex in terms of
// the arguments it wants as well -- see
// git pull for a more detailed description.
var generalArgs = command.getGeneralArgs();
command.twoArgsImpliedOrigin(generalArgs);
assertOriginSpecified(generalArgs);
var tracking;
if (generalArgs[1]) {
tracking = assertBranchIsRemoteTracking(engine, generalArgs[1]);
} else {
var oneBefore = engine.getOneBeforeCommit('HEAD');
tracking = assertBranchIsRemoteTracking(engine, oneBefore.get('id'));
}
engine.push({
destination: tracking
});
}
}
};