hg4j: src/org/tmatesoft/hg/internal/BlameHelper.java annotate

annotate src/org/tmatesoft/hg/internal/BlameHelper.java @ 643:a8ce405da1f5

v1.2 line of dev: update versions, use patch merge code by default

author	Artem Tikhomirov <tikhomirov.artem@gmail.com>
date	Wed, 19 Jun 2013 16:03:11 +0200
parents	5f52074707b2
children	cce0387c6041

rev	line source
569 c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	1 /*
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	2 * Copyright (c) 2013 TMate Software Ltd
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	3 *
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	4 * This program is free software; you can redistribute it and/or modify
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	5 * it under the terms of the GNU General Public License as published by
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	6 * the Free Software Foundation; version 2 of the License.
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	7 *
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	8 * This program is distributed in the hope that it will be useful,
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	11 * GNU General Public License for more details.
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	12 *
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	13 * For information on how to redistribute this software under
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	14 * the terms of a license other than GNU General Public License
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	15 * contact TMate Software at support@hg4j.com
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	16 */
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	17 package org.tmatesoft.hg.internal;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	18
625 b4948b159ab1 Refactor internals of blame support, tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 603 diff changeset	19 import static org.tmatesoft.hg.core.HgIterateDirection.OldToNew;
569 c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	20 import static org.tmatesoft.hg.repo.HgRepository.NO_REVISION;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	21
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	22 import java.util.LinkedList;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	23 import java.util.ListIterator;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	24
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	25 import org.tmatesoft.hg.core.HgCallbackTargetException;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	26 import org.tmatesoft.hg.internal.DiffHelper.LineSequence;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	27 import org.tmatesoft.hg.internal.DiffHelper.LineSequence.ByteChain;
629 5f52074707b2 Diff/blame methods as command, their residence in HgDataFile was a mistake Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 628 diff changeset	28 import org.tmatesoft.hg.core.HgBlameInspector;
5f52074707b2 Diff/blame methods as command, their residence in HgDataFile was a mistake Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 628 diff changeset	29 import org.tmatesoft.hg.core.HgBlameInspector.*;
569 c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	30 import org.tmatesoft.hg.repo.HgDataFile;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	31 import org.tmatesoft.hg.repo.HgInvalidStateException;
628 6526d8adbc0f Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 625 diff changeset	32 import org.tmatesoft.hg.repo.HgRuntimeException;
569 c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	33 import org.tmatesoft.hg.util.Adaptable;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	34 import org.tmatesoft.hg.util.CancelledException;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	35 import org.tmatesoft.hg.util.Pair;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	36
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	37 /**
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	38 * Blame implementation
603 707b5c7c6fa4 Refactor HgBlameFacility: relevant action methods moved to proper home (HgDataFile), as facility doesn't provide anything but packaging of relevant methods/interfaces Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 569 diff changeset	39 * @see HgBlameInspector
569 c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	40 * @author Artem Tikhomirov
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	41 * @author TMate Software Ltd.
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	42 */
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	43 public class BlameHelper {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	44
603 707b5c7c6fa4 Refactor HgBlameFacility: relevant action methods moved to proper home (HgDataFile), as facility doesn't provide anything but packaging of relevant methods/interfaces Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 569 diff changeset	45 private final HgBlameInspector insp;
569 c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	46 private FileLinesCache linesCache;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	47
625 b4948b159ab1 Refactor internals of blame support, tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 603 diff changeset	48 public BlameHelper(HgBlameInspector inspector) {
569 c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	49 insp = inspector;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	50 }
625 b4948b159ab1 Refactor internals of blame support, tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 603 diff changeset	51
b4948b159ab1 Refactor internals of blame support, tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 603 diff changeset	52 /**
b4948b159ab1 Refactor internals of blame support, tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 603 diff changeset	53 * Build history of the file for the specified range (follow renames if necessary). This history
b4948b159ab1 Refactor internals of blame support, tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 603 diff changeset	54 * is used to access various file revision data during subsequent {@link #diff(int, int, int, int)} and
b4948b159ab1 Refactor internals of blame support, tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 603 diff changeset	55 * {@link #annotateChange(int, int, int[], int[])} calls. Callers can use returned history for own approaches
b4948b159ab1 Refactor internals of blame support, tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 603 diff changeset	56 * to iteration over file history.
b4948b159ab1 Refactor internals of blame support, tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 603 diff changeset	57
b4948b159ab1 Refactor internals of blame support, tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 603 diff changeset	58 * <p>NOTE, clogRevIndexEnd has to list name of the supplied file in the corresponding manifest,
b4948b159ab1 Refactor internals of blame support, tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 603 diff changeset	59 * as it's not possible to trace rename history otherwise.
b4948b159ab1 Refactor internals of blame support, tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 603 diff changeset	60 */
628 6526d8adbc0f Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 625 diff changeset	61 public FileHistory prepare(HgDataFile df, int clogRevIndexStart, int clogRevIndexEnd) throws HgRuntimeException {
625 b4948b159ab1 Refactor internals of blame support, tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 603 diff changeset	62 assert clogRevIndexStart <= clogRevIndexEnd;
b4948b159ab1 Refactor internals of blame support, tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 603 diff changeset	63 FileHistory fileHistory = new FileHistory(df, clogRevIndexStart, clogRevIndexEnd);
b4948b159ab1 Refactor internals of blame support, tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 603 diff changeset	64 fileHistory.build();
b4948b159ab1 Refactor internals of blame support, tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 603 diff changeset	65 int cacheHint = 5; // cache comes useful when we follow merge branches and don't want to
b4948b159ab1 Refactor internals of blame support, tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 603 diff changeset	66 // parse base revision twice. There's no easy way to determine max(distance(all(base,merge))),
b4948b159ab1 Refactor internals of blame support, tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 603 diff changeset	67 // hence the heuristics to use the longest history chunk:
b4948b159ab1 Refactor internals of blame support, tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 603 diff changeset	68 for (FileRevisionHistoryChunk c : fileHistory.iterate(OldToNew)) {
b4948b159ab1 Refactor internals of blame support, tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 603 diff changeset	69 // iteration order is not important here
b4948b159ab1 Refactor internals of blame support, tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 603 diff changeset	70 if (c.revisionCount() > cacheHint) {
b4948b159ab1 Refactor internals of blame support, tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 603 diff changeset	71 cacheHint = c.revisionCount();
b4948b159ab1 Refactor internals of blame support, tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 603 diff changeset	72 }
b4948b159ab1 Refactor internals of blame support, tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 603 diff changeset	73 }
b4948b159ab1 Refactor internals of blame support, tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 603 diff changeset	74 linesCache = new FileLinesCache(cacheHint);
b4948b159ab1 Refactor internals of blame support, tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 603 diff changeset	75 for (FileRevisionHistoryChunk fhc : fileHistory.iterate(OldToNew)) {
b4948b159ab1 Refactor internals of blame support, tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 603 diff changeset	76 // iteration order is not important here
b4948b159ab1 Refactor internals of blame support, tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 603 diff changeset	77 linesCache.useFileUpTo(fhc.getFile(), fhc.getEndChangeset());
b4948b159ab1 Refactor internals of blame support, tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 603 diff changeset	78 }
b4948b159ab1 Refactor internals of blame support, tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 603 diff changeset	79 return fileHistory;
569 c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	80 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	81
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	82 // NO_REVISION is not allowed as any argument
628 6526d8adbc0f Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 625 diff changeset	83 public void diff(int fileRevIndex1, int clogRevIndex1, int fileRevIndex2, int clogRevIndex2) throws HgCallbackTargetException, HgRuntimeException {
569 c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	84 HgDataFile targetFile = linesCache.getFile(clogRevIndex2);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	85 LineSequence c1 = linesCache.lines(clogRevIndex1, fileRevIndex1);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	86 LineSequence c2 = linesCache.lines(clogRevIndex2, fileRevIndex2);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	87 DiffHelper<LineSequence> pg = new DiffHelper<LineSequence>();
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	88 pg.init(c1, c2);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	89 BlameBlockInspector bbi = new BlameBlockInspector(targetFile, fileRevIndex2, insp, clogRevIndex1, clogRevIndex2);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	90 pg.findMatchingBlocks(bbi);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	91 bbi.checkErrors();
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	92 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	93
628 6526d8adbc0f Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 625 diff changeset	94 public void annotateChange(int fileRevIndex, int csetRevIndex, int[] fileParentRevs, int[] fileParentClogRevs) throws HgCallbackTargetException, HgRuntimeException {
569 c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	95 HgDataFile targetFile = linesCache.getFile(csetRevIndex);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	96 final LineSequence fileRevLines = linesCache.lines(csetRevIndex, fileRevIndex);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	97 if (fileParentClogRevs[0] != NO_REVISION && fileParentClogRevs[1] != NO_REVISION) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	98 int p1ClogIndex = fileParentClogRevs[0];
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	99 int p2ClogIndex = fileParentClogRevs[1];
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	100 LineSequence p1Lines = linesCache.lines(p1ClogIndex, fileParentRevs[0]);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	101 LineSequence p2Lines = linesCache.lines(p2ClogIndex, fileParentRevs[1]);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	102 DiffHelper<LineSequence> pg = new DiffHelper<LineSequence>();
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	103 pg.init(p2Lines, fileRevLines);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	104 EqualBlocksCollector p2MergeCommon = new EqualBlocksCollector();
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	105 pg.findMatchingBlocks(p2MergeCommon);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	106 //
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	107 pg.init(p1Lines);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	108 BlameBlockInspector bbi = new BlameBlockInspector(targetFile, fileRevIndex, insp, p1ClogIndex, csetRevIndex);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	109 bbi.setMergeParent2(p2MergeCommon, p2ClogIndex);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	110 pg.findMatchingBlocks(bbi);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	111 bbi.checkErrors();
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	112 } else if (fileParentClogRevs[0] == fileParentClogRevs[1]) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	113 // may be equal iff both are unset
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	114 assert fileParentClogRevs[0] == NO_REVISION;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	115 // everything added
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	116 BlameBlockInspector bbi = new BlameBlockInspector(targetFile, fileRevIndex, insp, NO_REVISION, csetRevIndex);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	117 bbi.begin(LineSequence.newlines(new byte[0]), fileRevLines);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	118 bbi.match(0, fileRevLines.chunkCount()-1, 0);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	119 bbi.end();
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	120 bbi.checkErrors();
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	121 } else {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	122 int soleParentIndex = fileParentClogRevs[0] == NO_REVISION ? 1 : 0;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	123 assert fileParentClogRevs[soleParentIndex] != NO_REVISION;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	124 LineSequence parentLines = linesCache.lines(fileParentClogRevs[soleParentIndex], fileParentRevs[soleParentIndex]);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	125
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	126 DiffHelper<LineSequence> pg = new DiffHelper<LineSequence>();
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	127 pg.init(parentLines, fileRevLines);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	128 BlameBlockInspector bbi = new BlameBlockInspector(targetFile, fileRevIndex, insp, fileParentClogRevs[soleParentIndex], csetRevIndex);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	129 pg.findMatchingBlocks(bbi);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	130 bbi.checkErrors();
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	131 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	132 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	133
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	134 private static class FileLinesCache {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	135 private final LinkedList<Pair<Integer, LineSequence>> lruCache;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	136 private final int limit;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	137 private final LinkedList<Pair<Integer, HgDataFile>> files; // TODO in fact, need sparse array
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	138
625 b4948b159ab1 Refactor internals of blame support, tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 603 diff changeset	139 /**
b4948b159ab1 Refactor internals of blame support, tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 603 diff changeset	140 * @param lruLimit how many parsed file revisions to keep
b4948b159ab1 Refactor internals of blame support, tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 603 diff changeset	141 */
569 c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	142 public FileLinesCache(int lruLimit) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	143 limit = lruLimit;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	144 lruCache = new LinkedList<Pair<Integer, LineSequence>>();
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	145 files = new LinkedList<Pair<Integer,HgDataFile>>();
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	146 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	147
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	148 public void useFileUpTo(HgDataFile df, int clogRevIndex) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	149 Pair<Integer, HgDataFile> newEntry = new Pair<Integer, HgDataFile>(clogRevIndex, df);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	150 for (ListIterator<Pair<Integer, HgDataFile>> it = files.listIterator(); it.hasNext();) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	151 Pair<Integer, HgDataFile> e = it.next();
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	152 if (e.first() == clogRevIndex) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	153 assert e.second().getPath().equals(df.getPath());
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	154 return;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	155 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	156 if (e.first() > clogRevIndex) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	157 // insert new entry before current
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	158 it.previous();
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	159 it.add(newEntry);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	160 return;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	161 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	162 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	163 files.add(newEntry);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	164 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	165
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	166 public HgDataFile getFile(int clogRevIndex) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	167 for (Pair<Integer, HgDataFile> e : files) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	168 if (e.first() >= clogRevIndex) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	169 return e.second();
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	170 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	171 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	172 throw new HgInvalidStateException(String.format("Got %d file-changelog mappings, but no luck for revision %d.", files.size(), clogRevIndex));
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	173 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	174
628 6526d8adbc0f Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 625 diff changeset	175 public LineSequence lines(int clogRevIndex, int fileRevIndex) throws HgRuntimeException {
569 c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	176 Pair<Integer, LineSequence> cached = checkCache(clogRevIndex);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	177 if (cached != null) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	178 return cached.second();
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	179 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	180 HgDataFile df = getFile(clogRevIndex);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	181 try {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	182 ByteArrayChannel c;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	183 df.content(fileRevIndex, c = new ByteArrayChannel());
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	184 LineSequence rv = LineSequence.newlines(c.toArray());
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	185 lruCache.addFirst(new Pair<Integer, LineSequence>(clogRevIndex, rv));
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	186 if (lruCache.size() > limit) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	187 lruCache.removeLast();
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	188 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	189 return rv;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	190 } catch (CancelledException ex) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	191 // TODO likely it was bad idea to throw cancelled exception from content()
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	192 // deprecate and provide alternative?
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	193 HgInvalidStateException ise = new HgInvalidStateException("ByteArrayChannel never throws CancelledException");
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	194 ise.initCause(ex);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	195 throw ise;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	196 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	197 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	198
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	199 private Pair<Integer,LineSequence> checkCache(int fileRevIndex) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	200 Pair<Integer, LineSequence> rv = null;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	201 for (ListIterator<Pair<Integer, LineSequence>> it = lruCache.listIterator(); it.hasNext(); ) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	202 Pair<Integer, LineSequence> p = it.next();
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	203 if (p.first() == fileRevIndex) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	204 rv = p;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	205 it.remove();
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	206 break;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	207 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	208 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	209 if (rv != null) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	210 lruCache.addFirst(rv);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	211 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	212 return rv;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	213 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	214 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	215
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	216 private static class BlameBlockInspector extends DiffHelper.DeltaInspector<LineSequence> {
603 707b5c7c6fa4 Refactor HgBlameFacility: relevant action methods moved to proper home (HgDataFile), as facility doesn't provide anything but packaging of relevant methods/interfaces Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 569 diff changeset	217 private final HgBlameInspector insp;
569 c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	218 private final int csetOrigin;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	219 private final int csetTarget;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	220 private EqualBlocksCollector p2MergeCommon;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	221 private int csetMergeParent;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	222 private IntVector mergeRanges;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	223 private final AnnotateRev annotatedRevision;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	224 private HgCallbackTargetException error;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	225
603 707b5c7c6fa4 Refactor HgBlameFacility: relevant action methods moved to proper home (HgDataFile), as facility doesn't provide anything but packaging of relevant methods/interfaces Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 569 diff changeset	226 public BlameBlockInspector(HgDataFile df, int fileRevIndex, HgBlameInspector inspector, int originCset, int targetCset) {
569 c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	227 assert inspector != null;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	228 insp = inspector;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	229 annotatedRevision = new AnnotateRev();
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	230 annotatedRevision.set(df, fileRevIndex);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	231 csetOrigin = originCset;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	232 csetTarget = targetCset;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	233 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	234
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	235 public void setMergeParent2(EqualBlocksCollector p2Merge, int parentCset2) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	236 p2MergeCommon = p2Merge;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	237 csetMergeParent = parentCset2;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	238 mergeRanges = new IntVector(310, 310);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	239 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	240
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	241 @Override
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	242 public void begin(LineSequence s1, LineSequence s2) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	243 super.begin(s1, s2);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	244 if (shallStop()) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	245 return;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	246 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	247 ContentBlock originContent = new ContentBlock(s1);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	248 ContentBlock targetContent = new ContentBlock(s2);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	249 annotatedRevision.set(originContent, targetContent);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	250 annotatedRevision.set(csetOrigin, csetTarget, p2MergeCommon != null ? csetMergeParent : NO_REVISION);
629 5f52074707b2 Diff/blame methods as command, their residence in HgDataFile was a mistake Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 628 diff changeset	251 RevisionDescriptor.Recipient curious = Adaptable.Factory.getAdapter(insp, RevisionDescriptor.Recipient.class, null);
569 c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	252 if (curious != null) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	253 try {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	254 curious.start(annotatedRevision);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	255 } catch (HgCallbackTargetException ex) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	256 error = ex;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	257 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	258 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	259 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	260
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	261 @Override
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	262 public void end() {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	263 super.end();
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	264 if (shallStop()) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	265 return;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	266 }
629 5f52074707b2 Diff/blame methods as command, their residence in HgDataFile was a mistake Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 628 diff changeset	267 RevisionDescriptor.Recipient curious = Adaptable.Factory.getAdapter(insp, RevisionDescriptor.Recipient.class, null);
569 c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	268 if (curious != null) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	269 try {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	270 curious.done(annotatedRevision);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	271 } catch (HgCallbackTargetException ex) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	272 error = ex;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	273 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	274 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	275 p2MergeCommon = null;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	276 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	277
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	278 @Override
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	279 protected void changed(int s1From, int s1To, int s2From, int s2To) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	280 if (shallStop()) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	281 return;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	282 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	283 try {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	284 if (p2MergeCommon != null) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	285 mergeRanges.clear();
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	286 p2MergeCommon.combineAndMarkRangesWithTarget(s2From, s2To - s2From, csetOrigin, csetMergeParent, mergeRanges);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	287
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	288 /*
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	289 * Usecases, how it USED TO BE initially:
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	290 * 3 lines changed to 10 lines. range of 10 lines breaks down to 2 from p2, 3 from p1, and 5 from p2.
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	291 * We report: 2 lines changed to 2(p2), then 1 line changed with 3(p1) and 5 lines added from p2.
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	292 *
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	293 * 10 lines changed to 3 lines, range of 3 lines breaks down to 2 line from p1 and 1 line from p2.
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	294 * We report: 2 lines changed to 2(p1) and 8 lines changed to 1(p2)
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	295 *
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	296 * NOW, lines from p2 are always reported as pure add (since we need their insertion point to be in p2, not in p1)
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	297 * and we try to consume p1 changes as soon as we see first p1's range
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	298 */
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	299 int s1TotalLines = s1To - s1From, s1ConsumedLines = 0, s1Start = s1From;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	300
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	301 for (int i = 0; i < mergeRanges.size(); i += 3) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	302 final int rangeOrigin = mergeRanges.get(i);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	303 final int rangeStart = mergeRanges.get(i+1);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	304 final int rangeLen = mergeRanges.get(i+2);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	305 final boolean lastRange = i+3 >= mergeRanges.size();
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	306 final int s1LinesLeft = s1TotalLines - s1ConsumedLines;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	307 // how many lines we may report as changed (don't use more than in range unless it's the very last range)
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	308 final int s1LinesToBorrow = lastRange ? s1LinesLeft : Math.min(s1LinesLeft, rangeLen);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	309 if (rangeOrigin != csetMergeParent && s1LinesToBorrow > 0) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	310 ChangeBlockImpl block = getChangeBlock(s1Start, s1LinesToBorrow, rangeStart, rangeLen);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	311 block.setOriginAndTarget(rangeOrigin, csetTarget);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	312 insp.changed(block);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	313 s1ConsumedLines += s1LinesToBorrow;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	314 s1Start += s1LinesToBorrow;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	315 } else {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	316 int blockInsPoint = rangeOrigin != csetMergeParent ? s1Start : p2MergeCommon.reverseMapLine(rangeStart);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	317 ChangeBlockImpl block = getAddBlock(rangeStart, rangeLen, blockInsPoint);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	318 block.setOriginAndTarget(rangeOrigin, csetTarget);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	319 insp.added(block);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	320 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	321 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	322 if (s1ConsumedLines != s1TotalLines) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	323 assert s1ConsumedLines < s1TotalLines : String.format("Expected to process %d lines, but actually was %d", s1TotalLines, s1ConsumedLines);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	324 // either there were no ranges from p1, whole s2From..s2To range came from p2, shall report as deleted
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	325 // or the ranges found were not enough to consume whole s2From..s2To
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	326 // The "deletion point" is shifted to the end of last csetOrigin->csetTarget change
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	327 int s2DeletePoint = s2From + s1ConsumedLines;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	328 ChangeBlockImpl block = new ChangeBlockImpl(annotatedRevision.origin, null, s1Start, s1To - s1Start, -1, -1, -1, s2DeletePoint);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	329 block.setOriginAndTarget(csetOrigin, csetTarget);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	330 insp.deleted(block);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	331 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	332 } else {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	333 ChangeBlockImpl block = getChangeBlock(s1From, s1To - s1From, s2From, s2To - s2From);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	334 block.setOriginAndTarget(csetOrigin, csetTarget);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	335 insp.changed(block);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	336 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	337 } catch (HgCallbackTargetException ex) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	338 error = ex;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	339 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	340 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	341
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	342 @Override
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	343 protected void added(int s1InsertPoint, int s2From, int s2To) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	344 if (shallStop()) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	345 return;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	346 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	347 try {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	348 if (p2MergeCommon != null) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	349 mergeRanges.clear();
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	350 p2MergeCommon.combineAndMarkRangesWithTarget(s2From, s2To - s2From, csetOrigin, csetMergeParent, mergeRanges);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	351 int insPoint = s1InsertPoint; // track changes to insertion point
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	352 for (int i = 0; i < mergeRanges.size(); i += 3) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	353 int rangeOrigin = mergeRanges.get(i);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	354 int rangeStart = mergeRanges.get(i+1);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	355 int rangeLen = mergeRanges.get(i+2);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	356 ChangeBlockImpl block = getAddBlock(rangeStart, rangeLen, insPoint);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	357 block.setOriginAndTarget(rangeOrigin, csetTarget);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	358 insp.added(block);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	359 // indicate insPoint moved down number of lines we just reported
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	360 insPoint += rangeLen;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	361 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	362 } else {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	363 ChangeBlockImpl block = getAddBlock(s2From, s2To - s2From, s1InsertPoint);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	364 block.setOriginAndTarget(csetOrigin, csetTarget);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	365 insp.added(block);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	366 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	367 } catch (HgCallbackTargetException ex) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	368 error = ex;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	369 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	370 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	371
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	372 @Override
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	373 protected void deleted(int s2DeletePoint, int s1From, int s1To) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	374 if (shallStop()) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	375 return;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	376 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	377 try {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	378 ChangeBlockImpl block = new ChangeBlockImpl(annotatedRevision.origin, null, s1From, s1To - s1From, -1, -1, -1, s2DeletePoint);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	379 block.setOriginAndTarget(csetOrigin, csetTarget);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	380 insp.deleted(block);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	381 } catch (HgCallbackTargetException ex) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	382 error = ex;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	383 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	384 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	385
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	386 @Override
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	387 protected void unchanged(int s1From, int s2From, int length) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	388 if (shallStop()) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	389 return;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	390 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	391 try {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	392 EqualBlockImpl block = new EqualBlockImpl(s1From, s2From, length, annotatedRevision.target);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	393 block.setOriginAndTarget(csetOrigin, csetTarget);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	394 insp.same(block);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	395 } catch (HgCallbackTargetException ex) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	396 error = ex;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	397 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	398 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	399
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	400 void checkErrors() throws HgCallbackTargetException {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	401 if (error != null) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	402 throw error;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	403 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	404 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	405
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	406 private boolean shallStop() {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	407 return error != null;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	408 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	409
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	410 private ChangeBlockImpl getAddBlock(int start, int len, int insPoint) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	411 return new ChangeBlockImpl(null, annotatedRevision.target, -1, -1, start, len, insPoint, -1);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	412 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	413
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	414 private ChangeBlockImpl getChangeBlock(int start1, int len1, int start2, int len2) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	415 return new ChangeBlockImpl(annotatedRevision.origin, annotatedRevision.target, start1, len1, start2, len2, start1, start2);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	416 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	417 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	418
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	419 private static class BlockImpl implements Block {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	420 private int originCset;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	421 private int targetCset;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	422
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	423 void setOriginAndTarget(int originChangesetIndex, int targetChangesetIndex) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	424 // XXX perhaps, shall be part of Inspector API, rather than Block's
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	425 // as they don't change between blocks (although the moment about merged revisions)
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	426 // is not yet clear to me
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	427 originCset = originChangesetIndex;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	428 targetCset = targetChangesetIndex;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	429 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	430
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	431 public int originChangesetIndex() {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	432 return originCset;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	433 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	434
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	435 public int targetChangesetIndex() {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	436 return targetCset;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	437 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	438 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	439
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	440 private static class EqualBlockImpl extends BlockImpl implements EqualBlock {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	441 private final int start1, start2;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	442 private final int length;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	443 private final ContentBlock fullContent;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	444 private FilterBlock myContent;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	445
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	446 EqualBlockImpl(int blockStartSeq1, int blockStartSeq2, int blockLength, ContentBlock targetContent) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	447 start1 = blockStartSeq1;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	448 start2 = blockStartSeq2;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	449 length = blockLength;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	450 fullContent = targetContent;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	451 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	452
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	453 public int originStart() {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	454 return start1;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	455 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	456
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	457 public int targetStart() {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	458 return start2;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	459 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	460
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	461 public int length() {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	462 return length;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	463 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	464
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	465 public BlockData content() {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	466 if (myContent == null) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	467 myContent = new FilterBlock(fullContent, start2, length);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	468 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	469 return myContent;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	470 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	471
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	472 @Override
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	473 public String toString() {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	474 return String.format("@@ [%d..%d) == [%d..%d) @@", start1, start1+length, start2, start2+length);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	475 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	476 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	477
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	478 private static class ChangeBlockImpl extends BlockImpl implements ChangeBlock {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	479 private final ContentBlock oldContent;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	480 private final ContentBlock newContent;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	481 private final int s1Start;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	482 private final int s1Len;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	483 private final int s2Start;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	484 private final int s2Len;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	485 private final int s1InsertPoint;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	486 private final int s2DeletePoint;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	487 private FilterBlock addedBlock, removedBlock;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	488
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	489 public ChangeBlockImpl(ContentBlock c1, ContentBlock c2, int s1Start, int s1Len, int s2Start, int s2Len, int s1InsertPoint, int s2DeletePoint) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	490 oldContent = c1;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	491 newContent = c2;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	492 this.s1Start = s1Start;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	493 this.s1Len = s1Len;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	494 this.s2Start = s2Start;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	495 this.s2Len = s2Len;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	496 this.s1InsertPoint = s1InsertPoint;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	497 this.s2DeletePoint = s2DeletePoint;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	498 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	499
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	500 public int insertedAt() {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	501 return s1InsertPoint;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	502 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	503
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	504 public int firstAddedLine() {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	505 return s2Start;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	506 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	507
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	508 public int totalAddedLines() {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	509 return s2Len;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	510 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	511
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	512 public BlockData addedLines() {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	513 if (addedBlock == null) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	514 addedBlock = new FilterBlock(newContent, firstAddedLine(), totalAddedLines());
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	515 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	516 return addedBlock;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	517 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	518
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	519 public int removedAt() {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	520 return s2DeletePoint;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	521 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	522
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	523 public int firstRemovedLine() {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	524 return s1Start;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	525 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	526
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	527 public int totalRemovedLines() {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	528 return s1Len;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	529 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	530
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	531 public BlockData removedLines() {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	532 if (removedBlock == null) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	533 removedBlock = new FilterBlock(oldContent, firstRemovedLine(), totalRemovedLines());
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	534 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	535 return removedBlock;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	536 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	537
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	538 @Override
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	539 public String toString() {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	540 if (s2DeletePoint == -1) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	541 return String.format("@@ -%d,0 +%d,%d @@", insertedAt(), firstAddedLine(), totalAddedLines());
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	542 } else if (s1InsertPoint == -1) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	543 // delete only
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	544 return String.format("@@ -%d,%d +%d,0 @@", firstRemovedLine(), totalRemovedLines(), removedAt());
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	545 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	546 return String.format("@@ -%d,%d +%d,%d @@", firstRemovedLine(), totalRemovedLines(), firstAddedLine(), totalAddedLines());
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	547 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	548 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	549
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	550 private static class SingleLine implements BlockData {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	551 private final ByteChain line;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	552
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	553 public SingleLine(ByteChain lineContent) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	554 line = lineContent;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	555 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	556
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	557 public BlockData elementAt(int index) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	558 assert false;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	559 return null;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	560 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	561
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	562 public int elementCount() {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	563 return 0;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	564 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	565
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	566 public byte[] asArray() {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	567 return line.data();
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	568 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	569 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	570
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	571 private static class ContentBlock implements BlockData {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	572 private final LineSequence seq;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	573
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	574 public ContentBlock(LineSequence sequence) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	575 seq = sequence;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	576 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	577
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	578 public BlockData elementAt(int index) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	579 return new SingleLine(seq.chunk(index));
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	580 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	581
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	582 public int elementCount() {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	583 return seq.chunkCount() - 1;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	584 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	585
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	586 public byte[] asArray() {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	587 return seq.data(0, seq.chunkCount() - 1);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	588 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	589 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	590
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	591 private static class FilterBlock implements BlockData {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	592 private final ContentBlock contentBlock;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	593 private final int from;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	594 private final int length;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	595
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	596 public FilterBlock(ContentBlock bd, int startFrom, int len) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	597 assert bd != null;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	598 assert startFrom + len < bd.seq.chunkCount(); // there's one extra chunk in the end, so strict less is ok
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	599 contentBlock = bd;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	600 from = startFrom;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	601 length = len;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	602 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	603
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	604 public BlockData elementAt(int index) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	605 if (index < 0 \|\| index >= length) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	606 throw new IllegalArgumentException(String.format("Expected value from [0..%d), got %d", length, index));
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	607 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	608 return contentBlock.elementAt(from + index);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	609 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	610
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	611 public int elementCount() {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	612 return length;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	613 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	614
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	615 public byte[] asArray() {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	616 return contentBlock.seq.data(from, from + length);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	617 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	618 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	619
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	620
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	621 private static class EqualBlocksCollector implements DiffHelper.MatchInspector<LineSequence> {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	622 private final RangeSeq matches = new RangeSeq();
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	623
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	624 public void begin(LineSequence s1, LineSequence s2) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	625 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	626
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	627 public void match(int startSeq1, int startSeq2, int matchLength) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	628 matches.add(startSeq1, startSeq2, matchLength);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	629 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	630
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	631 public void end() {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	632 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	633
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	634 public int reverseMapLine(int ln) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	635 return matches.reverseMapLine(ln);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	636 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	637
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	638 public void intersectWithTarget(int start, int length, IntVector result) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	639 int s = start;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	640 for (int l = start, x = start + length; l < x; l++) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	641 if (!matches.includesTargetLine(l)) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	642 if (l - s > 0) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	643 result.add(s);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	644 result.add(l - s);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	645 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	646 s = l+1;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	647 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	648 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	649 if (s < start+length) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	650 result.add(s);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	651 result.add((start + length) - s);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	652 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	653 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	654
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	655 /*
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	656 * intersects [start..start+length) with ranges of target lines, and based on the intersection
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	657 * breaks initial range into smaller ranges and records them into result, with marker to indicate
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	658 * whether the range is from initial range (markerSource) or is a result of the intersection with target
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	659 * (markerTarget)
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	660 */
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	661 public void combineAndMarkRangesWithTarget(int start, int length, int markerSource, int markerTarget, IntVector result) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	662 int sourceStart = start, targetStart = start, sourceEnd = start + length;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	663 for (int l = sourceStart; l < sourceEnd; l++) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	664 if (matches.includesTargetLine(l)) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	665 // l is from target
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	666 if (sourceStart < l) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	667 // few lines from source range were not in the target, report them
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	668 result.add(markerSource);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	669 result.add(sourceStart);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	670 result.add(l - sourceStart);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	671 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	672 // indicate the earliest line from source range to use
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	673 sourceStart = l + 1;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	674 } else {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	675 // l is not in target
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	676 if (targetStart < l) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	677 // report lines from target range
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	678 result.add(markerTarget);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	679 result.add(targetStart);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	680 result.add(l - targetStart);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	681 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	682 // next line may be from target
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	683 targetStart = l + 1;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	684 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	685 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	686 // if source range end with line from target, sourceStart would be == sourceEnd, and we need to add range with markerTarget
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	687 // if source range doesn't end with target line, targetStart == sourceEnd, while sourceStart < sourceEnd
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	688 if (sourceStart < sourceEnd) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	689 assert targetStart == sourceEnd;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	690 // something left from the source range
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	691 result.add(markerSource);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	692 result.add(sourceStart);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	693 result.add(sourceEnd - sourceStart);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	694 } else if (targetStart < sourceEnd) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	695 assert sourceStart == sourceEnd;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	696 result.add(markerTarget);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	697 result.add(targetStart);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	698 result.add(sourceEnd - targetStart);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	699 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	700 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	701 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	702
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	703 private static class AnnotateRev implements RevisionDescriptor {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	704 public ContentBlock origin, target;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	705 public int originCset, targetCset, mergeCset, fileRevIndex;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	706 public HgDataFile df;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	707
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	708 public void set(HgDataFile file, int fileRev) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	709 df = file;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	710 fileRevIndex = fileRev;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	711 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	712 public void set(ContentBlock o, ContentBlock t) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	713 origin = o;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	714 target = t;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	715 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	716 public void set(int o, int t, int m) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	717 originCset = o;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	718 targetCset = t;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	719 mergeCset = m;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	720 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	721
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	722 public BlockData origin() {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	723 return origin;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	724 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	725
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	726 public BlockData target() {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	727 return target;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	728 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	729
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	730 public int originChangesetIndex() {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	731 return originCset;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	732 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	733
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	734 public int targetChangesetIndex() {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	735 return targetCset;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	736 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	737
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	738 public boolean isMerge() {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	739 return mergeCset != NO_REVISION;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	740 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	741
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	742 public int mergeChangesetIndex() {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	743 return mergeCset;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	744 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	745
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	746 public int fileRevisionIndex() {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	747 return fileRevIndex;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	748 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	749 public HgDataFile file() {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	750 return df;
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	751 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	752 @Override
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	753 public String toString() {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	754 if (isMerge()) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	755 return String.format("[%d,%d->%d]", originCset, mergeCset, targetCset);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	756 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	757 return String.format("[%d->%d]", originCset, targetCset);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	758 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	759 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	760
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	761 public static void main(String[] args) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	762 EqualBlocksCollector bc = new EqualBlocksCollector();
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	763 bc.match(-1, 5, 3);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	764 bc.match(-1, 10, 2);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	765 bc.match(-1, 15, 3);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	766 bc.match(-1, 20, 3);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	767 IntVector r = new IntVector();
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	768 bc.intersectWithTarget(7, 10, r);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	769 for (int i = 0; i < r.size(); i+=2) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	770 System.out.printf("[%d..%d) ", r.get(i), r.get(i) + r.get(i+1));
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	771 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	772 System.out.println();
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	773 r.clear();
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	774 bc.combineAndMarkRangesWithTarget(0, 16, 508, 514, r);
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	775 for (int i = 0; i < r.size(); i+=3) {
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	776 System.out.printf("%d:[%d..%d) ", r.get(i), r.get(i+1), r.get(i+1) + r.get(i+2));
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	777 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	778 }
c4fd1037bc6f Support for copy/rename follow/no-follow for annotate Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	779 }

Mercurial > hg4j

annotate src/org/tmatesoft/hg/internal/BlameHelper.java @ 643:a8ce405da1f5