ALL GIT STUFF DONE YES

This commit is contained in:
Peter Cottle 2013-03-02 13:27:27 -08:00
parent 9b4de12074
commit 108ab07f93
3 changed files with 87 additions and 33 deletions

View file

@ -6599,6 +6599,25 @@ var getStartDialog = exports.getStartDialog = function(level) {
}); });
require.define("/src/js/intl/strings.js",function(require,module,exports,__dirname,__filename,process,global){exports.strings = { require.define("/src/js/intl/strings.js",function(require,module,exports,__dirname,__filename,process,global){exports.strings = {
///////////////////////////////////////////////////////////////////////////
'git-status-detached': {
'__desc__': 'One of the lines for git status output',
'en_US': 'Detached head!'
},
'git-status-onbranch': {
'__desc__': 'One of the lines for git status output',
'en_US': 'On branch {branch}'
},
'git-status-readytocommit': {
'__desc__': 'One of the lines for git status output',
'en_US': 'Ready to commit! (as always in this demo)'
},
///////////////////////////////////////////////////////////////////////////
'git-dummy-msg': {
'__desc__': 'The dummy commit message for all commits. Feel free to put in a ' +
'shoutout to your school / city / whatever!',
'en_US': 'Quick commit. Go Bears!'
},
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
'git-error-branch': { 'git-error-branch': {
'__desc__': 'One of the error messages for git', '__desc__': 'One of the error messages for git',
@ -6671,10 +6690,10 @@ require.define("/src/js/intl/strings.js",function(require,module,exports,__dirna
'en_US': 'The default behavior is a --hard reset, feel free to omit that option!' 'en_US': 'The default behavior is a --hard reset, feel free to omit that option!'
}, },
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
'git-error-soft': { 'git-error-staging': {
'__desc__': 'One of the error messages for git', '__desc__': 'One of the error messages for git',
'en_US': 'You can\'t use --soft in this demo because there is no concept of ' + 'en_US': 'There is no concept of adding / staging files, so that option or ' +
'stashing changes or staging files' 'command is invalid!'
}, },
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
'git-revert-msg': { 'git-revert-msg': {
@ -8523,7 +8542,7 @@ GitEngine.prototype.revert = function(whichCommits) {
GitEngine.prototype.resetStarter = function() { GitEngine.prototype.resetStarter = function() {
if (this.commandOptions['--soft']) { if (this.commandOptions['--soft']) {
throw new GitError({ throw new GitError({
msg: intl.str('git-error-soft') msg: intl.str('git-error-staging')
}); });
} }
if (this.commandOptions['--hard']) { if (this.commandOptions['--hard']) {
@ -9478,16 +9497,16 @@ GitEngine.prototype.show = function(ref) {
GitEngine.prototype.statusStarter = function() { GitEngine.prototype.statusStarter = function() {
var lines = []; var lines = [];
if (this.getDetachedHead()) { if (this.getDetachedHead()) {
lines.push('Detached Head!'); lines.push(intl.str('git-status-detached'));
} else { } else {
var branchName = this.HEAD.get('target').get('id'); var branchName = this.HEAD.get('target').get('id');
lines.push('On branch ' + branchName); lines.push(intl.str('git-stauts-onbranch', {branch: branchName}));
} }
lines.push('Changes to be committed:'); lines.push('Changes to be committed:');
lines.push(''); lines.push('');
lines.push('    modified: cal/OskiCostume.stl'); lines.push('    modified: cal/OskiCostume.stl');
lines.push(''); lines.push('');
lines.push('Ready to commit! (as always in this demo)'); lines.push(intl.str('git-status-readytocommit'));
var msg = ''; var msg = '';
_.each(lines, function(line) { _.each(lines, function(line) {
@ -9506,7 +9525,7 @@ GitEngine.prototype.logStarter = function() {
this.logWithout(this.generalArgs[0], this.generalArgs[1]); this.logWithout(this.generalArgs[0], this.generalArgs[1]);
} else { } else {
throw new GitError({ throw new GitError({
msg: 'I need a not branch (^branchName) when getting two arguments!' msg: intl.str('git-error-options')
}); });
} }
} }
@ -9560,8 +9579,7 @@ GitEngine.prototype.log = function(ref, omitSet) {
GitEngine.prototype.addStarter = function() { GitEngine.prototype.addStarter = function() {
throw new CommandResult({ throw new CommandResult({
msg: "This demo is meant to demonstrate git branching, so don't worry about " + msg: intl.str('git-error-staging')
"adding / staging files. Just go ahead and commit away!"
}); });
}; };
@ -9710,7 +9728,7 @@ var Commit = Backbone.Model.extend({
this.set('createTime', new Date().toString()); this.set('createTime', new Date().toString());
} }
if (!this.get('commitMessage')) { if (!this.get('commitMessage')) {
this.set('commitMessage', 'Quick Commit. Go Bears!'); this.set('commitMessage', intl.str('git-dummy-msg'));
} }
this.set('children', []); this.set('children', []);
@ -21530,7 +21548,7 @@ GitEngine.prototype.revert = function(whichCommits) {
GitEngine.prototype.resetStarter = function() { GitEngine.prototype.resetStarter = function() {
if (this.commandOptions['--soft']) { if (this.commandOptions['--soft']) {
throw new GitError({ throw new GitError({
msg: intl.str('git-error-soft') msg: intl.str('git-error-staging')
}); });
} }
if (this.commandOptions['--hard']) { if (this.commandOptions['--hard']) {
@ -22485,16 +22503,16 @@ GitEngine.prototype.show = function(ref) {
GitEngine.prototype.statusStarter = function() { GitEngine.prototype.statusStarter = function() {
var lines = []; var lines = [];
if (this.getDetachedHead()) { if (this.getDetachedHead()) {
lines.push('Detached Head!'); lines.push(intl.str('git-status-detached'));
} else { } else {
var branchName = this.HEAD.get('target').get('id'); var branchName = this.HEAD.get('target').get('id');
lines.push('On branch ' + branchName); lines.push(intl.str('git-stauts-onbranch', {branch: branchName}));
} }
lines.push('Changes to be committed:'); lines.push('Changes to be committed:');
lines.push(''); lines.push('');
lines.push('    modified: cal/OskiCostume.stl'); lines.push('    modified: cal/OskiCostume.stl');
lines.push(''); lines.push('');
lines.push('Ready to commit! (as always in this demo)'); lines.push(intl.str('git-status-readytocommit'));
var msg = ''; var msg = '';
_.each(lines, function(line) { _.each(lines, function(line) {
@ -22513,7 +22531,7 @@ GitEngine.prototype.logStarter = function() {
this.logWithout(this.generalArgs[0], this.generalArgs[1]); this.logWithout(this.generalArgs[0], this.generalArgs[1]);
} else { } else {
throw new GitError({ throw new GitError({
msg: 'I need a not branch (^branchName) when getting two arguments!' msg: intl.str('git-error-options')
}); });
} }
} }
@ -22567,8 +22585,7 @@ GitEngine.prototype.log = function(ref, omitSet) {
GitEngine.prototype.addStarter = function() { GitEngine.prototype.addStarter = function() {
throw new CommandResult({ throw new CommandResult({
msg: "This demo is meant to demonstrate git branching, so don't worry about " + msg: intl.str('git-error-staging')
"adding / staging files. Just go ahead and commit away!"
}); });
}; };
@ -22717,7 +22734,7 @@ var Commit = Backbone.Model.extend({
this.set('createTime', new Date().toString()); this.set('createTime', new Date().toString());
} }
if (!this.get('commitMessage')) { if (!this.get('commitMessage')) {
this.set('commitMessage', 'Quick Commit. Go Bears!'); this.set('commitMessage', intl.str('git-dummy-msg'));
} }
this.set('children', []); this.set('children', []);
@ -23122,6 +23139,25 @@ var getStartDialog = exports.getStartDialog = function(level) {
require("/src/js/intl/index.js"); require("/src/js/intl/index.js");
require.define("/src/js/intl/strings.js",function(require,module,exports,__dirname,__filename,process,global){exports.strings = { require.define("/src/js/intl/strings.js",function(require,module,exports,__dirname,__filename,process,global){exports.strings = {
///////////////////////////////////////////////////////////////////////////
'git-status-detached': {
'__desc__': 'One of the lines for git status output',
'en_US': 'Detached head!'
},
'git-status-onbranch': {
'__desc__': 'One of the lines for git status output',
'en_US': 'On branch {branch}'
},
'git-status-readytocommit': {
'__desc__': 'One of the lines for git status output',
'en_US': 'Ready to commit! (as always in this demo)'
},
///////////////////////////////////////////////////////////////////////////
'git-dummy-msg': {
'__desc__': 'The dummy commit message for all commits. Feel free to put in a ' +
'shoutout to your school / city / whatever!',
'en_US': 'Quick commit. Go Bears!'
},
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
'git-error-branch': { 'git-error-branch': {
'__desc__': 'One of the error messages for git', '__desc__': 'One of the error messages for git',
@ -23194,10 +23230,10 @@ require.define("/src/js/intl/strings.js",function(require,module,exports,__dirna
'en_US': 'The default behavior is a --hard reset, feel free to omit that option!' 'en_US': 'The default behavior is a --hard reset, feel free to omit that option!'
}, },
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
'git-error-soft': { 'git-error-staging': {
'__desc__': 'One of the error messages for git', '__desc__': 'One of the error messages for git',
'en_US': 'You can\'t use --soft in this demo because there is no concept of ' + 'en_US': 'There is no concept of adding / staging files, so that option or ' +
'stashing changes or staging files' 'command is invalid!'
}, },
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
'git-revert-msg': { 'git-revert-msg': {

View file

@ -514,7 +514,7 @@ GitEngine.prototype.revert = function(whichCommits) {
GitEngine.prototype.resetStarter = function() { GitEngine.prototype.resetStarter = function() {
if (this.commandOptions['--soft']) { if (this.commandOptions['--soft']) {
throw new GitError({ throw new GitError({
msg: intl.str('git-error-soft') msg: intl.str('git-error-staging')
}); });
} }
if (this.commandOptions['--hard']) { if (this.commandOptions['--hard']) {
@ -1469,16 +1469,16 @@ GitEngine.prototype.show = function(ref) {
GitEngine.prototype.statusStarter = function() { GitEngine.prototype.statusStarter = function() {
var lines = []; var lines = [];
if (this.getDetachedHead()) { if (this.getDetachedHead()) {
lines.push('Detached Head!'); lines.push(intl.str('git-status-detached'));
} else { } else {
var branchName = this.HEAD.get('target').get('id'); var branchName = this.HEAD.get('target').get('id');
lines.push('On branch ' + branchName); lines.push(intl.str('git-stauts-onbranch', {branch: branchName}));
} }
lines.push('Changes to be committed:'); lines.push('Changes to be committed:');
lines.push(''); lines.push('');
lines.push('    modified: cal/OskiCostume.stl'); lines.push('    modified: cal/OskiCostume.stl');
lines.push(''); lines.push('');
lines.push('Ready to commit! (as always in this demo)'); lines.push(intl.str('git-status-readytocommit'));
var msg = ''; var msg = '';
_.each(lines, function(line) { _.each(lines, function(line) {
@ -1497,7 +1497,7 @@ GitEngine.prototype.logStarter = function() {
this.logWithout(this.generalArgs[0], this.generalArgs[1]); this.logWithout(this.generalArgs[0], this.generalArgs[1]);
} else { } else {
throw new GitError({ throw new GitError({
msg: 'I need a not branch (^branchName) when getting two arguments!' msg: intl.str('git-error-options')
}); });
} }
} }
@ -1551,8 +1551,7 @@ GitEngine.prototype.log = function(ref, omitSet) {
GitEngine.prototype.addStarter = function() { GitEngine.prototype.addStarter = function() {
throw new CommandResult({ throw new CommandResult({
msg: "This demo is meant to demonstrate git branching, so don't worry about " + msg: intl.str('git-error-staging')
"adding / staging files. Just go ahead and commit away!"
}); });
}; };
@ -1701,7 +1700,7 @@ var Commit = Backbone.Model.extend({
this.set('createTime', new Date().toString()); this.set('createTime', new Date().toString());
} }
if (!this.get('commitMessage')) { if (!this.get('commitMessage')) {
this.set('commitMessage', 'Quick Commit. Go Bears!'); this.set('commitMessage', intl.str('git-dummy-msg'));
} }
this.set('children', []); this.set('children', []);

View file

@ -1,4 +1,23 @@
exports.strings = { exports.strings = {
///////////////////////////////////////////////////////////////////////////
'git-status-detached': {
'__desc__': 'One of the lines for git status output',
'en_US': 'Detached head!'
},
'git-status-onbranch': {
'__desc__': 'One of the lines for git status output',
'en_US': 'On branch {branch}'
},
'git-status-readytocommit': {
'__desc__': 'One of the lines for git status output',
'en_US': 'Ready to commit! (as always in this demo)'
},
///////////////////////////////////////////////////////////////////////////
'git-dummy-msg': {
'__desc__': 'The dummy commit message for all commits. Feel free to put in a ' +
'shoutout to your school / city / whatever!',
'en_US': 'Quick commit. Go Bears!'
},
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
'git-error-branch': { 'git-error-branch': {
'__desc__': 'One of the error messages for git', '__desc__': 'One of the error messages for git',
@ -71,10 +90,10 @@ exports.strings = {
'en_US': 'The default behavior is a --hard reset, feel free to omit that option!' 'en_US': 'The default behavior is a --hard reset, feel free to omit that option!'
}, },
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
'git-error-soft': { 'git-error-staging': {
'__desc__': 'One of the error messages for git', '__desc__': 'One of the error messages for git',
'en_US': 'You can\'t use --soft in this demo because there is no concept of ' + 'en_US': 'There is no concept of adding / staging files, so that option or ' +
'stashing changes or staging files' 'command is invalid!'
}, },
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
'git-revert-msg': { 'git-revert-msg': {