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

WIP bad

Browse source
This commit is contained in:
Peter Cottle 2013-10-12 23:07:14 -07:00
parent 068b9b961e
commit 9bf99ebff3
2 changed files with 60 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,6 +15,14 @@ function isColonRefspec(str) {
return str.indexOf(':') !== -1 && str.split(':').length === 2;
}
var assertIsRef = function(engine, ref) {
engine.resolveID(ref); // will throw giterror if cant resolve
};
var validateAndAssertBranchName = function(engine, name) {
return engine.validateBranchName(name);
};
var assertOriginSpecified = function(generalArgs) {
if (generalArgs[0] !== 'origin') {
throw new GitError({
@ -42,7 +50,9 @@ var assertBranchIsRemoteTracking = function(engine, branchName) {
var tracking = branch.getRemoteTrackingBranchID();
if (!tracking) {
throw new GitError({
msg: intl.todo(branchName + ' is not a remote tracking branch!')
msg: intl.todo(
branchName + ' is not a remote tracking branch! I dont know where to push'
)
});
}
return tracking;
@ -560,24 +570,32 @@ var commandConfig = {
command.twoArgsImpliedOrigin(generalArgs);
assertOriginSpecified(generalArgs);
var tracking;
var destination;
var source;
var firstArg = generalArgs[1];
if (firstArg) {
if (isColonRefspec(firstArg)) {
var refspecParts = firstArg.split(':');
source = refspecParts[0];
tracking = assertBranchIsRemoteTracking(engine, refspecParts[1]);
destination = refspecParts[1];
// TODO -- assert good branch name
} else {
tracking = assertBranchIsRemoteTracking(engine, firstArg);
// we are using this org as both destination and source
destination = firstArg;
source = firstArg;
}
destination = validateAndAssertBranchName(engine, destination);
} else {
var oneBefore = engine.getOneBeforeCommit('HEAD');
tracking = assertBranchIsRemoteTracking(engine, oneBefore.get('id'));
source = engine.getOneBeforeCommit('HEAD');
destination = source;
assertBranchIsRemoteTracking(source);
}
if (source) {
assertIsRef(engine, source);
}
engine.push({
destination: tracking,
destination: destination,
source: source
});
}