nodegit · johnhaley81 · Dec 29, 2015 · Dec 28, 2015 · Dec 28, 2015
diff --git a/lib/convenient_line.js b/lib/convenient_line.js
@@ -3,59 +3,59 @@ var NodeGit = require("../");
 function ConvenientLine(raw, i) {
   this.raw = raw;
   this.i = i;
+  this._cache = {};
 }
 
 /**
-* The content of the line
-* @return {String}
+* The type of the line (context, addition, deletion, etc...)
+* @return {Diff.LINE}
 */
 ConvenientLine.prototype.origin = function() {
  return this.raw.origin();
 };
 
 /**
-* The content of the line
-* @return {String}
+* Line number in old file or -1 for added line
+* @return {Number}
 */
 ConvenientLine.prototype.oldLineno = function() {
  return this.raw.oldLineno();
 };
 
 /**
-* The content of the line
-* @return {String}
+* Line number in new file or -1 for deleted line
+* @return {Number}
 */
 ConvenientLine.prototype.newLineno = function() {
  return this.raw.newLineno();
 };
 
 /**
-* The content of the line
-* @return {String}
+* Number of newline characters in content
+* @return {Number}
 */
 ConvenientLine.prototype.numLines = function() {
  return this.raw.numLines();
 };
 
 /**
-* The content of the line
-* @return {String}
+* Number of bytes in the string
+* @return {Number}
 */
 ConvenientLine.prototype.contentLen = function() {
- return this.raw.contentLen();
+  return this.raw.contentLen();
 };
 
