##// END OF EJS Templates
backout: backed out changeset 2f2107c01dee (+1 change)...
backout: backed out changeset 2f2107c01dee (+1 change) Following discussion on the original Phabricator patch, we've agreed to back out this change until Python 2 is dropped since it's simpler than figuring out why the Python 2 version doesn't behave the same. The additional change is the one in test-chg.t since the error type changes back but only for Python 3.

File last commit:

r47575:d4ba4d51 default
r49065:d24bba52 default
Show More
mpatch.py
135 lines | 3.3 KiB | text/x-python | PythonLexer
Martin Geisler
pure Python implementation of mpatch.c
r7699 # mpatch.py - Python implementation of mpatch.c
#
Raphaël Gomès
contributor: change mentions of mpm to olivia...
r47575 # Copyright 2009 Olivia Mackall <olivia@selenic.com> and others
Martin Geisler
pure Python implementation of mpatch.c
r7699 #
Martin Geisler
updated license to be explicit about GPL version 2
r8225 # This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
r10263 # GNU General Public License version 2 or any later version.
Martin Geisler
pure Python implementation of mpatch.c
r7699
Gregory Szorc
mpatch: use absolute_import...
r27337 from __future__ import absolute_import
Martin Geisler
pure/mpatch: use StringIO instead of mmap (issue1493)...
r7775 import struct
Gregory Szorc
mpatch: use absolute_import...
r27337
Yuya Nishihara
cffi: split modules from pure...
r32512 from .. import pycompat
Augie Fackler
formatting: blacken the codebase...
r43346
Gregory Szorc
util: prefer "bytesio" to "stringio"...
r36976 stringio = pycompat.bytesio
Martin Geisler
pure Python implementation of mpatch.c
r7699
Augie Fackler
formatting: blacken the codebase...
r43346
timeless
mpatch: unify mpatchError (issue5182)...
r28782 class mpatchError(Exception):
Augie Fackler
formating: upgrade to black 20.8b1...
r46554 """error raised when a delta cannot be decoded"""
timeless
mpatch: unify mpatchError (issue5182)...
r28782
Augie Fackler
formatting: blacken the codebase...
r43346
Martin Geisler
pure Python implementation of mpatch.c
r7699 # This attempts to apply a series of patches in time proportional to
# the total size of the patches, rather than patches * len(text). This
# means rather than shuffling strings around, we shuffle around
# pointers to fragments with fragment lists.
#
# When the fragment lists get too long, we collapse them. To do this
# efficiently, we do all our operations inside a buffer created by
# mmap and simply use memmove. This avoids creating a bunch of large
# temporary string buffers.
Augie Fackler
formatting: blacken the codebase...
r43346
def _pull(dst, src, l): # pull l bytes from src
Augie Fackler
mpatch: move pull() method to top level...
r28587 while l:
f = src.pop()
Augie Fackler
formatting: blacken the codebase...
r43346 if f[0] > l: # do we need to split?
Augie Fackler
mpatch: move pull() method to top level...
r28587 src.append((f[0] - l, f[1] + l))
dst.append((l, f[1]))
return
dst.append(f)
l -= f[0]
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
mpatch: un-nest the move() method...
r28588 def _move(m, dest, src, count):
"""move count bytes from src to dest
The file pointer is left at the end of dest.
"""
m.seek(src)
buf = m.read(count)
m.seek(dest)
m.write(buf)
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
mpatch: move collect() to module level...
r28589 def _collect(m, buf, list):
start = buf
for l, p in reversed(list):
_move(m, buf, p, l)
buf += l
return (buf - start, start)
Augie Fackler
formatting: blacken the codebase...
r43346
Martin Geisler
pure Python implementation of mpatch.c
r7699 def patches(a, bins):
Matt Mackall
many, many trivial check-code fixups
r10282 if not bins:
return a
Martin Geisler
pure Python implementation of mpatch.c
r7699
plens = [len(x) for x in bins]
pl = sum(plens)
bl = len(a) + pl
Augie Fackler
formatting: blacken the codebase...
r43346 tl = bl + bl + pl # enough for the patches and two working texts
Martin Geisler
pure Python implementation of mpatch.c
r7699 b1, b2 = 0, bl
Matt Mackall
many, many trivial check-code fixups
r10282 if not tl:
return a
Martin Geisler
pure Python implementation of mpatch.c
r7699
timeless
pycompat: switch to util.stringio for py3 compat
r28861 m = stringio()
Martin Geisler
pure Python implementation of mpatch.c
r7699
# load our original text
m.write(a)
frags = [(len(a), b1)]
# copy all the patches into our segment so we can memmove from them
pos = b2 + bl
m.seek(pos)
Alex Gaynor
style: never put multiple statements on one line...
r34436 for p in bins:
m.write(p)
Martin Geisler
pure Python implementation of mpatch.c
r7699
for plen in plens:
# if our list gets too long, execute it
if len(frags) > 128:
b2, b1 = b1, b2
Augie Fackler
mpatch: move collect() to module level...
r28589 frags = [_collect(m, b1, frags)]
Martin Geisler
pure Python implementation of mpatch.c
r7699
new = []
end = pos + plen
last = 0
while pos < end:
Martin Geisler
pure/mpatch: use StringIO instead of mmap (issue1493)...
r7775 m.seek(pos)
timeless
mpatch: unify mpatchError (issue5182)...
r28782 try:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 p1, p2, l = struct.unpack(b">lll", m.read(12))
timeless
mpatch: unify mpatchError (issue5182)...
r28782 except struct.error:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 raise mpatchError(b"patch cannot be decoded")
Augie Fackler
formatting: blacken the codebase...
r43346 _pull(new, frags, p1 - last) # what didn't change
_pull([], frags, p2 - p1) # what got deleted
new.append((l, pos + 12)) # what got added
Martin Geisler
pure Python implementation of mpatch.c
r7699 pos += l + 12
last = p2
Augie Fackler
formatting: blacken the codebase...
r43346 frags.extend(reversed(new)) # what was left at the end
Martin Geisler
pure Python implementation of mpatch.c
r7699
Augie Fackler
mpatch: move collect() to module level...
r28589 t = _collect(m, b2, frags)
Martin Geisler
pure Python implementation of mpatch.c
r7699
Martin Geisler
pure/mpatch: use StringIO instead of mmap (issue1493)...
r7775 m.seek(t[1])
return m.read(t[0])
Martin Geisler
pure Python implementation of mpatch.c
r7699
Augie Fackler
formatting: blacken the codebase...
r43346
Martin Geisler
pure Python implementation of mpatch.c
r7699 def patchedsize(orig, delta):
outlen, last, bin = 0, 0, 0
binend = len(delta)
data = 12
while data <= binend:
Augie Fackler
formatting: blacken the codebase...
r43346 decode = delta[bin : bin + 12]
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 start, end, length = struct.unpack(b">lll", decode)
Martin Geisler
pure Python implementation of mpatch.c
r7699 if start > end:
break
bin = data + length
data = bin + 12
outlen += start - last
last = end
outlen += length
if bin != binend:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 raise mpatchError(b"patch cannot be decoded")
Martin Geisler
pure Python implementation of mpatch.c
r7699
outlen += orig - last
return outlen