refreshing prod since glone si broken there

This commit is contained in:
Peter Cottle 2013-09-09 11:42:57 -07:00
parent 3d40125e75
commit 6291baf665
7 changed files with 27 additions and 4 deletions

View file

@ -7578,7 +7578,7 @@ GitEngine.prototype.setLocalToTrackRemote = function(localBranch, remoteBranch)
remoteBranch.addLocalBranchThatTracksThis(localBranch);
localBranch.setRemoteTrackingBranchID(remoteBranch.get('id'));
// same for local
// same for local TODO intl
var msg = 'local branch "' +
localBranch.get('id') +
'" set to track remote branch "' +
@ -14996,6 +14996,13 @@ var Command = Backbone.Model.extend({
}
},
twoArgsImpliedOrigin: function(args) {
this.validateArgBounds(args, 0, 2);
if (args.length < 2) {
args.unshift('origin');
}
},
// this is a little utility class to help arg validation that happens over and over again
validateArgBounds: function(args, lower, upper, option) {
var what = (option === undefined) ?
@ -26028,7 +26035,7 @@ GitEngine.prototype.setLocalToTrackRemote = function(localBranch, remoteBranch)
remoteBranch.addLocalBranchThatTracksThis(localBranch);
localBranch.setRemoteTrackingBranchID(remoteBranch.get('id'));
// same for local
// same for local TODO intl
var msg = 'local branch "' +
localBranch.get('id') +
'" set to track remote branch "' +
@ -31101,6 +31108,13 @@ var Command = Backbone.Model.extend({
}
},
twoArgsImpliedOrigin: function(args) {
this.validateArgBounds(args, 0, 2);
if (args.length < 2) {
args.unshift('origin');
}
},
// this is a little utility class to help arg validation that happens over and over again
validateArgBounds: function(args, lower, upper, option) {
var what = (option === undefined) ?

File diff suppressed because one or more lines are too long

1
build/bundle.min.js vendored Normal file

File diff suppressed because one or more lines are too long

View file

@ -445,7 +445,7 @@
For a much easier time perusing the source, see the individual files at:
https://github.com/pcottle/learnGitBranching
-->
<script src="build/bundle.js"></script>
<script src="build/bundle.min.3bbe8ceb.js"></script>
<!-- The advantage of github pages: super-easy, simple, slick static hostic.
The downside? No raw logs to parse for analytics, so I have to include

View file

@ -349,7 +349,6 @@ GitEngine.prototype.makeOrigin = function(treeString) {
ORIGIN_PREFIX + branchName,
this.getCommitFromRef(originTarget)
);
debugger;
this.setLocalToTrackRemote(this.refs[branchJSON.id], originBranch);
}, this);

View file

@ -133,6 +133,13 @@ var Command = Backbone.Model.extend({
}
},
twoArgsImpliedOrigin: function(args) {
this.validateArgBounds(args, 0, 2);
if (args.length < 2) {
args.unshift('origin');
}
},
// this is a little utility class to help arg validation that happens over and over again
validateArgBounds: function(args, lower, upper, option) {
var what = (option === undefined) ?

View file

@ -11,6 +11,7 @@ Medium things:
~~~~~~~~~~~~~~~~~~~~~~~~~~~
[ ] figure out what to do with instant commands (and parse waterfall and the like)
[ ] disable git commands on hg levels
[ ] EASY -- make colors the same between remote branches and their remote counterparts
Cases to handle / things to edit
=======================