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

ugly bug around unescaping

Browse source
This commit is contained in:
Peter Cottle 2013-10-06 15:49:59 -07:00
parent bbf837a4b2
commit 11074dba64
4 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

22
build/bundle.js
View file

@ -7488,7 +7488,7 @@ GitEngine.prototype.loadTree = function(tree) {
}; };
GitEngine.prototype.loadTreeFromString = function(treeString) { GitEngine.prototype.loadTreeFromString = function(treeString) {
this.loadTree(JSON.parse(unescape(treeString))); this.loadTree(JSON.parse(unescape(this.crappyUnescape(treeString))));
}; };
GitEngine.prototype.instantiateFromTree = function(tree) { GitEngine.prototype.instantiateFromTree = function(tree) {
@ -7579,6 +7579,7 @@ GitEngine.prototype.makeOrigin = function(treeString) {
ORIGIN_PREFIX + branchName, ORIGIN_PREFIX + branchName,
this.getCommitFromRef(originTarget) this.getCommitFromRef(originTarget)
); );
console.log('made tracking branch', originBranch);
this.setLocalToTrackRemote(this.refs[branchJSON.id], originBranch); this.setLocalToTrackRemote(this.refs[branchJSON.id], originBranch);
}, this); }, this);
@ -9293,7 +9294,7 @@ GitEngine.prototype.deleteBranch = function(name) {
}; };
GitEngine.prototype.crappyUnescape = function(str) { GitEngine.prototype.crappyUnescape = function(str) {
return str.replace(/'/g, "'").replace(///g, '/'); return str.replace(/'/g, "'").replace(///g, "/");
}; };
GitEngine.prototype.filterError = function(err) { GitEngine.prototype.filterError = function(err) {
@ -15045,8 +15046,8 @@ var Command = Backbone.Model.extend({
} }
}, },
oneArgImpliedHead: function(args) { oneArgImpliedHead: function(args, option) {
this.validateArgBounds(args, 0, 1); this.validateArgBounds(args, 0, 1, option);
// and if it's one, add a HEAD to the back // and if it's one, add a HEAD to the back
if (args.length === 0) { if (args.length === 0) {
args.push('HEAD'); args.push('HEAD');
@ -17162,6 +17163,7 @@ GitVisuals.prototype.addBranch = function(branch) {
gitVisuals: this, gitVisuals: this,
gitEngine: this.gitEngine gitEngine: this.gitEngine
}); });
console.log('adding new branch', branch.get('id'));
this.visBranchCollection.add(visBranch); this.visBranchCollection.add(visBranch);
if (this.gitReady) { if (this.gitReady) {
@ -18014,7 +18016,6 @@ var VisBranch = VisBase.extend({
console.log('set visbranch on this', this.get('branch'), this); console.log('set visbranch on this', this.get('branch'), this);
window.debugVisBranch = this; window.debugVisBranch = this;
window.debugBranch = this.get('branch'); window.debugBranch = this.get('branch');
debugger;
} }
var id = this.get('branch').get('id'); var id = this.get('branch').get('id');
@ -26172,7 +26173,7 @@ GitEngine.prototype.loadTree = function(tree) {
}; };
GitEngine.prototype.loadTreeFromString = function(treeString) { GitEngine.prototype.loadTreeFromString = function(treeString) {
this.loadTree(JSON.parse(unescape(treeString))); this.loadTree(JSON.parse(unescape(this.crappyUnescape(treeString))));
}; };
GitEngine.prototype.instantiateFromTree = function(tree) { GitEngine.prototype.instantiateFromTree = function(tree) {
@ -26263,6 +26264,7 @@ GitEngine.prototype.makeOrigin = function(treeString) {
ORIGIN_PREFIX + branchName, ORIGIN_PREFIX + branchName,
this.getCommitFromRef(originTarget) this.getCommitFromRef(originTarget)
); );
console.log('made tracking branch', originBranch);
this.setLocalToTrackRemote(this.refs[branchJSON.id], originBranch); this.setLocalToTrackRemote(this.refs[branchJSON.id], originBranch);
}, this); }, this);
@ -27977,7 +27979,7 @@ GitEngine.prototype.deleteBranch = function(name) {
}; };
GitEngine.prototype.crappyUnescape = function(str) { GitEngine.prototype.crappyUnescape = function(str) {
return str.replace(/'/g, "'").replace(///g, '/'); return str.replace(/'/g, "'").replace(///g, "/");
}; };
GitEngine.prototype.filterError = function(err) { GitEngine.prototype.filterError = function(err) {
@ -31355,8 +31357,8 @@ var Command = Backbone.Model.extend({
} }
}, },
oneArgImpliedHead: function(args) { oneArgImpliedHead: function(args, option) {
this.validateArgBounds(args, 0, 1); this.validateArgBounds(args, 0, 1, option);
// and if it's one, add a HEAD to the back // and if it's one, add a HEAD to the back
if (args.length === 0) { if (args.length === 0) {
args.push('HEAD'); args.push('HEAD');
@ -36271,6 +36273,7 @@ GitVisuals.prototype.addBranch = function(branch) {
gitVisuals: this, gitVisuals: this,
gitEngine: this.gitEngine gitEngine: this.gitEngine
}); });
console.log('adding new branch', branch.get('id'));
this.visBranchCollection.add(visBranch); this.visBranchCollection.add(visBranch);
if (this.gitReady) { if (this.gitReady) {
@ -36712,7 +36715,6 @@ var VisBranch = VisBase.extend({
console.log('set visbranch on this', this.get('branch'), this); console.log('set visbranch on this', this.get('branch'), this);
window.debugVisBranch = this; window.debugVisBranch = this;
window.debugBranch = this.get('branch'); window.debugBranch = this.get('branch');
debugger;
} }
var id = this.get('branch').get('id'); var id = this.get('branch').get('id');

5
src/js/git/index.js
View file

@ -266,7 +266,7 @@ GitEngine.prototype.loadTree = function(tree) {
}; };
GitEngine.prototype.loadTreeFromString = function(treeString) { GitEngine.prototype.loadTreeFromString = function(treeString) {
this.loadTree(JSON.parse(unescape(treeString))); this.loadTree(JSON.parse(unescape(this.crappyUnescape(treeString))));
}; };
GitEngine.prototype.instantiateFromTree = function(tree) { GitEngine.prototype.instantiateFromTree = function(tree) {
@ -357,6 +357,7 @@ GitEngine.prototype.makeOrigin = function(treeString) {
ORIGIN_PREFIX + branchName, ORIGIN_PREFIX + branchName,
this.getCommitFromRef(originTarget) this.getCommitFromRef(originTarget)
); );
console.log('made tracking branch', originBranch);
this.setLocalToTrackRemote(this.refs[branchJSON.id], originBranch); this.setLocalToTrackRemote(this.refs[branchJSON.id], originBranch);
}, this); }, this);
@ -2071,7 +2072,7 @@ GitEngine.prototype.deleteBranch = function(name) {
}; };
GitEngine.prototype.crappyUnescape = function(str) { GitEngine.prototype.crappyUnescape = function(str) {
return str.replace(/'/g, "'").replace(///g, '/'); return str.replace(/'/g, "'").replace(///g, "/");
}; };
GitEngine.prototype.filterError = function(err) { GitEngine.prototype.filterError = function(err) {

4
src/js/models/commandModel.js
View file

@ -116,8 +116,8 @@ var Command = Backbone.Model.extend({
} }
}, },
oneArgImpliedHead: function(args) { oneArgImpliedHead: function(args, option) {
this.validateArgBounds(args, 0, 1); this.validateArgBounds(args, 0, 1, option);
// and if it's one, add a HEAD to the back // and if it's one, add a HEAD to the back
if (args.length === 0) { if (args.length === 0) {
args.push('HEAD'); args.push('HEAD');

1
src/js/visuals/visBranch.js
View file

@ -64,7 +64,6 @@ var VisBranch = VisBase.extend({
console.log('set visbranch on this', this.get('branch'), this); console.log('set visbranch on this', this.get('branch'), this);
window.debugVisBranch = this; window.debugVisBranch = this;
window.debugBranch = this.get('branch'); window.debugBranch = this.get('branch');
debugger;
} }
var id = this.get('branch').get('id'); var id = this.get('branch').get('id');