-
 /**
-* The content of the line
-* @return {String}
+* Offset in the original file to the content
+* @return {Number}
 */
 ConvenientLine.prototype.contentOffset = function() {
  return this.raw.contentOffset();
 };
 
 /**
-* The content of the line
+* Pointer to diff text, not NUL-byte terminated
 * @return {String}
 */
 ConvenientLine.prototype.rawContent = function() {
@@ -67,8 +67,13 @@ ConvenientLine.prototype.rawContent = function() {
 * @return {String}
 */
 ConvenientLine.prototype.content = function() {
-  return this.raw.content()
-    .substring(0, this.raw.contentLen()).replace("\n", "");
+  if (!this._cache.content) {
+    this._cache.content = new Buffer(this.raw.content())
+      .slice(0, this.raw.contentLen())
+      .toString("utf8");
+  }
+
+  return this._cache.content;
 };
 
 NodeGit.ConvenientLine = ConvenientLine;
diff --git a/lib/repository.js b/lib/repository.js
@@ -1286,9 +1286,6 @@ Repository.prototype.stageLines =
             (!isStaged && (!newLine || newLine.length === 0))) {
         if (hunkLine.origin() !== lineTypes.ADDED) {
           newContent += hunkLine.content();
-          if (hunkLine.raw.numLines() !== 0) {
-            newContent += "\n";
-          }
         }
         if ((isStaged && hunkLine.origin() !== lineTypes.DELETED) ||
             (!isStaged && hunkLine.origin() !== lineTypes.ADDED)) {
@@ -1299,9 +1296,6 @@ Repository.prototype.stageLines =
         switch (hunkLine.origin()) {
           case lineTypes.ADDED:
             newContent += hunkLine.content();
-            if (hunkLine.raw.numLines() !== 0) {
-              newContent += "\n";
-            }
             if (isStaged) {
               oldIndex++;
             }

diff --git a/test/tests/commit.js b/test/tests/commit.js
@@ -520,10 +520,6 @@ describe("Commit", function() {
                   " line q\nline r\nline   s\nline t\n\nline u\n" +
                   "line v1\nline w\nline x\n			\nline y\nline z\n";
 
-    function getLineText(line) {
-      return line.rawContent().substring(0, line.contentLen());
-    }
-
     return NodeGit.Repository.open(reposPath)
     .then(function(repoResult) {
       repo = repoResult;
@@ -559,33 +555,37 @@ describe("Commit", function() {
       //check all hunk lines
       assert.equal(lines.length, 12);
       assert.equal(lines[0].origin(), Diff.LINE.CONTEXT);
-      assert.equal(lines[1].contentLen(), 9);
 
-      assert.equal(getLineText(lines[1]), "line   s\n");
+      assert.equal(lines[1].content().length, 9);
+      assert.equal(lines[1].content(), "line   s\n");
       assert.equal(lines[1].origin(), Diff.LINE.CONTEXT);
+
       assert.equal(lines[2].origin(), Diff.LINE.CONTEXT);
 
-      assert.equal(lines[3].contentLen(), 1);
-      assert.equal(getLineText(lines[3]), "\n");
+      assert.equal(lines[3].content().length, 1);
+      assert.equal(lines[3].content(), "\n");
       assert.equal(lines[3].origin(), Diff.LINE.ADDITION);
 
       assert.equal(lines[4].origin(), Diff.LINE.CONTEXT);
 
-      assert.equal(lines[5].contentLen(), 7);
-      assert.equal(getLineText(lines[5]), "line v\n");
+      assert.equal(lines[5].content().length, 7);
+      assert.equal(lines[5].content(), "line v\n");
       assert.equal(lines[5].origin(), Diff.LINE.DELETION);
-      assert.equal(lines[6].contentLen(), 8);
-      assert.equal(getLineText(lines[6]), "line v1\n");
+
+      assert.equal(lines[6].content().length, 8);
+      assert.equal(lines[6].content(), "line v1\n");
       assert.equal(lines[6].origin(), Diff.LINE.ADDITION);
 
       assert.equal(lines[7].origin(), Diff.LINE.CONTEXT);
+
       assert.equal(lines[8].origin(), Diff.LINE.CONTEXT);
 
-      assert.equal(lines[9].contentLen(), 4);
-      assert.equal(getLineText(lines[9]), "\t\t\t\n");
+      assert.equal(lines[9].content().length, 4);
+      assert.equal(lines[9].content(), "\t\t\t\n");
       assert.equal(lines[9].origin(), Diff.LINE.ADDITION);
 
       assert.equal(lines[10].origin(), Diff.LINE.CONTEXT);
+
       assert.equal(lines[11].origin(), Diff.LINE.CONTEXT);
     });
   });

diff --git a/test/tests/convenient_line.js b/test/tests/convenient_line.js
@@ -0,0 +1,69 @@
+var assert = require("assert");
+var repoSetup = require("../utils/repository_setup");
+var promisify = require("promisify-node");
+var fse = promisify(require("fs-extra"));
+var path = require("path");
+var local = path.join.bind(path, __dirname);
+
+describe("ConvenientLine", function() {
+  var repoPath = local("../repos/convenientLineTest");
+  var unicodeLine = "Ťḥ𝖎ṧ ℓỈ𝓃ệ çǒ𝚗ẗảḭṋṦ Û𝐧ǐ𝗰ṓḍ𝔢\n";
+  var asciiLine = "but this line doesn't\n";
+
+  beforeEach(function() {
+    var test = this;
+
+    return repoSetup.createRepository(repoPath)
+      .then(function(repo) {
+        return repoSetup.commitFileToRepo(
+          repo,
+          "fileWithUnicodeChars",
+          unicodeLine + asciiLine
+        );
+      })
+      .then(function(commit) {
+        return commit.getDiff();
+      })
+      .then(function(diff) {
+        return diff[0].patches();
+      })
+      .then(function(patches) {
+        return patches[0].hunks();
+      })
+      .then(function(hunks) {
+        return hunks[0].lines();
+      })
+      .then(function(lines) {
+        test.unicodeLine = lines[0];
+        test.asciiLine = lines[1];
+      });
+  });
+
+  after(function() {
+    return fse.remove(repoPath);
+  });
+
+  it("can parse the byte length of a unicode string", function() {
+    var line = this.unicodeLine;
+
+    assert.equal(line.contentLen(), Buffer.byteLength(unicodeLine, "utf8"));
+  });
+
+  it("can get a line that contains unicode", function() {
+    var line = this.unicodeLine;
+
+    assert.equal(line.content(), unicodeLine);
+  });
+
+  it("can parse the byte length of a ascii string", function() {
+    var line = this.asciiLine;
+
+    assert.equal(line.contentLen(), Buffer.byteLength(asciiLine, "utf8"));
+  });
+
+  it("can get a line that contains ascii", function() {
+    var line = this.asciiLine;
+
+    assert.equal(line.content(), asciiLine);
+  });
+});
diff --git a/test/tests/diff.js b/test/tests/diff.js
@@ -115,16 +115,16 @@ describe("Diff", function() {
 
         var oldContent = "__Before submitting a pull request, please ensure " +
           "both unit tests and lint checks pass.__\n";
-        assert.equal(lines[3].rawContent(), oldContent);
+        assert.equal(lines[3].content(), oldContent);
         assert.equal(lines[3].origin(), Diff.LINE.DELETION);
-        assert.equal(lines[3].contentLen(), 90);
+        assert.equal(lines[3].content().length, oldContent.length);
 
         var newContent = "__Before submitting a pull request, please ensure " +
           "both that you've added unit tests to cover your shiny new code, " +
           "and that all unit tests and lint checks pass.__\n";
-        assert.equal(lines[4].rawContent(), newContent);
+        assert.equal(lines[4].content(), newContent);
         assert.equal(lines[4].origin(), Diff.LINE.ADDITION);
-        assert.equal(lines[4].contentLen(), 162);
+        assert.equal(lines[4].content().length, newContent.length);
       });
   });
 
@@ -182,7 +182,7 @@ describe("Diff", function() {
       })
       .then(function(lines) {
         lines.forEach(function(line) {
-          assert(!/\n/.exec(line.content()));
+          assert(/\n/.exec(line.content()));
           assert(/\n/.exec(line.rawContent()));
         });
       });

diff --git a/test/tests/stage.js b/test/tests/stage.js
@@ -245,7 +245,7 @@ function stagingTest(staging, newFileContent) {
             throw ("File change when no file change expected.");
           }
         } else {
-          assert(delta.newFile().mode() - delta.oldFile().mode() === 
+          assert(delta.newFile().mode() - delta.oldFile().mode() ===
             fileModeDifference);
         }
         return true;
@@ -265,7 +265,7 @@ function stagingTest(staging, newFileContent) {
                               fileContent)
           .then(function() {
             //Then, change the permission locally.
-            return fse.chmod(path.join(test.repository.workdir(), fileName), 
+            return fse.chmod(path.join(test.repository.workdir(), fileName),
               0755 /* new filemode */);
           });
       })
@@ -310,7 +310,7 @@ function stagingTest(staging, newFileContent) {
                               fileContent)
           .then(function() {
             //Then, change the permission locally.
-            return fse.chmod(path.join(test.repository.workdir(), fileName), 
+            return fse.chmod(path.join(test.repository.workdir(), fileName),
               0755 /* new filemode */);
           });
       })