/repo: share/lua/5.2/luarocks/tools/patch.lua annotate

annotate share/lua/5.2/luarocks/tools/patch.lua @ 12500:e48c08805365 draft default tip

<b_jonas> ` learn \'The password of the month is Cthulhuquagdonic Mothraquagdonic Narwhalicorn.\' # https://logs.esolangs.org/libera-esolangs/2024-04.html#lKE Infinite craft

author	HackEso <hackeso@esolangs.org>
date	Wed, 01 May 2024 06:39:10 +0000
parents	d137f631bad5
children

rev	line source
1132 d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	1 --- Patch utility to apply unified diffs.
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	2 --
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	3 -- http://lua-users.org/wiki/LuaPatch
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	4 --
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	5 -- (c) 2008 David Manura, Licensed under the same terms as Lua (MIT license).
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	6 -- Code is heavilly based on the Python-based patch.py version 8.06-1
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	7 -- Copyright (c) 2008 rainforce.org, MIT License
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	8 -- Project home: http://code.google.com/p/python-patch/ .
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	9
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	10 module("luarocks.tools.patch", package.seeall)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	11
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	12 local fs = require("luarocks.fs")
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	13
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	14 local version = '0.1'
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	15
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	16 local io = io
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	17 local os = os
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	18 local string = string
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	19 local table = table
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	20 local format = string.format
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	21
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	22 -- logging
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	23 local debugmode = false
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	24 local function debug(s) end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	25 local function info(s) end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	26 local function warning(s) io.stderr:write(s .. '\n') end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	27
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	28 -- Returns boolean whether string s2 starts with string s.
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	29 local function startswith(s, s2)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	30 return s:sub(1, #s2) == s2
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	31 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	32
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	33 -- Returns boolean whether string s2 ends with string s.
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	34 local function endswith(s, s2)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	35 return #s >= #s2 and s:sub(#s-#s2+1) == s2
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	36 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	37
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	38 -- Returns string s after filtering out any new-line characters from end.
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	39 local function endlstrip(s)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	40 return s:gsub('[\r\n]+$', '')
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	41 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	42
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	43 -- Returns shallow copy of table t.
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	44 local function table_copy(t)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	45 local t2 = {}
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	46 for k,v in pairs(t) do t2[k] = v end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	47 return t2
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	48 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	49
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	50 -- Returns boolean whether array t contains value v.
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	51 local function array_contains(t, v)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	52 for _,v2 in ipairs(t) do if v == v2 then return true end end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	53 return false
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	54 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	55
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	56 local function exists(filename)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	57 local fh = io.open(filename)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	58 local result = fh ~= nil
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	59 if fh then fh:close() end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	60 return result
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	61 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	62 local function isfile() return true end --FIX?
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	63
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	64 local function read_file(filename)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	65 local fh, err, oserr = io.open(filename, 'rb')
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	66 if not fh then return fh, err, oserr end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	67 local data, err, oserr = fh:read'*a'
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	68 fh:close()
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	69 if not data then return nil, err, oserr end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	70 return data
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	71 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	72
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	73 local function write_file(filename, data)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	74 local fh, err, oserr = io.open(filename 'wb')
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	75 if not fh then return fh, err, oserr end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	76 local status, err, oserr = fh:write(data)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	77 fh:close()
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	78 if not status then return nil, err, oserr end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	79 return true
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	80 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	81
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	82 local function file_copy(src, dest)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	83 local data, err, oserr = read_file(src)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	84 if not data then return data, err, oserr end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	85 local status, err, oserr = write_file(dest)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	86 if not status then return status, err, oserr end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	87 return true
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	88 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	89
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	90 local function string_as_file(s)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	91 return {
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	92 at = 0,
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	93 str = s,
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	94 len = #s,
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	95 eof = false,
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	96 read = function(self, n)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	97 if self.eof then return nil end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	98 local chunk = self.str:sub(self.at, self.at+n)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	99 self.at = self.at + n
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	100 if self.at > self.len then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	101 self.eof = true
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	102 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	103 return chunk
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	104 end,
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	105 close = function(self)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	106 self.eof = true
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	107 end,
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	108 }
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	109 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	110
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	111 --
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	112 -- file_lines(f) is similar to f:lines() for file f.
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	113 -- The main difference is that read_lines includes
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	114 -- new-line character sequences ("\n", "\r\n", "\r"),
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	115 -- if any, at the end of each line. Embedded "\0" are also handled.
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	116 -- Caution: The newline behavior can depend on whether f is opened
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	117 -- in binary or ASCII mode.
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	118 -- (file_lines - version 20080913)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	119 --
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	120 local function file_lines(f)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	121 local CHUNK_SIZE = 1024
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	122 local buffer = ""
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	123 local pos_beg = 1
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	124 return function()
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	125 local pos, chars
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	126 while 1 do
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	127 pos, chars = buffer:match('()([\r\n].)', pos_beg)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	128 if pos or not f then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	129 break
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	130 elseif f then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	131 local chunk = f:read(CHUNK_SIZE)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	132 if chunk then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	133 buffer = buffer:sub(pos_beg) .. chunk
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	134 pos_beg = 1
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	135 else
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	136 f = nil
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	137 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	138 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	139 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	140 if not pos then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	141 pos = #buffer
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	142 elseif chars == '\r\n' then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	143 pos = pos + 1
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	144 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	145 local line = buffer:sub(pos_beg, pos)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	146 pos_beg = pos + 1
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	147 if #line > 0 then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	148 return line
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	149 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	150 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	151 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	152
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	153 local function match_linerange(line)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	154 local m1, m2, m3, m4 = line:match("^@@ %-(%d+),(%d+) %+(%d+),(%d+)")
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	155 if not m1 then m1, m3, m4 = line:match("^@@ %-(%d+) %+(%d+),(%d+)") end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	156 if not m1 then m1, m2, m3 = line:match("^@@ %-(%d+),(%d+) %+(%d+)") end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	157 if not m1 then m1, m3 = line:match("^@@ %-(%d+) %+(%d+)") end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	158 return m1, m2, m3, m4
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	159 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	160
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	161 function read_patch(filename, data)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	162 -- define possible file regions that will direct the parser flow
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	163 local state = 'header'
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	164 -- 'header' - comments before the patch body
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	165 -- 'filenames' - lines starting with --- and +++
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	166 -- 'hunkhead' - @@ -R +R @@ sequence
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	167 -- 'hunkbody'
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	168 -- 'hunkskip' - skipping invalid hunk mode
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	169
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	170 local all_ok = true
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	171 local lineends = {lf=0, crlf=0, cr=0}
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	172 local files = {source={}, target={}, hunks={}, fileends={}, hunkends={}}
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	173 local nextfileno = 0
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	174 local nexthunkno = 0 --: even if index starts with 0 user messages
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	175 -- number hunks from 1
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	176
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	177 -- hunkinfo holds parsed values, hunkactual - calculated
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	178 local hunkinfo = {
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	179 startsrc=nil, linessrc=nil, starttgt=nil, linestgt=nil,
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	180 invalid=false, text={}
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	181 }
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	182 local hunkactual = {linessrc=nil, linestgt=nil}
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	183
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	184 info(format("reading patch %s", filename))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	185
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	186 local fp
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	187 if data then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	188 fp = string_as_file(data)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	189 else
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	190 fp = filename == '-' and io.stdin or assert(io.open(filename, "rb"))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	191 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	192 local lineno = 0
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	193
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	194 for line in file_lines(fp) do
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	195 lineno = lineno + 1
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	196 if state == 'header' then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	197 if startswith(line, "--- ") then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	198 state = 'filenames'
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	199 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	200 -- state is 'header' or 'filenames'
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	201 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	202 if state == 'hunkbody' then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	203 -- skip hunkskip and hunkbody code until definition of hunkhead read
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	204
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	205 -- process line first
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	206 if line:match"^[- +\\]" or line:match"^[\r\n]*$" then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	207 -- gather stats about line endings
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	208 local he = files.hunkends[nextfileno]
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	209 if endswith(line, "\r\n") then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	210 he.crlf = he.crlf + 1
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	211 elseif endswith(line, "\n") then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	212 he.lf = he.lf + 1
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	213 elseif endswith(line, "\r") then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	214 he.cr = he.cr + 1
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	215 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	216 if startswith(line, "-") then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	217 hunkactual.linessrc = hunkactual.linessrc + 1
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	218 elseif startswith(line, "+") then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	219 hunkactual.linestgt = hunkactual.linestgt + 1
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	220 elseif startswith(line, "\\") then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	221 -- nothing
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	222 else
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	223 hunkactual.linessrc = hunkactual.linessrc + 1
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	224 hunkactual.linestgt = hunkactual.linestgt + 1
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	225 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	226 table.insert(hunkinfo.text, line)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	227 -- todo: handle \ No newline cases
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	228 else
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	229 warning(format("invalid hunk no.%d at %d for target file %s",
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	230 nexthunkno, lineno, files.target[nextfileno]))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	231 -- add hunk status node
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	232 table.insert(files.hunks[nextfileno], table_copy(hunkinfo))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	233 files.hunks[nextfileno][nexthunkno].invalid = true
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	234 all_ok = false
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	235 state = 'hunkskip'
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	236 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	237
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	238 -- check exit conditions
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	239 if hunkactual.linessrc > hunkinfo.linessrc or
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	240 hunkactual.linestgt > hunkinfo.linestgt
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	241 then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	242 warning(format("extra hunk no.%d lines at %d for target %s",
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	243 nexthunkno, lineno, files.target[nextfileno]))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	244 -- add hunk status node
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	245 table.insert(files.hunks[nextfileno], table_copy(hunkinfo))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	246 files.hunks[nextfileno][nexthunkno].invalid = true
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	247 state = 'hunkskip'
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	248 elseif hunkinfo.linessrc == hunkactual.linessrc and
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	249 hunkinfo.linestgt == hunkactual.linestgt
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	250 then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	251 table.insert(files.hunks[nextfileno], table_copy(hunkinfo))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	252 state = 'hunkskip'
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	253
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	254 -- detect mixed window/unix line ends
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	255 local ends = files.hunkends[nextfileno]
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	256 if (ends.cr~=0 and 1 or 0) + (ends.crlf~=0 and 1 or 0) +
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	257 (ends.lf~=0 and 1 or 0) > 1
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	258 then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	259 warning(format("inconsistent line ends in patch hunks for %s",
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	260 files.source[nextfileno]))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	261 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	262 if debugmode then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	263 local debuglines = {crlf=ends.crlf, lf=ends.lf, cr=ends.cr,
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	264 file=files.target[nextfileno], hunk=nexthunkno}
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	265 debug(format("crlf: %(crlf)d lf: %(lf)d cr: %(cr)d\t " ..
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	266 "- file: %(file)s hunk: %(hunk)d", debuglines))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	267 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	268 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	269 -- state is 'hunkbody' or 'hunkskip'
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	270 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	271
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	272 if state == 'hunkskip' then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	273 if match_linerange(line) then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	274 state = 'hunkhead'
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	275 elseif startswith(line, "--- ") then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	276 state = 'filenames'
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	277 if debugmode and #files.source > 0 then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	278 debug(format("- %2d hunks for %s", #files.hunks[nextfileno],
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	279 files.source[nextfileno]))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	280 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	281 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	282 -- state is 'hunkskip', 'hunkhead', or 'filenames'
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	283 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	284 local advance
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	285 if state == 'filenames' then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	286 if startswith(line, "--- ") then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	287 if array_contains(files.source, nextfileno) then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	288 all_ok = false
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	289 warning(format("skipping invalid patch for %s",
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	290 files.source[nextfileno+1]))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	291 table.remove(files.source, nextfileno+1)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	292 -- double source filename line is encountered
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	293 -- attempt to restart from this second line
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	294 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	295 -- Accept a space as a terminator, like GNU patch does.
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	296 -- Breaks patches containing filenames with spaces...
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	297 -- FIXME Figure out what does GNU patch do in those cases.
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	298 local match = line:match("^--- ([^\t ]+)")
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	299 if not match then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	300 all_ok = false
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	301 warning(format("skipping invalid filename at line %d", lineno+1))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	302 state = 'header'
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	303 else
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	304 table.insert(files.source, match)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	305 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	306 elseif not startswith(line, "+++ ") then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	307 if array_contains(files.source, nextfileno) then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	308 all_ok = false
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	309 warning(format("skipping invalid patch with no target for %s",
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	310 files.source[nextfileno+1]))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	311 table.remove(files.source, nextfileno+1)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	312 else
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	313 -- this should be unreachable
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	314 warning("skipping invalid target patch")
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	315 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	316 state = 'header'
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	317 else
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	318 if array_contains(files.target, nextfileno) then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	319 all_ok = false
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	320 warning(format("skipping invalid patch - double target at line %d",
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	321 lineno+1))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	322 table.remove(files.source, nextfileno+1)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	323 table.remove(files.target, nextfileno+1)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	324 nextfileno = nextfileno - 1
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	325 -- double target filename line is encountered
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	326 -- switch back to header state
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	327 state = 'header'
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	328 else
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	329 -- Accept a space as a terminator, like GNU patch does.
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	330 -- Breaks patches containing filenames with spaces...
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	331 -- FIXME Figure out what does GNU patch do in those cases.
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	332 local re_filename = "^%+%+%+ ([^ \t]+)"
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	333 local match = line:match(re_filename)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	334 if not match then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	335 all_ok = false
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	336 warning(format(
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	337 "skipping invalid patch - no target filename at line %d",
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	338 lineno+1))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	339 state = 'header'
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	340 else
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	341 table.insert(files.target, match)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	342 nextfileno = nextfileno + 1
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	343 nexthunkno = 0
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	344 table.insert(files.hunks, {})
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	345 table.insert(files.hunkends, table_copy(lineends))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	346 table.insert(files.fileends, table_copy(lineends))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	347 state = 'hunkhead'
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	348 advance = true
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	349 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	350 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	351 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	352 -- state is 'filenames', 'header', or ('hunkhead' with advance)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	353 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	354 if not advance and state == 'hunkhead' then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	355 local m1, m2, m3, m4 = match_linerange(line)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	356 if not m1 then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	357 if not array_contains(files.hunks, nextfileno-1) then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	358 all_ok = false
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	359 warning(format("skipping invalid patch with no hunks for file %s",
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	360 files.target[nextfileno]))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	361 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	362 state = 'header'
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	363 else
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	364 hunkinfo.startsrc = tonumber(m1)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	365 hunkinfo.linessrc = tonumber(m2 or 1)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	366 hunkinfo.starttgt = tonumber(m3)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	367 hunkinfo.linestgt = tonumber(m4 or 1)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	368 hunkinfo.invalid = false
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	369 hunkinfo.text = {}
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	370
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	371 hunkactual.linessrc = 0
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	372 hunkactual.linestgt = 0
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	373
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	374 state = 'hunkbody'
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	375 nexthunkno = nexthunkno + 1
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	376 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	377 -- state is 'header' or 'hunkbody'
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	378 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	379 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	380 if state ~= 'hunkskip' then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	381 warning(format("patch file incomplete - %s", filename))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	382 all_ok = false
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	383 -- os.exit(?)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	384 else
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	385 -- duplicated message when an eof is reached
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	386 if debugmode and #files.source > 0 then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	387 debug(format("- %2d hunks for %s", #files.hunks[nextfileno],
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	388 files.source[nextfileno]))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	389 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	390 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	391
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	392 local sum = 0; for _,hset in ipairs(files.hunks) do sum = sum + #hset end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	393 info(format("total files: %d total hunks: %d", #files.source, sum))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	394 fp:close()
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	395 return files, all_ok
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	396 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	397
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	398 local function find_hunk(file, h, hno)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	399 for fuzz=0,2 do
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	400 local lineno = h.startsrc
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	401 for i=0,#file do
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	402 local found = true
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	403 local location = lineno
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	404 local total = #h.text - fuzz
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	405 for l, hline in ipairs(h.text) do
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	406 if l > fuzz then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	407 -- todo: \ No newline at the end of file
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	408 if startswith(hline, " ") or startswith(hline, "-") then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	409 local line = file[lineno]
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	410 lineno = lineno + 1
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	411 if not line or #line == 0 then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	412 found = false
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	413 break
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	414 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	415 if endlstrip(line) ~= endlstrip(hline:sub(2)) then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	416 found = false
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	417 break
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	418 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	419 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	420 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	421 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	422 if found then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	423 local offset = location - h.startsrc - fuzz
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	424 if offset ~= 0 then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	425 warning(format("Hunk %d found at offset %d%s...", hno, offset, fuzz == 0 and "" or format(" (fuzz %d)", fuzz)))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	426 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	427 h.startsrc = location
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	428 h.starttgt = h.starttgt + offset
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	429 for i=1,fuzz do
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	430 table.remove(h.text, 1)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	431 table.remove(h.text, #h.text)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	432 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	433 return true
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	434 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	435 lineno = i
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	436 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	437 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	438 return false
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	439 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	440
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	441 local function load_file(filename)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	442 local fp = assert(io.open(filename))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	443 local file = {}
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	444 local readline = file_lines(fp)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	445 while true do
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	446 local line = readline()
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	447 if not line then break end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	448 table.insert(file, line)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	449 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	450 fp:close()
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	451 return file
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	452 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	453
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	454 local function find_hunks(file, hunks)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	455 local matched = true
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	456 local lineno = 1
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	457 local hno = nil
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	458 for hno, h in ipairs(hunks) do
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	459 find_hunk(file, h, hno)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	460 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	461 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	462
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	463 local function check_patched(file, hunks)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	464 local matched = true
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	465 local lineno = 1
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	466 local hno = nil
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	467 local ok, err = pcall(function()
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	468 if #file == 0 then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	469 error 'nomatch'
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	470 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	471 for hno, h in ipairs(hunks) do
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	472 -- skip to line just before hunk starts
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	473 if #file < h.starttgt then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	474 error 'nomatch'
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	475 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	476 lineno = h.starttgt
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	477 for _, hline in ipairs(h.text) do
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	478 -- todo: \ No newline at the end of file
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	479 if not startswith(hline, "-") and not startswith(hline, "\\") then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	480 local line = file[lineno]
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	481 lineno = lineno + 1
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	482 if #line == 0 then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	483 error 'nomatch'
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	484 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	485 if endlstrip(line) ~= endlstrip(hline:sub(2)) then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	486 warning(format("file is not patched - failed hunk: %d", hno))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	487 error 'nomatch'
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	488 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	489 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	490 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	491 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	492 end)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	493 if err == 'nomatch' then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	494 matched = false
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	495 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	496 -- todo: display failed hunk, i.e. expected/found
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	497
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	498 return matched
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	499 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	500
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	501 local function patch_hunks(srcname, tgtname, hunks)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	502 local src = assert(io.open(srcname, "rb"))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	503 local tgt = assert(io.open(tgtname, "wb"))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	504
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	505 local src_readline = file_lines(src)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	506
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	507 -- todo: detect linefeeds early - in apply_files routine
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	508 -- to handle cases when patch starts right from the first
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	509 -- line and no lines are processed. At the moment substituted
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	510 -- lineends may not be the same at the start and at the end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	511 -- of patching. Also issue a warning about mixed lineends
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	512
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	513 local srclineno = 1
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	514 local lineends = {['\n']=0, ['\r\n']=0, ['\r']=0}
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	515 for hno, h in ipairs(hunks) do
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	516 debug(format("processing hunk %d for file %s", hno, tgtname))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	517 -- skip to line just before hunk starts
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	518 while srclineno < h.startsrc do
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	519 local line = src_readline()
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	520 -- Python 'U' mode works only with text files
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	521 if endswith(line, "\r\n") then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	522 lineends["\r\n"] = lineends["\r\n"] + 1
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	523 elseif endswith(line, "\n") then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	524 lineends["\n"] = lineends["\n"] + 1
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	525 elseif endswith(line, "\r") then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	526 lineends["\r"] = lineends["\r"] + 1
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	527 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	528 tgt:write(line)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	529 srclineno = srclineno + 1
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	530 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	531
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	532 for _,hline in ipairs(h.text) do
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	533 -- todo: check \ No newline at the end of file
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	534 if startswith(hline, "-") or startswith(hline, "\\") then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	535 src_readline()
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	536 srclineno = srclineno + 1
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	537 else
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	538 if not startswith(hline, "+") then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	539 src_readline()
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	540 srclineno = srclineno + 1
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	541 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	542 local line2write = hline:sub(2)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	543 -- detect if line ends are consistent in source file
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	544 local sum = 0
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	545 for k,v in pairs(lineends) do if v > 0 then sum=sum+1 end end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	546 if sum == 1 then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	547 local newline
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	548 for k,v in pairs(lineends) do if v ~= 0 then newline = k end end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	549 tgt:write(endlstrip(line2write) .. newline)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	550 else -- newlines are mixed or unknown
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	551 tgt:write(line2write)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	552 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	553 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	554 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	555 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	556 for line in src_readline do
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	557 tgt:write(line)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	558 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	559 tgt:close()
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	560 src:close()
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	561 return true
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	562 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	563
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	564 local function strip_dirs(filename, strip)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	565 if strip == nil then return filename end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	566 for i=1,strip do
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	567 filename=filename:gsub("^[^/]*/", "")
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	568 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	569 return filename
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	570 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	571
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	572 function apply_patch(patch, strip)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	573 local all_ok = true
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	574 local total = #patch.source
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	575 for fileno, filename in ipairs(patch.source) do
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	576 filename = strip_dirs(filename, strip)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	577 local continue
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	578 local f2patch = filename
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	579 if not exists(f2patch) then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	580 f2patch = strip_dirs(patch.target[fileno], strip)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	581 f2patch = fs.absolute_name(f2patch)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	582 if not exists(f2patch) then --FIX:if f2patch nil
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	583 warning(format("source/target file does not exist\n--- %s\n+++ %s",
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	584 filename, f2patch))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	585 all_ok = false
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	586 continue = true
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	587 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	588 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	589 if not continue and not isfile(f2patch) then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	590 warning(format("not a file - %s", f2patch))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	591 all_ok = false
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	592 continue = true
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	593 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	594 if not continue then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	595
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	596 filename = f2patch
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	597
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	598 info(format("processing %d/%d:\t %s", fileno, total, filename))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	599
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	600 -- validate before patching
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	601 local hunks = patch.hunks[fileno]
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	602 local file = load_file(filename)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	603 local hunkno = 1
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	604 local hunk = hunks[hunkno]
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	605 local hunkfind = {}
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	606 local hunkreplace = {}
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	607 local validhunks = 0
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	608 local canpatch = false
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	609 local hunklineno
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	610 local isbreak
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	611 local lineno = 0
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	612
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	613 find_hunks(file, hunks)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	614
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	615 for _, line in ipairs(file) do
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	616 lineno = lineno + 1
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	617 local continue
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	618 if not hunk or lineno < hunk.startsrc then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	619 continue = true
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	620 elseif lineno == hunk.startsrc then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	621 hunkfind = {}
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	622 for _,x in ipairs(hunk.text) do
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	623 if x:sub(1,1) == ' ' or x:sub(1,1) == '-' then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	624 hunkfind[#hunkfind+1] = endlstrip(x:sub(2))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	625 end end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	626 hunkreplace = {}
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	627 for _,x in ipairs(hunk.text) do
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	628 if x:sub(1,1) == ' ' or x:sub(1,1) == '+' then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	629 hunkreplace[#hunkreplace+1] = endlstrip(x:sub(2))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	630 end end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	631 --pprint(hunkreplace)
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	632 hunklineno = 1
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	633
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	634 -- todo \ No newline at end of file
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	635 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	636 -- check hunks in source file
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	637 if not continue and lineno < hunk.startsrc + #hunkfind - 1 then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	638 if endlstrip(line) == hunkfind[hunklineno] then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	639 hunklineno = hunklineno + 1
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	640 else
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	641 debug(format("hunk no.%d doesn't match source file %s",
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	642 hunkno, filename))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	643 -- file may be already patched, but check other hunks anyway
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	644 hunkno = hunkno + 1
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	645 if hunkno <= #hunks then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	646 hunk = hunks[hunkno]
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	647 continue = true
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	648 else
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	649 isbreak = true; break
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	650 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	651 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	652 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	653 -- check if processed line is the last line
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	654 if not continue and lineno == hunk.startsrc + #hunkfind - 1 then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	655 debug(format("file %s hunk no.%d -- is ready to be patched",
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	656 filename, hunkno))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	657 hunkno = hunkno + 1
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	658 validhunks = validhunks + 1
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	659 if hunkno <= #hunks then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	660 hunk = hunks[hunkno]
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	661 else
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	662 if validhunks == #hunks then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	663 -- patch file
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	664 canpatch = true
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	665 isbreak = true; break
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	666 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	667 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	668 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	669 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	670 if not isbreak then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	671 if hunkno <= #hunks then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	672 warning(format("premature end of source file %s at hunk %d",
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	673 filename, hunkno))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	674 all_ok = false
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	675 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	676 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	677 if validhunks < #hunks then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	678 if check_patched(file, hunks) then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	679 warning(format("already patched %s", filename))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	680 else
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	681 warning(format("source file is different - %s", filename))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	682 all_ok = false
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	683 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	684 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	685 if canpatch then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	686 local backupname = filename .. ".orig"
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	687 if exists(backupname) then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	688 warning(format("can't backup original file to %s - aborting",
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	689 backupname))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	690 all_ok = false
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	691 else
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	692 assert(os.rename(filename, backupname))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	693 if patch_hunks(backupname, filename, hunks) then
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	694 warning(format("successfully patched %s", filename))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	695 assert(os.remove(backupname))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	696 else
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	697 warning(format("error patching file %s", filename))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	698 assert(file_copy(filename, filename .. ".invalid"))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	699 warning(format("invalid version is saved to %s",
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	700 filename .. ".invalid"))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	701 -- todo: proper rejects
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	702 assert(os.rename(backupname, filename))
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	703 all_ok = false
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	704 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	705 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	706 end
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	707
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	708 end -- if not continue
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	709 end -- for
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	710 -- todo: check for premature eof
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	711 return all_ok
d137f631bad5 <GreyKnight> (cd luabuild/luarocks-2.0.12; make install) HackBot parents: diff changeset	712 end

Mercurial > repo

annotate share/lua/5.2/luarocks/tools/patch.lua @ 12500:e48c08805365 draft default tip