Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
diffhelpers: naming and whitespace cleanup
authorYuya Nishihara <yuya@tcha.org>
Mon, 09 Apr 2018 20:52:54 +0900
changeset 37570 c4c8d0d1267f
parent 37569 2025bf60adb2
child 37571 0ea8b9576d7c
diffhelpers: naming and whitespace cleanup
mercurial/patch.py file | annotate | diff | comparison | revisions
mercurial/pure/diffhelpers.py file | annotate | diff | comparison | revisions 
--- a/mercurial/patch.py	Mon Apr 09 20:51:23 2018 +0900
+++ b/mercurial/patch.py	Mon Apr 09 20:52:54 2018 +0900
@@ -1372,7 +1372,7 @@
     def _fixnewline(self, lr):
         l = lr.readline()
         if l.startswith('\ '):
-            diffhelpers.fix_newline(self.hunk, self.a, self.b)
+            diffhelpers.fixnewline(self.hunk, self.a, self.b)
         else:
             lr.push(l)
 
--- a/mercurial/pure/diffhelpers.py	Mon Apr 09 20:51:23 2018 +0900
+++ b/mercurial/pure/diffhelpers.py	Mon Apr 09 20:52:54 2018 +0900
@@ -23,7 +23,7 @@
         for i in xrange(num):
             s = fp.readline()
             if s == "\\ No newline at end of file\n":
-                fix_newline(hunk, a, b)
+                fixnewline(hunk, a, b)
                 continue
             if s == "\n":
                 # Some patches may be missing the control char
@@ -39,7 +39,7 @@
                 a.append(s)
     return 0
 
-def fix_newline(hunk, a, b):
+def fixnewline(hunk, a, b):
     """Fix up the last lines of a and b when the patch has no newline at EOF"""
     l = hunk[-1]
     # tolerate CRLF in last line
@@ -55,7 +55,6 @@
     hunk[-1] = hline
     return 0
 
-
 def testhunk(a, b, bstart):
     """Compare the lines in a with the lines in b
Mercurial