Mercurial > hg4j

comparison src/com/tmate/hgkit/ll/RevlogStream.java @ 44:b79cf0118dd3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Second array gone, comment follows
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Fri, 14 Jan 2011 04:43:16 +0100
parents 1b26247d7367
children 26e3eeaa3962
comparison
equal deleted inserted replaced
43:1b26247d7367 44:b79cf0118dd3
282 } 282 }
283 } 283 }
284 284
285 // mpatch.c : apply() 285 // mpatch.c : apply()
286 // FIXME need to implement patch merge (fold, combine, gather and discard from aforementioned mpatch.[c|py]), also see Revlog and Mercurial PDF 286 // FIXME need to implement patch merge (fold, combine, gather and discard from aforementioned mpatch.[c|py]), also see Revlog and Mercurial PDF
287 // FIXME why 2 arrays (rv and tempBuf)???. Think over in-place merging (perhaps some sparse byte chunk list?) - to minimize mem use.
288 /*package-local for HgBundle; until moved to better place*/static byte[] apply(byte[] baseRevisionContent, int outcomeLen, List<PatchRecord> patch) { 287 /*package-local for HgBundle; until moved to better place*/static byte[] apply(byte[] baseRevisionContent, int outcomeLen, List<PatchRecord> patch) {
289 int last = 0, destIndex = 0; 288 int last = 0, destIndex = 0;
290 if (outcomeLen == -1) { 289 if (outcomeLen == -1) {
291 outcomeLen = baseRevisionContent.length; 290 outcomeLen = baseRevisionContent.length;
292 for (PatchRecord pr : patch) { 291 for (PatchRecord pr : patch) {