Mercurial > hg-stable
changeset 7153:353141d74ca8
patch: pass linereader to binaryhunk.extract() instead of wrapped fp
It unifies input patch file access methods
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Sat, 18 Oct 2008 23:45:46 +0200 |
| parents | f0055cec8446 |
| children | ba897f6dc934 fd3cba5e73ae |
| files | mercurial/patch.py |
| diffstat | 1 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/patch.py Sat Oct 18 23:45:46 2008 +0200 +++ b/mercurial/patch.py Sat Oct 18 23:45:46 2008 +0200 @@ -669,17 +669,17 @@ def new(self): return [self.text] - def extract(self, fp): - line = fp.readline() + def extract(self, lr): + line = lr.readline() self.hunk.append(line) while line and not line.startswith('literal '): - line = fp.readline() + line = lr.readline() self.hunk.append(line) if not line: raise PatchError(_('could not extract binary patch')) size = int(line[8:].rstrip()) dec = [] - line = fp.readline() + line = lr.readline() self.hunk.append(line) while len(line) > 1: l = line[0] @@ -688,7 +688,7 @@ else: l = ord(l) - ord('a') + 27 dec.append(base85.b85decode(line[1:-1])[:l]) - line = fp.readline() + line = lr.readline() self.hunk.append(line) text = zlib.decompress(''.join(dec)) if len(text) != size: @@ -806,7 +806,7 @@ gitlr.push(firstline) (dopatch, gitpatches) = readgitpatch(gitlr) fp.seek(pos) - return fp, dopatch, gitpatches + return dopatch, gitpatches def iterhunks(ui, fp, sourcefile=None): """Read a patch and yield the following events: @@ -871,7 +871,7 @@ if emitfile: emitfile = False yield 'file', (afile, bfile, current_hunk) - current_hunk.extract(fp) + current_hunk.extract(lr) elif x.startswith('diff --git'): # check for git diff, scanning the whole patch file if needed m = gitre.match(x) @@ -879,7 +879,7 @@ afile, bfile = m.group(1, 2) if not git: git = True - fp, dopatch, gitpatches = scangitpatch(lr, x) + dopatch, gitpatches = scangitpatch(lr, x) yield 'git', gitpatches for gp in gitpatches: changed[gp.path] = gp