Mercurial > jhg
annotate src/org/tmatesoft/hg/internal/AnnotateFacility.java @ 542:a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> | 
|---|---|
| date | Thu, 14 Feb 2013 16:36:13 +0100 | 
| parents | |
| children | 1e95f48d9886 | 
| rev | line source | 
|---|---|
| 542 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 1 /* | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 2 * Copyright (c) 2013 TMate Software Ltd | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 3 * | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 4 * This program is free software; you can redistribute it and/or modify | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 5 * it under the terms of the GNU General Public License as published by | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 6 * the Free Software Foundation; version 2 of the License. | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 7 * | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 8 * This program is distributed in the hope that it will be useful, | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 9 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 11 * GNU General Public License for more details. | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 12 * | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 13 * For information on how to redistribute this software under | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 14 * the terms of a license other than GNU General Public License | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 15 * contact TMate Software at support@hg4j.com | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 16 */ | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 17 package org.tmatesoft.hg.internal; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 18 | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 19 import static org.tmatesoft.hg.repo.HgRepository.NO_REVISION; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 20 | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 21 import org.tmatesoft.hg.core.Nodeid; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 22 import org.tmatesoft.hg.internal.PatchGenerator.ChunkSequence; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 23 import org.tmatesoft.hg.repo.HgDataFile; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 24 import org.tmatesoft.hg.repo.HgInvalidStateException; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 25 import org.tmatesoft.hg.repo.HgRepository; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 26 import org.tmatesoft.hg.util.CancelledException; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 27 | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 28 /** | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 29 * | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 30 * @author Artem Tikhomirov | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 31 * @author TMate Software Ltd. | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 32 */ | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 33 @Experimental(reason="work in progress") | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 34 public class AnnotateFacility { | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 35 | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 36 public void annotate(HgDataFile df, int changestRevisionIndex, Inspector insp) { | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 37 Nodeid fileRev = df.getRepo().getManifest().getFileRevision(changestRevisionIndex, df.getPath()); | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 38 int fileRevIndex = df.getRevisionIndex(fileRev); | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 39 int[] fileRevParents = new int[2]; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 40 df.parents(fileRevIndex, fileRevParents, null, null); | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 41 if (fileRevParents[0] != NO_REVISION && fileRevParents[1] != NO_REVISION) { | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 42 // merge | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 43 } else if (fileRevParents[0] == fileRevParents[1]) { | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 44 // may be equal iff both are unset | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 45 assert fileRevParents[0] == NO_REVISION; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 46 // everything added | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 47 insp.added(null); | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 48 } else { | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 49 int soleParent = fileRevParents[0] == NO_REVISION ? fileRevParents[1] : fileRevParents[0]; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 50 assert soleParent != NO_REVISION; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 51 try { | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 52 ByteArrayChannel c1, c2; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 53 df.content(soleParent, c1 = new ByteArrayChannel()); | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 54 df.content(fileRevIndex, c2 = new ByteArrayChannel()); | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 55 int parentChangesetRevIndex = df.getChangesetRevisionIndex(soleParent); | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 56 PatchGenerator pg = new PatchGenerator(); | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 57 pg.init(c1.toArray(), c2.toArray()); | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 58 pg.findMatchingBlocks(new BlameBlockInspector(insp)); | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 59 } catch (CancelledException ex) { | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 60 // TODO likely it was bad idea to throw cancelled exception from content() | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 61 // deprecate and provide alternative? | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 62 HgInvalidStateException ise = new HgInvalidStateException("ByteArrayChannel never throws CancelledException"); | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 63 ise.initCause(ex); | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 64 throw ise; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 65 } | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 66 } | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 67 } | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 68 | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 69 @Callback | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 70 public interface Inspector { | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 71 void same(Block block); | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 72 void added(AddBlock block); | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 73 void changed(ChangeBlock block); | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 74 void deleted(DeleteBlock block); | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 75 } | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 76 | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 77 public interface Block { | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 78 // boolean isMergeRevision(); | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 79 // int fileRevisionIndex(); | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 80 // int originFileRevisionIndex(); | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 81 // String[] lines(); | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 82 // byte[] data(); | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 83 } | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 84 | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 85 public interface AddBlock extends Block { | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 86 int firstAddedLine(); | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 87 int totalAddedLines(); | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 88 String[] addedLines(); | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 89 } | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 90 public interface DeleteBlock extends Block { | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 91 int firstRemovedLine(); | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 92 int totalRemovedLines(); | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 93 String[] removedLines(); | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 94 } | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 95 public interface ChangeBlock extends AddBlock, DeleteBlock { | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 96 } | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 97 | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 98 static class BlameBlockInspector extends PatchGenerator.DeltaInspector { | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 99 private final Inspector insp; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 100 | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 101 public BlameBlockInspector(Inspector inspector) { | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 102 assert inspector != null; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 103 insp = inspector; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 104 } | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 105 | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 106 @Override | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 107 protected void changed(int s1From, int s1To, int s2From, int s2To) { | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 108 insp.changed(new BlockImpl2(seq1, seq2, s1From, s1To-s1From, s2From, s2To - s2From)); | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 109 } | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 110 | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 111 @Override | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 112 protected void added(int s1InsertPoint, int s2From, int s2To) { | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 113 insp.added(new BlockImpl2(null, seq2, -1, -1, s2From, s2To - s2From)); | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 114 } | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 115 | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 116 @Override | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 117 protected void deleted(int s1From, int s1To) { | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 118 insp.deleted(new BlockImpl2(seq1, null, s1From, s1To - s1From, -1, -1)); | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 119 } | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 120 | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 121 @Override | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 122 protected void unchanged(int s1From, int s2From, int length) { | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 123 insp.same(new BlockImpl(seq2, s2From, length)); | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 124 } | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 125 } | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 126 | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 127 static class BlockImpl implements Block { | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 128 private final ChunkSequence seq; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 129 private final int start; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 130 private final int length; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 131 | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 132 BlockImpl() { | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 133 // FIXME delete this cons | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 134 seq = null; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 135 start = length = -1; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 136 } | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 137 | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 138 BlockImpl(ChunkSequence s, int blockStart, int blockLength) { | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 139 seq = s; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 140 start = blockStart; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 141 length = blockLength; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 142 } | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 143 | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 144 } | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 145 | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 146 static class BlockImpl2 implements ChangeBlock { | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 147 | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 148 private final ChunkSequence oldSeq; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 149 private final ChunkSequence newSeq; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 150 private final int s1Start; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 151 private final int s1Len; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 152 private final int s2Start; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 153 private final int s2Len; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 154 | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 155 public BlockImpl2(ChunkSequence s1, ChunkSequence s2, int s1Start, int s1Len, int s2Start, int s2Len) { | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 156 oldSeq = s1; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 157 newSeq = s2; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 158 this.s1Start = s1Start; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 159 this.s1Len = s1Len; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 160 this.s2Start = s2Start; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 161 this.s2Len = s2Len; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 162 } | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 163 | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 164 public int firstAddedLine() { | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 165 return s2Start; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 166 } | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 167 | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 168 public int totalAddedLines() { | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 169 return s2Len; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 170 } | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 171 | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 172 public String[] addedLines() { | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 173 return generateLines(totalAddedLines(), firstAddedLine()); | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 174 } | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 175 | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 176 public int firstRemovedLine() { | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 177 return s1Start; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 178 } | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 179 | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 180 public int totalRemovedLines() { | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 181 return s1Len; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 182 } | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 183 | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 184 public String[] removedLines() { | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 185 return generateLines(totalRemovedLines(), firstRemovedLine()); | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 186 } | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 187 | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 188 private String[] generateLines(int count, int startFrom) { | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 189 String[] rv = new String[count]; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 190 for (int i = 0; i < count; i++) { | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 191 rv[i] = String.format("LINE %d", startFrom + i); | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 192 } | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 193 return rv; | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 194 } | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 195 } | 
| 
a71a05ec11bc
Towards annotate/blame support: general outline of the functionality
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 196 } | 
