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

local storage and general arg stuff

Browse source
This commit is contained in:
Peter Cottle 2012-10-23 09:27:19 -07:00
parent eeff8da035
commit aaf7a462c0
4 changed files with 34 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

58
src/git.js
View file

@ -314,8 +314,31 @@ GitEngine.prototype.acceptNoGeneralArgs = function() {
}
};
GitEngine.prototype.validateArgBounds = function(args, lower, upper) {
// TODO
GitEngine.prototype.validateArgBounds = function(args, lower, upper, option) {
// this is a little utility class to help arg validation that happens over and over again
var what = 'with ' + (option === undefined) ?
'git ' + this.command.get('method') :
this.command.get('method') + ' ' + option + ' ';
if (args.length < lower) {
throw new GitError({
msg: 'I expect at least ' + String(lower) + ' argument(s) ' + what
});
}
if (args.length > upper) {
throw new GitError({
msg: 'I expect at most ' + String(upper) + ' argument(s) ' + what
});
}
};
GitEngine.prototype.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
if (args.length == 1) {
args.push('HEAD');
}
};
GitEngine.prototype.revertStarter = function() {
@ -1012,45 +1035,20 @@ GitEngine.prototype.branchStarter = function() {
if (this.commandOptions['-f']) {
var args = this.commandOptions['-f'];
if (args.length < 1) {
throw new GitError({
msg: 'Give me an argument with -f so I know which branch to force!'
});
}
if (args.length > 2) {
throw new GitError({
msg: 'Too many args for -f'
});
}
if (args.length == 1) {
args.push('HEAD');
}
this.twoArgsImpliedHead(args, '-f');
// we want to force a branch somewhere
this.forceBranch(args[0], args[1]);
return;
}
var len = this.generalArgs.length;
if (len > 2) {
throw new GitError({
msg: 'git branch with more than two general args does not make sense!'
});
}
if (len == 0) {
if (this.generalArgs.length == 0) {
this.printBranches();
return;
}
if (len == 1) {
// making a branch from where we are now
this.generalArgs.push('HEAD');
}
this.twoArgsImpliedHead(this.generalArgs);
this.branch(this.generalArgs[0], this.generalArgs[1]);
};

1
src/index.html
View file

@ -63,6 +63,7 @@
<script src="../lib/jquery-1.8.0.min.js"></script>
<script src="../lib/underscore-min.js"></script>
<script src="../lib/backbone-min.js"></script>
<script src="../lib/backbone.localStorage-min.js"></script>
<script src="../lib/raphael-min.js"></script>
<!-- Templates -->