From 11074dba64fd34041ae287c51bf72a689c7bd601 Mon Sep 17 00:00:00 2001 From: Peter Cottle Date: Sun, 6 Oct 2013 15:49:59 -0700 Subject: [PATCH] ugly bug around unescaping --- build/bundle.js | 22 ++++++++++++---------- src/js/git/index.js | 5 +++-- src/js/models/commandModel.js | 4 ++-- src/js/visuals/visBranch.js | 1 - 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/build/bundle.js b/build/bundle.js index 22043f54..fa7889a8 100644 --- a/build/bundle.js +++ b/build/bundle.js @@ -7488,7 +7488,7 @@ GitEngine.prototype.loadTree = function(tree) { }; GitEngine.prototype.loadTreeFromString = function(treeString) { - this.loadTree(JSON.parse(unescape(treeString))); + this.loadTree(JSON.parse(unescape(this.crappyUnescape(treeString)))); }; GitEngine.prototype.instantiateFromTree = function(tree) { @@ -7579,6 +7579,7 @@ GitEngine.prototype.makeOrigin = function(treeString) { ORIGIN_PREFIX + branchName, this.getCommitFromRef(originTarget) ); + console.log('made tracking branch', originBranch); this.setLocalToTrackRemote(this.refs[branchJSON.id], originBranch); }, this); @@ -9293,7 +9294,7 @@ GitEngine.prototype.deleteBranch = function(name) { }; GitEngine.prototype.crappyUnescape = function(str) { - return str.replace(/'/g, "'").replace(///g, '/'); + return str.replace(/'/g, "'").replace(///g, "/"); }; GitEngine.prototype.filterError = function(err) { @@ -15045,8 +15046,8 @@ var Command = Backbone.Model.extend({ } }, - oneArgImpliedHead: function(args) { - this.validateArgBounds(args, 0, 1); + oneArgImpliedHead: function(args, option) { + this.validateArgBounds(args, 0, 1, option); // and if it's one, add a HEAD to the back if (args.length === 0) { args.push('HEAD'); @@ -17162,6 +17163,7 @@ GitVisuals.prototype.addBranch = function(branch) { gitVisuals: this, gitEngine: this.gitEngine }); + console.log('adding new branch', branch.get('id')); this.visBranchCollection.add(visBranch); if (this.gitReady) { @@ -18014,7 +18016,6 @@ var VisBranch = VisBase.extend({ console.log('set visbranch on this', this.get('branch'), this); window.debugVisBranch = this; window.debugBranch = this.get('branch'); - debugger; } var id = this.get('branch').get('id'); @@ -26172,7 +26173,7 @@ GitEngine.prototype.loadTree = function(tree) { }; GitEngine.prototype.loadTreeFromString = function(treeString) { - this.loadTree(JSON.parse(unescape(treeString))); + this.loadTree(JSON.parse(unescape(this.crappyUnescape(treeString)))); }; GitEngine.prototype.instantiateFromTree = function(tree) { @@ -26263,6 +26264,7 @@ GitEngine.prototype.makeOrigin = function(treeString) { ORIGIN_PREFIX + branchName, this.getCommitFromRef(originTarget) ); + console.log('made tracking branch', originBranch); this.setLocalToTrackRemote(this.refs[branchJSON.id], originBranch); }, this); @@ -27977,7 +27979,7 @@ GitEngine.prototype.deleteBranch = function(name) { }; GitEngine.prototype.crappyUnescape = function(str) { - return str.replace(/'/g, "'").replace(///g, '/'); + return str.replace(/'/g, "'").replace(///g, "/"); }; GitEngine.prototype.filterError = function(err) { @@ -31355,8 +31357,8 @@ var Command = Backbone.Model.extend({ } }, - oneArgImpliedHead: function(args) { - this.validateArgBounds(args, 0, 1); + oneArgImpliedHead: function(args, option) { + this.validateArgBounds(args, 0, 1, option); // and if it's one, add a HEAD to the back if (args.length === 0) { args.push('HEAD'); @@ -36271,6 +36273,7 @@ GitVisuals.prototype.addBranch = function(branch) { gitVisuals: this, gitEngine: this.gitEngine }); + console.log('adding new branch', branch.get('id')); this.visBranchCollection.add(visBranch); if (this.gitReady) { @@ -36712,7 +36715,6 @@ var VisBranch = VisBase.extend({ console.log('set visbranch on this', this.get('branch'), this); window.debugVisBranch = this; window.debugBranch = this.get('branch'); - debugger; } var id = this.get('branch').get('id'); diff --git a/src/js/git/index.js b/src/js/git/index.js index 73042bf1..a11a6ead 100644 --- a/src/js/git/index.js +++ b/src/js/git/index.js @@ -266,7 +266,7 @@ GitEngine.prototype.loadTree = function(tree) { }; GitEngine.prototype.loadTreeFromString = function(treeString) { - this.loadTree(JSON.parse(unescape(treeString))); + this.loadTree(JSON.parse(unescape(this.crappyUnescape(treeString)))); }; GitEngine.prototype.instantiateFromTree = function(tree) { @@ -357,6 +357,7 @@ GitEngine.prototype.makeOrigin = function(treeString) { ORIGIN_PREFIX + branchName, this.getCommitFromRef(originTarget) ); + console.log('made tracking branch', originBranch); this.setLocalToTrackRemote(this.refs[branchJSON.id], originBranch); }, this); @@ -2071,7 +2072,7 @@ GitEngine.prototype.deleteBranch = function(name) { }; GitEngine.prototype.crappyUnescape = function(str) { - return str.replace(/'/g, "'").replace(///g, '/'); + return str.replace(/'/g, "'").replace(///g, "/"); }; GitEngine.prototype.filterError = function(err) { diff --git a/src/js/models/commandModel.js b/src/js/models/commandModel.js index bbd9075f..2e93f6ca 100644 --- a/src/js/models/commandModel.js +++ b/src/js/models/commandModel.js @@ -116,8 +116,8 @@ var Command = Backbone.Model.extend({ } }, - oneArgImpliedHead: function(args) { - this.validateArgBounds(args, 0, 1); + oneArgImpliedHead: function(args, option) { + this.validateArgBounds(args, 0, 1, option); // and if it's one, add a HEAD to the back if (args.length === 0) { args.push('HEAD'); diff --git a/src/js/visuals/visBranch.js b/src/js/visuals/visBranch.js index cc66d518..d2848e76 100644 --- a/src/js/visuals/visBranch.js +++ b/src/js/visuals/visBranch.js @@ -64,7 +64,6 @@ var VisBranch = VisBase.extend({ console.log('set visbranch on this', this.get('branch'), this); window.debugVisBranch = this; window.debugBranch = this.get('branch'); - debugger; } var id = this.get('branch').get('id');