Mercurial > hg > mercurial-source

changeset 32494:6c80f985a13c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
diff: slice over bytes to make sure conditions work normally Both of this are part of generating `hg diff` on python 3.
author Pulkit Goyal <7895pulkit@gmail.com>
date Sun, 26 Mar 2017 20:52:51 +0530
parents bbf7a29dcf9b
children 439a387ca6f1
files mercurial/mdiff.py mercurial/patch.py
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/mdiff.py
+++ b/mercurial/mdiff.py
@@ -229,7 +229,7 @@
 
     def checknonewline(lines):
         for text in lines:
-            if text[-1] != '\n':
+            if text[-1:] != '\n':
                 text += "\n\ No newline at end of file\n"
             yield text
 
--- a/mercurial/patch.py
+++ b/mercurial/patch.py
@@ -737,7 +737,7 @@
         for x in self.rej:
             for l in x.hunk:
                 lines.append(l)
-                if l[-1] != '\n':
+                if l[-1:] != '\n':
                     lines.append("\n\ No newline at end of file\n")
         self.backend.writerej(self.fname, len(self.rej), self.hunks, lines)