| pulkit |
| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/crecord.py (5 lines) | |||
| M | mercurial/diffhelper.py (4 lines) | |||
| M | mercurial/mdiff.py (11 lines) | |||
| M | mercurial/patch.py (4 lines) |
| import signal | import signal | ||||
| from .i18n import _ | from .i18n import _ | ||||
| from .pycompat import ( | from .pycompat import ( | ||||
| getattr, | getattr, | ||||
| open, | open, | ||||
| ) | ) | ||||
| from . import ( | from . import ( | ||||
| diffhelper, | |||||
| encoding, | encoding, | ||||
| error, | error, | ||||
| patch as patchmod, | patch as patchmod, | ||||
| pycompat, | pycompat, | ||||
| scmutil, | scmutil, | ||||
| util, | util, | ||||
| ) | ) | ||||
| from .utils import stringutil | from .utils import stringutil | ||||
| def getfromtoline(self): | def getfromtoline(self): | ||||
| # calculate the number of removed lines converted to context lines | # calculate the number of removed lines converted to context lines | ||||
| removedconvertedtocontext = self.originalremoved - self.removed | removedconvertedtocontext = self.originalremoved - self.removed | ||||
| contextlen = ( | contextlen = ( | ||||
| len(self.before) + len(self.after) + removedconvertedtocontext | len(self.before) + len(self.after) + removedconvertedtocontext | ||||
| ) | ) | ||||
| if self.after and self.after[-1] == b'\\ No newline at end of file\n': | if self.after and self.after[-1] == diffhelper.MISSING_NEWLINE_MARKER: | ||||
| contextlen -= 1 | contextlen -= 1 | ||||
| fromlen = contextlen + self.removed | fromlen = contextlen + self.removed | ||||
| tolen = contextlen + self.added | tolen = contextlen + self.added | ||||
| # diffutils manual, section "2.2.2.2 detailed description of unified | # diffutils manual, section "2.2.2.2 detailed description of unified | ||||
| # format": "an empty hunk is considered to end at the line that | # format": "an empty hunk is considered to end at the line that | ||||
| # precedes the hunk." | # precedes the hunk." | ||||
| # | # | ||||
| side and "-4" must exist between "-3" and "-5" to make the patch | side and "-4" must exist between "-3" and "-5" to make the patch | ||||
| applicable to B. | applicable to B. | ||||
| """ | """ | ||||
| dels = [] | dels = [] | ||||
| adds = [] | adds = [] | ||||
| noeol = False | noeol = False | ||||
| for line in self.changedlines: | for line in self.changedlines: | ||||
| text = line.linetext | text = line.linetext | ||||
| if line.linetext == b'\\ No newline at end of file\n': | if line.linetext == diffhelper.MISSING_NEWLINE_MARKER: | ||||
| noeol = True | noeol = True | ||||
| break | break | ||||
| if line.applied: | if line.applied: | ||||
| if text.startswith(b'+'): | if text.startswith(b'+'): | ||||
| dels.append(text[1:]) | dels.append(text[1:]) | ||||
| elif text.startswith(b'-'): | elif text.startswith(b'-'): | ||||
| adds.append(text[1:]) | adds.append(text[1:]) | ||||
| elif text.startswith(b'+'): | elif text.startswith(b'+'): | ||||
| # diffhelper.py - helper routines for patch | # diffhelper.py - helper routines for patch | ||||
| # | # | ||||
| # Copyright 2009 Matt Mackall <mpm@selenic.com> and others | # Copyright 2009 Matt Mackall <mpm@selenic.com> and others | ||||
| # | # | ||||
| # This software may be used and distributed according to the terms of the | # This software may be used and distributed according to the terms of the | ||||
| # GNU General Public License version 2 or any later version. | # GNU General Public License version 2 or any later version. | ||||
| from __future__ import absolute_import | from __future__ import absolute_import | ||||
| from .i18n import _ | from .i18n import _ | ||||
| from . import ( | from . import ( | ||||
| error, | error, | ||||
| pycompat, | pycompat, | ||||
| ) | ) | ||||
| MISSING_NEWLINE_MARKER = b'\\ No newline at end of file\n' | |||||
| def addlines(fp, hunk, lena, lenb, a, b): | def addlines(fp, hunk, lena, lenb, a, b): | ||||
| """Read lines from fp into the hunk | """Read lines from fp into the hunk | ||||
| The hunk is parsed into two arrays, a and b. a gets the old state of | The hunk is parsed into two arrays, a and b. a gets the old state of | ||||
| the text, b gets the new state. The control char from the hunk is saved | the text, b gets the new state. The control char from the hunk is saved | ||||
| when inserting into a, but not b (for performance while deleting files.) | when inserting into a, but not b (for performance while deleting files.) | ||||
| """ | """ | ||||
| while True: | while True: | ||||
| todoa = lena - len(a) | todoa = lena - len(a) | ||||
| todob = lenb - len(b) | todob = lenb - len(b) | ||||
| num = max(todoa, todob) | num = max(todoa, todob) | ||||
| if num == 0: | if num == 0: | ||||
| break | break | ||||
| for i in pycompat.xrange(num): | for i in pycompat.xrange(num): | ||||
| s = fp.readline() | s = fp.readline() | ||||
| if not s: | if not s: | ||||
| raise error.ParseError(_(b'incomplete hunk')) | raise error.ParseError(_(b'incomplete hunk')) | ||||
| if s == b"\\ No newline at end of file\n": | if s == MISSING_NEWLINE_MARKER: | ||||
| fixnewline(hunk, a, b) | fixnewline(hunk, a, b) | ||||
| continue | continue | ||||
| if s == b'\n' or s == b'\r\n': | if s == b'\n' or s == b'\r\n': | ||||
| # Some patches may be missing the control char | # Some patches may be missing the control char | ||||
| # on empty lines. Supply a leading space. | # on empty lines. Supply a leading space. | ||||
| s = b' ' + s | s = b' ' + s | ||||
| hunk.append(s) | hunk.append(s) | ||||
| if s.startswith(b'+'): | if s.startswith(b'+'): | ||||
| import zlib | import zlib | ||||
| from .i18n import _ | from .i18n import _ | ||||
| from .pycompat import ( | from .pycompat import ( | ||||
| getattr, | getattr, | ||||
| setattr, | setattr, | ||||
| ) | ) | ||||
| from . import ( | from . import ( | ||||
| diffhelper, | |||||
| encoding, | encoding, | ||||
| error, | error, | ||||
| policy, | policy, | ||||
| pycompat, | pycompat, | ||||
| util, | util, | ||||
| ) | ) | ||||
| from .utils import dateutil | from .utils import dateutil | ||||
| _missing_newline_marker = b"\\ No newline at end of file\n" | |||||
| bdiff = policy.importmod('bdiff') | bdiff = policy.importmod('bdiff') | ||||
| mpatch = policy.importmod('mpatch') | mpatch = policy.importmod('mpatch') | ||||
| blocks = bdiff.blocks | blocks = bdiff.blocks | ||||
| fixws = bdiff.fixws | fixws = bdiff.fixws | ||||
| patches = mpatch.patches | patches = mpatch.patches | ||||
| patchedsize = mpatch.patchedsize | patchedsize = mpatch.patchedsize | ||||
| textdiff = bdiff.bdiff | textdiff = bdiff.bdiff | ||||
| l1 = b"--- %s%s%s" % (aprefix, fn1, datetag(ad, fn1)) | l1 = b"--- %s%s%s" % (aprefix, fn1, datetag(ad, fn1)) | ||||
| l2 = b"+++ %s%s" % (bprefix + fn2, datetag(bd, fn2)) | l2 = b"+++ %s%s" % (bprefix + fn2, datetag(bd, fn2)) | ||||
| headerlines = [l1, l2] | headerlines = [l1, l2] | ||||
| size = len(b) | size = len(b) | ||||
| hunkrange = (0, 0, 1, size) | hunkrange = (0, 0, 1, size) | ||||
| hunklines = [b"@@ -0,0 +1,%d @@\n" % size] + [b"+" + e for e in b] | hunklines = [b"@@ -0,0 +1,%d @@\n" % size] + [b"+" + e for e in b] | ||||
| if without_newline: | if without_newline: | ||||
| hunklines[-1] += b'\n' | hunklines[-1] += b'\n' | ||||
| hunklines.append(_missing_newline_marker) | hunklines.append(diffhelper.MISSING_NEWLINE_MARKER) | ||||
| hunks = ((hunkrange, hunklines),) | hunks = ((hunkrange, hunklines),) | ||||
| elif not b: | elif not b: | ||||
| without_newline = not a.endswith(b'\n') | without_newline = not a.endswith(b'\n') | ||||
| a = splitnewlines(a) | a = splitnewlines(a) | ||||
| l1 = b"--- %s%s%s" % (aprefix, fn1, datetag(ad, fn1)) | l1 = b"--- %s%s%s" % (aprefix, fn1, datetag(ad, fn1)) | ||||
| if b is None: | if b is None: | ||||
| l2 = b'+++ /dev/null%s' % datetag(epoch) | l2 = b'+++ /dev/null%s' % datetag(epoch) | ||||
| else: | else: | ||||
| l2 = b"+++ %s%s%s" % (bprefix, fn2, datetag(bd, fn2)) | l2 = b"+++ %s%s%s" % (bprefix, fn2, datetag(bd, fn2)) | ||||
| headerlines = [l1, l2] | headerlines = [l1, l2] | ||||
| size = len(a) | size = len(a) | ||||
| hunkrange = (1, size, 0, 0) | hunkrange = (1, size, 0, 0) | ||||
| hunklines = [b"@@ -1,%d +0,0 @@\n" % size] + [b"-" + e for e in a] | hunklines = [b"@@ -1,%d +0,0 @@\n" % size] + [b"-" + e for e in a] | ||||
| if without_newline: | if without_newline: | ||||
| hunklines[-1] += b'\n' | hunklines[-1] += b'\n' | ||||
| hunklines.append(_missing_newline_marker) | hunklines.append(diffhelper.MISSING_NEWLINE_MARKER) | ||||
| hunks = ((hunkrange, hunklines),) | hunks = ((hunkrange, hunklines),) | ||||
| else: | else: | ||||
| hunks = _unidiff(a, b, opts=opts) | hunks = _unidiff(a, b, opts=opts) | ||||
| if not next(hunks): | if not next(hunks): | ||||
| return sentinel | return sentinel | ||||
| headerlines = [ | headerlines = [ | ||||
| b"--- %s%s%s" % (aprefix, fn1, datetag(ad, fn1)), | b"--- %s%s%s" % (aprefix, fn1, datetag(ad, fn1)), | ||||
| # which the hunk can end in a shared line without a newline. | # which the hunk can end in a shared line without a newline. | ||||
| skip = False | skip = False | ||||
| if not t1.endswith(b'\n') and astart + alen == len(l1) + 1: | if not t1.endswith(b'\n') and astart + alen == len(l1) + 1: | ||||
| for i in pycompat.xrange(len(hunklines) - 1, -1, -1): | for i in pycompat.xrange(len(hunklines) - 1, -1, -1): | ||||
| if hunklines[i].startswith((b'-', b' ')): | if hunklines[i].startswith((b'-', b' ')): | ||||
| if hunklines[i].startswith(b' '): | if hunklines[i].startswith(b' '): | ||||
| skip = True | skip = True | ||||
| hunklines[i] += b'\n' | hunklines[i] += b'\n' | ||||
| hunklines.insert(i + 1, _missing_newline_marker) | hunklines.insert(i + 1, diffhelper.MISSING_NEWLINE_MARKER) | ||||
| break | break | ||||
| if not skip and not t2.endswith(b'\n') and bstart + blen == len(l2) + 1: | if not skip and not t2.endswith(b'\n') and bstart + blen == len(l2) + 1: | ||||
| for i in pycompat.xrange(len(hunklines) - 1, -1, -1): | for i in pycompat.xrange(len(hunklines) - 1, -1, -1): | ||||
| if hunklines[i].startswith(b'+'): | if hunklines[i].startswith(b'+'): | ||||
| hunklines[i] += b'\n' | hunklines[i] += b'\n' | ||||
| hunklines.insert(i + 1, _missing_newline_marker) | hunklines.insert(i + 1, diffhelper.MISSING_NEWLINE_MARKER) | ||||
| break | break | ||||
| yield hunkrange, hunklines | yield hunkrange, hunklines | ||||
| # bdiff.blocks gives us the matching sequences in the files. The loop | # bdiff.blocks gives us the matching sequences in the files. The loop | ||||
| # below finds the spaces between those matching sequences and translates | # below finds the spaces between those matching sequences and translates | ||||
| # them into diff output. | # them into diff output. | ||||
| # | # | ||||
| hunk = None | hunk = None | ||||
| if not self.rej: | if not self.rej: | ||||
| return | return | ||||
| base = os.path.basename(self.fname) | base = os.path.basename(self.fname) | ||||
| lines = [b"--- %s\n+++ %s\n" % (base, base)] | lines = [b"--- %s\n+++ %s\n" % (base, base)] | ||||
| for x in self.rej: | for x in self.rej: | ||||
| for l in x.hunk: | for l in x.hunk: | ||||
| lines.append(l) | lines.append(l) | ||||
| if l[-1:] != b'\n': | if l[-1:] != b'\n': | ||||
| lines.append(b"\n\\ No newline at end of file\n") | lines.append(b'\n' + diffhelper.MISSING_NEWLINE_MARKER) | ||||
| self.backend.writerej(self.fname, len(self.rej), self.hunks, lines) | self.backend.writerej(self.fname, len(self.rej), self.hunks, lines) | ||||
| def apply(self, h): | def apply(self, h): | ||||
| if not h.complete(): | if not h.complete(): | ||||
| raise PatchError( | raise PatchError( | ||||
| _(b"bad hunk #%d %s (%d %d %d %d)") | _(b"bad hunk #%d %s (%d %d %d %d)") | ||||
| % (h.number, h.desc, len(h.a), h.lena, len(h.b), h.lenb) | % (h.number, h.desc, len(h.a), h.lena, len(h.b), h.lenb) | ||||
| ) | ) | ||||
| self.proc, | self.proc, | ||||
| self.before, | self.before, | ||||
| hunk, | hunk, | ||||
| self.after, | self.after, | ||||
| ) | ) | ||||
| def write(self, fp): | def write(self, fp): | ||||
| delta = len(self.before) + len(self.after) | delta = len(self.before) + len(self.after) | ||||
| if self.after and self.after[-1] == b'\\ No newline at end of file\n': | if self.after and self.after[-1] == diffhelper.MISSING_NEWLINE_MARKER: | ||||
| delta -= 1 | delta -= 1 | ||||
| fromlen = delta + self.removed | fromlen = delta + self.removed | ||||
| tolen = delta + self.added | tolen = delta + self.added | ||||
| fp.write( | fp.write( | ||||
| b'@@ -%d,%d +%d,%d @@%s\n' | b'@@ -%d,%d +%d,%d @@%s\n' | ||||
| % ( | % ( | ||||
| self.fromline, | self.fromline, | ||||
| fromlen, | fromlen, | ||||