hg4j: test/org/tmatesoft/hg/test/TestBlame.java annotate

annotate test/org/tmatesoft/hg/test/TestBlame.java @ 573:e49f9d9513fa

Partial blame when start/end revisions are in the middle of a single filename history

author	Artem Tikhomirov <tikhomirov.artem@gmail.com>
date	Fri, 12 Apr 2013 19:50:21 +0200
parents	36853bb80a35
children	707b5c7c6fa4

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.test;
a71a05ec11bc Towards annotate/blame support: general outline of the functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	18
546 cd78e8b9d7bc File annotate test. Refactored FileAnnotation as standalone class, introduced LineInspector to make line offset calc code shared Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 545 diff changeset	19 import static org.junit.Assert.assertEquals;
cd78e8b9d7bc File annotate test. Refactored FileAnnotation as standalone class, introduced LineInspector to make line offset calc code shared Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 545 diff changeset	20 import static org.junit.Assert.assertTrue;
573 e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	21 import static org.tmatesoft.hg.core.HgIterateDirection.NewToOld;
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	22 import static org.tmatesoft.hg.core.HgIterateDirection.OldToNew;
545 15b406c7cd9d First round of annotate file is functional Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 544 diff changeset	23 import static org.tmatesoft.hg.repo.HgRepository.NO_REVISION;
548 ab21ac7dd833 Line-by-line annotation API and support code in place Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 546 diff changeset	24 import static org.tmatesoft.hg.repo.HgRepository.TIP;
545 15b406c7cd9d First round of annotate file is functional Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 544 diff changeset	25
543 1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	26 import java.io.ByteArrayOutputStream;
570 36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	27 import java.io.File;
573 e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	28 import java.io.IOException;
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	29 import java.io.OutputStream;
543 1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	30 import java.io.PrintStream;
570 36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	31 import java.util.ArrayList;
543 1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	32 import java.util.Arrays;
553 093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	33 import java.util.LinkedHashSet;
093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	34 import java.util.LinkedList;
570 36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	35 import java.util.List;
557 b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	36 import java.util.ListIterator;
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	37 import java.util.regex.Matcher;
543 1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	38 import java.util.regex.Pattern;
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	39
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	40 import org.junit.Assert;
549 83afa680555d Annotate merge revision (combined diff against two parents without looking further) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 548 diff changeset	41 import org.junit.Rule;
542 a71a05ec11bc Towards annotate/blame support: general outline of the functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	42 import org.junit.Test;
570 36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	43 import org.tmatesoft.hg.core.HgAnnotateCommand;
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	44 import org.tmatesoft.hg.core.HgAnnotateCommand.LineInfo;
562 6fbca6506bb5 Allow HgBlameFacility.Inspector (former BlockInspector) to throw an exception Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 561 diff changeset	45 import org.tmatesoft.hg.core.HgCallbackTargetException;
552 45751456b471 Annotate file changes through few revisions, walking either direction (old to new and vice versa) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 549 diff changeset	46 import org.tmatesoft.hg.core.HgIterateDirection;
570 36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	47 import org.tmatesoft.hg.core.HgRepoFacade;
555 e623aa2ca526 Annotate: RevisionDescriptor provides extra knowledge about inspected/annotated revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 554 diff changeset	48 import org.tmatesoft.hg.internal.FileAnnotation;
e623aa2ca526 Annotate: RevisionDescriptor provides extra knowledge about inspected/annotated revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 554 diff changeset	49 import org.tmatesoft.hg.internal.FileAnnotation.LineDescriptor;
e623aa2ca526 Annotate: RevisionDescriptor provides extra knowledge about inspected/annotated revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 554 diff changeset	50 import org.tmatesoft.hg.internal.FileAnnotation.LineInspector;
e623aa2ca526 Annotate: RevisionDescriptor provides extra knowledge about inspected/annotated revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 554 diff changeset	51 import org.tmatesoft.hg.internal.IntVector;
556 e55f17a7a195 AnnotateFacility renamed to HgBlameFacility and exposed, API shapes out and got some javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 555 diff changeset	52 import org.tmatesoft.hg.repo.HgBlameFacility;
e55f17a7a195 AnnotateFacility renamed to HgBlameFacility and exposed, API shapes out and got some javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 555 diff changeset	53 import org.tmatesoft.hg.repo.HgBlameFacility.AddBlock;
e55f17a7a195 AnnotateFacility renamed to HgBlameFacility and exposed, API shapes out and got some javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 555 diff changeset	54 import org.tmatesoft.hg.repo.HgBlameFacility.Block;
e55f17a7a195 AnnotateFacility renamed to HgBlameFacility and exposed, API shapes out and got some javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 555 diff changeset	55 import org.tmatesoft.hg.repo.HgBlameFacility.BlockData;
e55f17a7a195 AnnotateFacility renamed to HgBlameFacility and exposed, API shapes out and got some javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 555 diff changeset	56 import org.tmatesoft.hg.repo.HgBlameFacility.ChangeBlock;
e55f17a7a195 AnnotateFacility renamed to HgBlameFacility and exposed, API shapes out and got some javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 555 diff changeset	57 import org.tmatesoft.hg.repo.HgBlameFacility.DeleteBlock;
e55f17a7a195 AnnotateFacility renamed to HgBlameFacility and exposed, API shapes out and got some javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 555 diff changeset	58 import org.tmatesoft.hg.repo.HgBlameFacility.EqualBlock;
557 b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	59 import org.tmatesoft.hg.repo.HgDataFile;
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	60 import org.tmatesoft.hg.repo.HgLookup;
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	61 import org.tmatesoft.hg.repo.HgRepository;
570 36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	62 import org.tmatesoft.hg.util.Path;
542 a71a05ec11bc Towards annotate/blame support: general outline of the functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	63
a71a05ec11bc Towards annotate/blame support: general outline of the functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	64 /**
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 * @author Artem Tikhomirov
a71a05ec11bc Towards annotate/blame support: general outline of the functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	67 * @author TMate Software Ltd.
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 public class TestBlame {
a71a05ec11bc Towards annotate/blame support: general outline of the functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	70
549 83afa680555d Annotate merge revision (combined diff against two parents without looking further) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 548 diff changeset	71 @Rule
83afa680555d Annotate merge revision (combined diff against two parents without looking further) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 548 diff changeset	72 public ErrorCollectorExt errorCollector = new ErrorCollectorExt();
83afa680555d Annotate merge revision (combined diff against two parents without looking further) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 548 diff changeset	73
542 a71a05ec11bc Towards annotate/blame support: general outline of the functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	74
a71a05ec11bc Towards annotate/blame support: general outline of the functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	75 @Test
a71a05ec11bc Towards annotate/blame support: general outline of the functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	76 public void testSingleParentBlame() throws Exception {
a71a05ec11bc Towards annotate/blame support: general outline of the functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	77 HgRepository repo = new HgLookup().detectFromWorkingDir();
543 1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	78 final String fname = "src/org/tmatesoft/hg/internal/PatchGenerator.java";
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	79 final int checkChangeset = 539;
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	80 HgDataFile df = repo.getFileNode(fname);
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	81 ByteArrayOutputStream bos = new ByteArrayOutputStream();
568 8ed4f4f4f0a6 Blame facility refactored, get ready for follow/no-follow support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 562 diff changeset	82 new HgBlameFacility(df).annotateSingleRevision(checkChangeset, new DiffOutInspector(new PrintStream(bos)));
543 1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	83 LineGrepOutputParser gp = new LineGrepOutputParser("^@@.+");
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	84 ExecHelper eh = new ExecHelper(gp, null);
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	85 eh.run("hg", "diff", "-c", String.valueOf(checkChangeset), "-U", "0", fname);
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	86 //
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	87 String[] apiResult = splitLines(bos.toString());
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	88 String[] expected = splitLines(gp.result());
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	89 Assert.assertArrayEquals(expected, apiResult);
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	90 }
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	91
545 15b406c7cd9d First round of annotate file is functional Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 544 diff changeset	92 @Test
557 b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	93 public void testFileLineAnnotate1() throws Exception {
545 15b406c7cd9d First round of annotate file is functional Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 544 diff changeset	94 HgRepository repo = new HgLookup().detectFromWorkingDir();
15b406c7cd9d First round of annotate file is functional Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 544 diff changeset	95 final String fname = "src/org/tmatesoft/hg/internal/PatchGenerator.java";
15b406c7cd9d First round of annotate file is functional Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 544 diff changeset	96 HgDataFile df = repo.getFileNode(fname);
570 36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	97 AnnotateRunner ar = new AnnotateRunner(df.getPath(), null);
548 ab21ac7dd833 Line-by-line annotation API and support code in place Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 546 diff changeset	98
570 36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	99 for (int cs : new int[] { 539, 541 /, TIP /}) {
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	100 ar.run(cs, false);
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	101 FileAnnotateInspector fa = new FileAnnotateInspector();
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	102 FileAnnotation.annotate(df, cs, fa);
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	103 doAnnotateLineCheck(cs, ar.getLines(), Arrays.asList(fa.lineRevisions), Arrays.asList(fa.lines));
557 b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	104 }
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	105 }
548 ab21ac7dd833 Line-by-line annotation API and support code in place Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 546 diff changeset	106
557 b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	107 @Test
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	108 public void testFileLineAnnotate2() throws Exception {
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	109 HgRepository repo = Configuration.get().find("test-annotate");
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	110 HgDataFile df = repo.getFileNode("file1");
570 36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	111 AnnotateRunner ar = new AnnotateRunner(df.getPath(), repo.getWorkingDir());
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	112
558 154718ae23ed Annotate: refactor/reuse range handling code Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 557 diff changeset	113 for (int cs : new int[] { 4, 6 /, 8 see below/, TIP}) {
570 36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	114 ar.run(cs, false);
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	115 FileAnnotateInspector fa = new FileAnnotateInspector();
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	116 FileAnnotation.annotate(df, cs, fa);
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	117 doAnnotateLineCheck(cs, ar.getLines(), Arrays.asList(fa.lineRevisions), Arrays.asList(fa.lines));
545 15b406c7cd9d First round of annotate file is functional Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 544 diff changeset	118 }
558 154718ae23ed Annotate: refactor/reuse range handling code Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 557 diff changeset	119 /*`hg annotate -r 8` and HgBlameFacility give different result
154718ae23ed Annotate: refactor/reuse range handling code Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 557 diff changeset	120 * for "r0, line 5" line, which was deleted in rev2 and restored back in
154718ae23ed Annotate: refactor/reuse range handling code Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 557 diff changeset	121 * rev4 (both in default branch), while branch with r3 and r6 kept the line intact.
154718ae23ed Annotate: refactor/reuse range handling code Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 557 diff changeset	122 * HgBlame reports rev4 for the line, `hg annotate` gives original, rev0.
154718ae23ed Annotate: refactor/reuse range handling code Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 557 diff changeset	123 * However `hg annotate -r 4` shows rev4 for the line, too. The aforementioned rev0 for
154718ae23ed Annotate: refactor/reuse range handling code Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 557 diff changeset	124 * the merge rev8 results from the iteration order and is implementation specific
154718ae23ed Annotate: refactor/reuse range handling code Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 557 diff changeset	125 * (i.e. one can't tell which one is right). Mercurial walks from parents to children,
154718ae23ed Annotate: refactor/reuse range handling code Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 557 diff changeset	126 * and traces equal lines, wile HgBlameFacility walks from child to parents and records
154718ae23ed Annotate: refactor/reuse range handling code Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 557 diff changeset	127 * changes (additions). Seems it processes branch with rev3 and rev6 first
154718ae23ed Annotate: refactor/reuse range handling code Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 557 diff changeset	128 * (printout in context.py, annotate and annotate.pair reveals that), and the line 0_5
154718ae23ed Annotate: refactor/reuse range handling code Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 557 diff changeset	129 * comes as unchanged through this branch, and later processing rev2 and rev4 doesn't
154718ae23ed Annotate: refactor/reuse range handling code Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 557 diff changeset	130 * change that.
154718ae23ed Annotate: refactor/reuse range handling code Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 557 diff changeset	131 */
545 15b406c7cd9d First round of annotate file is functional Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 544 diff changeset	132 }
15b406c7cd9d First round of annotate file is functional Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 544 diff changeset	133
553 093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	134 @Test
093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	135 public void testComplexHistoryAnnotate() throws Exception {
093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	136 HgRepository repo = Configuration.get().find("test-annotate");
093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	137 HgDataFile df = repo.getFileNode("file1");
568 8ed4f4f4f0a6 Blame facility refactored, get ready for follow/no-follow support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 562 diff changeset	138 HgBlameFacility af = new HgBlameFacility(df);
553 093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	139 ByteArrayOutputStream bos = new ByteArrayOutputStream();
093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	140 DiffOutInspector dump = new DiffOutInspector(new PrintStream(bos));
568 8ed4f4f4f0a6 Blame facility refactored, get ready for follow/no-follow support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 562 diff changeset	141 af.annotate(TIP, dump, HgIterateDirection.OldToNew);
553 093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	142 LinkedList<String> apiResult = new LinkedList<String>(Arrays.asList(splitLines(bos.toString())));
093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	143
557 b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	144 /*
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	145 * FIXME this is an ugly hack to deal with the way `hg diff -c <mergeRev>` describes the change
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	146 * and our merge handling approach. For merged revision m, and lines changed both in p1 and p2
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	147 * we report lines from p2 as pure additions, regardless of intersecting p1 changes (which
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	148 * are reported as deletions, if no sufficient changed lines in m found)
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	149 * So, here we try to combine deletion that follows a change (based on identical insertionPoint)
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	150 * into a single change
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	151 * To fix, need to find better approach to find out reference info (i.e. `hg diff -c` is flawed in this case,
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	152 * as it uses first parent only).
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	153 */
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	154 Pattern fix = Pattern.compile("@@ -(\\d+),(\\d+) \\+(\\d+),(\\d+) @@");
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	155 int v1, v2, v3, v4;
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	156 v1 = v2 = v3 = v4 = -1;
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	157 for (ListIterator<String> it = apiResult.listIterator(); it.hasNext();) {
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	158 String n = it.next();
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	159 Matcher m = fix.matcher(n);
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	160 if (m.find()) {
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	161 int d1 = Integer.parseInt(m.group(1));
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	162 int d2 = Integer.parseInt(m.group(2));
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	163 int d3 = Integer.parseInt(m.group(3));
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	164 int d4 = Integer.parseInt(m.group(4));
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	165 if (v1 == d1 && d4 == 0) {
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	166 it.previous(); // shift to current element
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	167 it.previous(); // to real previous
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	168 it.remove();
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	169 it.next();
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	170 it.set(String.format("@@ -%d,%d +%d,%d @@", v1, v2+d2, v3, v4));
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	171 }
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	172 v1 = d1;
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	173 v2 = d2;
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	174 v3 = d3;
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	175 v4 = d4;
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	176 }
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	177 }
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	178
553 093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	179 LineGrepOutputParser gp = new LineGrepOutputParser("^@@.+");
093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	180 ExecHelper eh = new ExecHelper(gp, repo.getWorkingDir());
093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	181 for (int cs : dump.getReportedTargetRevisions()) {
093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	182 gp.reset();
093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	183 eh.run("hg", "diff", "-c", String.valueOf(cs), "-U", "0", df.getPath().toString());
093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	184 for (String expected : splitLines(gp.result())) {
093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	185 if (!apiResult.remove(expected)) {
093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	186 errorCollector.fail(String.format("Expected diff output '%s' for changes in revision %d", expected, cs));
093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	187 }
093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	188 }
093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	189 }
093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	190 errorCollector.assertTrue(String.format("Annotate API reported excessive diff: %s ", apiResult.toString()), apiResult.isEmpty());
093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	191 }
570 36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	192
573 e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	193
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	194 @Test
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	195 public void testPartialHistoryFollow() throws Exception {
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	196 HgRepository repo = Configuration.get().find("test-annotate2");
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	197 HgDataFile df = repo.getFileNode("file1b.txt");
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	198 // rev3: file1 -> file1a, rev7: file1a -> file1b, tip: rev10
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	199 HgBlameFacility bf = new HgBlameFacility(df);
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	200 DiffOutInspector insp = new DiffOutInspector(new PrintStream(new OutputStream() {
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	201 @Override
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	202 public void write(int b) throws IOException {
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	203 // NULL OutputStream
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	204 }
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	205 }));
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	206 // rev6 changes rev4, rev4 changes rev3. Plus, anything changed
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	207 // earlier than rev2 shall be reported as new from change3
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	208 int[] change_2_8_new2old = new int[] {4, 6, 3, 4, -1, 3};
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	209 int[] change_2_8_old2new = new int[] {-1, 3, 3, 4, 4, 6 };
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	210 bf.annotate(2, 8, insp, NewToOld);
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	211 Assert.assertArrayEquals(change_2_8_new2old, insp.getReportedRevisionPairs());
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	212 insp.reset();
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	213 bf.annotate(2, 8, insp, OldToNew);
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	214 Assert.assertArrayEquals(change_2_8_old2new, insp.getReportedRevisionPairs());
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	215 // same as 2 to 8, with addition of rev9 changes rev7 (rev6 to rev7 didn't change content, only name)
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	216 int[] change_3_9_new2old = new int[] {7, 9, 4, 6, 3, 4, -1, 3 };
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	217 int[] change_3_9_old2new = new int[] {-1, 3, 3, 4, 4, 6, 7, 9 };
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	218 insp.reset();
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	219 bf.annotate(3, 9, insp, NewToOld);
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	220 Assert.assertArrayEquals(change_3_9_new2old, insp.getReportedRevisionPairs());
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	221 insp.reset();
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	222 bf.annotate(3, 9, insp, OldToNew);
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	223 Assert.assertArrayEquals(change_3_9_old2new, insp.getReportedRevisionPairs());
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	224 }
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	225
570 36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	226 @Test
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	227 public void testAnnotateCmdFollowNoFollow() throws Exception {
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	228 HgRepoFacade hgRepoFacade = new HgRepoFacade();
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	229 HgRepository repo = Configuration.get().find("test-annotate2");
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	230 hgRepoFacade.init(repo);
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	231 HgAnnotateCommand cmd = hgRepoFacade.createAnnotateCommand();
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	232 final Path fname = Path.create("file1b.txt");
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	233 final int changeset = TIP;
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	234 AnnotateInspector ai = new AnnotateInspector();
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	235
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	236 cmd.changeset(changeset);
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	237 // follow
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	238 cmd.file(fname);
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	239 cmd.execute(ai);
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	240 AnnotateRunner ar = new AnnotateRunner(fname, repo.getWorkingDir());
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	241 ar.run(changeset, true);
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	242 doAnnotateLineCheck(changeset, ar.getLines(), ai.changesets, ai.lines);
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	243
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	244 // no follow
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	245 cmd.file(fname, false);
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	246 ai = new AnnotateInspector();
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	247 cmd.execute(ai);
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	248 ar.run(changeset, false);
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	249 doAnnotateLineCheck(changeset, ar.getLines(), ai.changesets, ai.lines);
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	250 }
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	251
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	252 private void doAnnotateLineCheck(int cs, String[] hgAnnotateLines, List<Integer> cmdChangesets, List<String> cmdLines) {
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	253 assertTrue("[sanity]", hgAnnotateLines.length > 0);
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	254 assertEquals("Number of lines reported by native annotate and our impl", hgAnnotateLines.length, cmdLines.size());
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	255
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	256 for (int i = 0; i < cmdChangesets.size(); i++) {
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	257 int hgAnnotateRevIndex = Integer.parseInt(hgAnnotateLines[i].substring(0, hgAnnotateLines[i].indexOf(':')).trim());
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	258 errorCollector.assertEquals(String.format("Revision mismatch for line %d (annotating rev: %d)", i+1, cs), hgAnnotateRevIndex, cmdChangesets.get(i));
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	259 String hgAnnotateLine = hgAnnotateLines[i].substring(hgAnnotateLines[i].indexOf(':') + 1);
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	260 String apiLine = cmdLines.get(i).trim();
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	261 errorCollector.assertEquals(hgAnnotateLine.trim(), apiLine);
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	262 }
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	263 }
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	264
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	265 // FIXME HgWorkingCopyStatusCollector (and HgStatusCollector), with their ancestors (rev 59/69) have examples
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	266 // of incorrect assignment of common lines (like "}") - our impl doesn't process common lines in any special way
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	267 // while original diff lib does. Would be nice to behave as close to original, as possible.
553 093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	268
543 1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	269 private static String[] splitLines(CharSequence seq) {
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	270 int lineCount = 0;
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	271 for (int i = 0, x = seq.length(); i < x; i++) {
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	272 if (seq.charAt(i) == '\n') {
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	273 lineCount++;
542 a71a05ec11bc Towards annotate/blame support: general outline of the functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	274 }
543 1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	275 }
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	276 if (seq.length() > 0 && seq.charAt(seq.length()-1) != '\n') {
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	277 lineCount++;
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	278 }
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	279 String[] rv = new String[lineCount];
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	280 int lineStart = 0, lineEnd = 0, ix = 0;
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	281 do {
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	282 while (lineEnd < seq.length() && seq.charAt(lineEnd) != '\n') lineEnd++;
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	283 if (lineEnd == lineStart) {
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	284 continue;
542 a71a05ec11bc Towards annotate/blame support: general outline of the functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	285 }
543 1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	286 CharSequence line = seq.subSequence(lineStart, lineEnd);
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	287 rv[ix++] = line.toString();
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	288 lineStart = ++lineEnd;
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	289 } while (lineStart < seq.length());
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	290 assert ix == lineCount;
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	291 return rv;
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	292 }
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	293
549 83afa680555d Annotate merge revision (combined diff against two parents without looking further) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 548 diff changeset	294
83afa680555d Annotate merge revision (combined diff against two parents without looking further) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 548 diff changeset	295 private void aaa() throws Exception {
546 cd78e8b9d7bc File annotate test. Refactored FileAnnotation as standalone class, introduced LineInspector to make line offset calc code shared Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 545 diff changeset	296 HgRepository repo = new HgLookup().detectFromWorkingDir();
cd78e8b9d7bc File annotate test. Refactored FileAnnotation as standalone class, introduced LineInspector to make line offset calc code shared Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 545 diff changeset	297 final String fname = "src/org/tmatesoft/hg/internal/PatchGenerator.java";
cd78e8b9d7bc File annotate test. Refactored FileAnnotation as standalone class, introduced LineInspector to make line offset calc code shared Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 545 diff changeset	298 final int checkChangeset = 539;
cd78e8b9d7bc File annotate test. Refactored FileAnnotation as standalone class, introduced LineInspector to make line offset calc code shared Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 545 diff changeset	299 HgDataFile df = repo.getFileNode(fname);
568 8ed4f4f4f0a6 Blame facility refactored, get ready for follow/no-follow support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 562 diff changeset	300 HgBlameFacility af = new HgBlameFacility(df);
549 83afa680555d Annotate merge revision (combined diff against two parents without looking further) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 548 diff changeset	301 DiffOutInspector dump = new DiffOutInspector(System.out);
83afa680555d Annotate merge revision (combined diff against two parents without looking further) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 548 diff changeset	302 System.out.println("541 -> 543");
568 8ed4f4f4f0a6 Blame facility refactored, get ready for follow/no-follow support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 562 diff changeset	303 af.annotateSingleRevision(543, dump);
549 83afa680555d Annotate merge revision (combined diff against two parents without looking further) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 548 diff changeset	304 System.out.println("539 -> 541");
568 8ed4f4f4f0a6 Blame facility refactored, get ready for follow/no-follow support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 562 diff changeset	305 af.annotateSingleRevision(541, dump);
546 cd78e8b9d7bc File annotate test. Refactored FileAnnotation as standalone class, introduced LineInspector to make line offset calc code shared Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 545 diff changeset	306 System.out.println("536 -> 539");
568 8ed4f4f4f0a6 Blame facility refactored, get ready for follow/no-follow support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 562 diff changeset	307 af.annotateSingleRevision(checkChangeset, dump);
546 cd78e8b9d7bc File annotate test. Refactored FileAnnotation as standalone class, introduced LineInspector to make line offset calc code shared Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 545 diff changeset	308 System.out.println("531 -> 536");
568 8ed4f4f4f0a6 Blame facility refactored, get ready for follow/no-follow support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 562 diff changeset	309 af.annotateSingleRevision(536, dump);
546 cd78e8b9d7bc File annotate test. Refactored FileAnnotation as standalone class, introduced LineInspector to make line offset calc code shared Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 545 diff changeset	310 System.out.println(" -1 -> 531");
568 8ed4f4f4f0a6 Blame facility refactored, get ready for follow/no-follow support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 562 diff changeset	311 af.annotateSingleRevision(531, dump);
549 83afa680555d Annotate merge revision (combined diff against two parents without looking further) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 548 diff changeset	312
83afa680555d Annotate merge revision (combined diff against two parents without looking further) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 548 diff changeset	313 FileAnnotateInspector fai = new FileAnnotateInspector();
555 e623aa2ca526 Annotate: RevisionDescriptor provides extra knowledge about inspected/annotated revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 554 diff changeset	314 FileAnnotation.annotate(df, 541, fai);
549 83afa680555d Annotate merge revision (combined diff against two parents without looking further) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 548 diff changeset	315 for (int i = 0; i < fai.lineRevisions.length; i++) {
83afa680555d Annotate merge revision (combined diff against two parents without looking further) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 548 diff changeset	316 System.out.printf("%3d: LINE %d\n", fai.lineRevisions[i], i+1);
83afa680555d Annotate merge revision (combined diff against two parents without looking further) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 548 diff changeset	317 }
83afa680555d Annotate merge revision (combined diff against two parents without looking further) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 548 diff changeset	318 }
546 cd78e8b9d7bc File annotate test. Refactored FileAnnotation as standalone class, introduced LineInspector to make line offset calc code shared Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 545 diff changeset	319
549 83afa680555d Annotate merge revision (combined diff against two parents without looking further) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 548 diff changeset	320 private void bbb() throws Exception {
83afa680555d Annotate merge revision (combined diff against two parents without looking further) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 548 diff changeset	321 HgRepository repo = new HgLookup().detectFromWorkingDir();
83afa680555d Annotate merge revision (combined diff against two parents without looking further) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 548 diff changeset	322 final String fname = "src/org/tmatesoft/hg/repo/HgManifest.java";
83afa680555d Annotate merge revision (combined diff against two parents without looking further) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 548 diff changeset	323 final int checkChangeset = 415;
83afa680555d Annotate merge revision (combined diff against two parents without looking further) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 548 diff changeset	324 HgDataFile df = repo.getFileNode(fname);
568 8ed4f4f4f0a6 Blame facility refactored, get ready for follow/no-follow support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 562 diff changeset	325 HgBlameFacility af = new HgBlameFacility(df);
549 83afa680555d Annotate merge revision (combined diff against two parents without looking further) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 548 diff changeset	326 DiffOutInspector dump = new DiffOutInspector(System.out);
552 45751456b471 Annotate file changes through few revisions, walking either direction (old to new and vice versa) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 549 diff changeset	327 // System.out.println("413 -> 415");
45751456b471 Annotate file changes through few revisions, walking either direction (old to new and vice versa) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 549 diff changeset	328 // af.diff(df, 413, 415, dump);
45751456b471 Annotate file changes through few revisions, walking either direction (old to new and vice versa) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 549 diff changeset	329 // System.out.println("408 -> 415");
45751456b471 Annotate file changes through few revisions, walking either direction (old to new and vice versa) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 549 diff changeset	330 // af.diff(df, 408, 415, dump);
45751456b471 Annotate file changes through few revisions, walking either direction (old to new and vice versa) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 549 diff changeset	331 // System.out.println("Combined (with merge):");
45751456b471 Annotate file changes through few revisions, walking either direction (old to new and vice versa) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 549 diff changeset	332 // dump.needRevisions(true);
45751456b471 Annotate file changes through few revisions, walking either direction (old to new and vice versa) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 549 diff changeset	333 // af.annotateChange(df, checkChangeset, dump);
549 83afa680555d Annotate merge revision (combined diff against two parents without looking further) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 548 diff changeset	334 dump.needRevisions(true);
568 8ed4f4f4f0a6 Blame facility refactored, get ready for follow/no-follow support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 562 diff changeset	335 af.annotate(checkChangeset, dump, HgIterateDirection.OldToNew);
549 83afa680555d Annotate merge revision (combined diff against two parents without looking further) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 548 diff changeset	336 }
553 093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	337
561 d3c71498919c Do not process child revisions before all possible parent paths were visited Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 558 diff changeset	338 private void ccc() throws Throwable {
562 6fbca6506bb5 Allow HgBlameFacility.Inspector (former BlockInspector) to throw an exception Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 561 diff changeset	339 HgRepository repo = new HgLookup().detect("/home/artem/hg/hgtest-annotate-merge/");
6fbca6506bb5 Allow HgBlameFacility.Inspector (former BlockInspector) to throw an exception Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 561 diff changeset	340 HgDataFile df = repo.getFileNode("file.txt");
568 8ed4f4f4f0a6 Blame facility refactored, get ready for follow/no-follow support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 562 diff changeset	341 HgBlameFacility af = new HgBlameFacility(df);
561 d3c71498919c Do not process child revisions before all possible parent paths were visited Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 558 diff changeset	342 DiffOutInspector dump = new DiffOutInspector(System.out);
d3c71498919c Do not process child revisions before all possible parent paths were visited Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 558 diff changeset	343 dump.needRevisions(true);
568 8ed4f4f4f0a6 Blame facility refactored, get ready for follow/no-follow support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 562 diff changeset	344 af.annotate(8, dump, HgIterateDirection.NewToOld);
561 d3c71498919c Do not process child revisions before all possible parent paths were visited Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 558 diff changeset	345 // af.annotateSingleRevision(df, 113, dump);
557 b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	346 // System.out.println();
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	347 // af.annotate(df, TIP, new LineDumpInspector(true), HgIterateDirection.NewToOld);
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	348 // System.out.println();
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	349 // af.annotate(df, TIP, new LineDumpInspector(false), HgIterateDirection.NewToOld);
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	350 // System.out.println();
562 6fbca6506bb5 Allow HgBlameFacility.Inspector (former BlockInspector) to throw an exception Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 561 diff changeset	351 /*
561 d3c71498919c Do not process child revisions before all possible parent paths were visited Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 558 diff changeset	352 OutputParser.Stub op = new OutputParser.Stub();
d3c71498919c Do not process child revisions before all possible parent paths were visited Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 558 diff changeset	353 eh = new ExecHelper(op, repo.getWorkingDir());
d3c71498919c Do not process child revisions before all possible parent paths were visited Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 558 diff changeset	354 for (int cs : new int[] { 24, 46, 49, 52, 59, 62, 64, TIP}) {
d3c71498919c Do not process child revisions before all possible parent paths were visited Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 558 diff changeset	355 doLineAnnotateTest(df, cs, op);
d3c71498919c Do not process child revisions before all possible parent paths were visited Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 558 diff changeset	356 }
d3c71498919c Do not process child revisions before all possible parent paths were visited Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 558 diff changeset	357 errorCollector.verify();
562 6fbca6506bb5 Allow HgBlameFacility.Inspector (former BlockInspector) to throw an exception Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 561 diff changeset	358 */
553 093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	359 FileAnnotateInspector fa = new FileAnnotateInspector();
562 6fbca6506bb5 Allow HgBlameFacility.Inspector (former BlockInspector) to throw an exception Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 561 diff changeset	360 FileAnnotation.annotate(df, 8, fa);
553 093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	361 for (int i = 0; i < fa.lineRevisions.length; i++) {
557 b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	362 System.out.printf("%d: %s", fa.lineRevisions[i], fa.line(i) == null ? "null\n" : fa.line(i));
542 a71a05ec11bc Towards annotate/blame support: general outline of the functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	363 }
a71a05ec11bc Towards annotate/blame support: general outline of the functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	364 }
553 093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	365
561 d3c71498919c Do not process child revisions before all possible parent paths were visited Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 558 diff changeset	366 public static void main(String[] args) throws Throwable {
545 15b406c7cd9d First round of annotate file is functional Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 544 diff changeset	367 // System.out.println(Arrays.equals(new String[0], splitLines("")));
15b406c7cd9d First round of annotate file is functional Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 544 diff changeset	368 // System.out.println(Arrays.equals(new String[] { "abc" }, splitLines("abc")));
15b406c7cd9d First round of annotate file is functional Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 544 diff changeset	369 // System.out.println(Arrays.equals(new String[] { "a", "bc" }, splitLines("a\nbc")));
15b406c7cd9d First round of annotate file is functional Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 544 diff changeset	370 // System.out.println(Arrays.equals(new String[] { "a", "bc" }, splitLines("a\nbc\n")));
570 36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	371 TestBlame tt = new TestBlame();
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	372 tt.ccc();
542 a71a05ec11bc Towards annotate/blame support: general outline of the functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	373 }
543 1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	374
562 6fbca6506bb5 Allow HgBlameFacility.Inspector (former BlockInspector) to throw an exception Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 561 diff changeset	375 private static class DiffOutInspector implements HgBlameFacility.Inspector {
543 1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	376 private final PrintStream out;
549 83afa680555d Annotate merge revision (combined diff against two parents without looking further) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 548 diff changeset	377 private boolean dumpRevs;
553 093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	378 private IntVector reportedRevisionPairs = new IntVector();
543 1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	379
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	380 DiffOutInspector(PrintStream ps) {
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	381 out = ps;
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	382 }
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	383
554 a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	384 // Note, true makes output incompatible with 'hg diff'
549 83afa680555d Annotate merge revision (combined diff against two parents without looking further) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 548 diff changeset	385 public void needRevisions(boolean dumpRevs) {
83afa680555d Annotate merge revision (combined diff against two parents without looking further) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 548 diff changeset	386 this.dumpRevs = dumpRevs;
83afa680555d Annotate merge revision (combined diff against two parents without looking further) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 548 diff changeset	387 }
83afa680555d Annotate merge revision (combined diff against two parents without looking further) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 548 diff changeset	388
83afa680555d Annotate merge revision (combined diff against two parents without looking further) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 548 diff changeset	389 private void printRevs(Block b) {
83afa680555d Annotate merge revision (combined diff against two parents without looking further) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 548 diff changeset	390 if (dumpRevs) {
83afa680555d Annotate merge revision (combined diff against two parents without looking further) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 548 diff changeset	391 out.printf("[%3d -> %3d] ", b.originChangesetIndex(), b.targetChangesetIndex());
83afa680555d Annotate merge revision (combined diff against two parents without looking further) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 548 diff changeset	392 }
553 093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	393 reportedRevisionPairs.add(b.originChangesetIndex(), b.targetChangesetIndex());
093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	394 }
093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	395
093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	396 int[] getReportedTargetRevisions() {
093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	397 LinkedHashSet<Integer> rv = new LinkedHashSet<Integer>();
093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	398 for (int i = 1; i < reportedRevisionPairs.size(); i += 2) {
093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	399 rv.add(reportedRevisionPairs.get(i));
093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	400 }
093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	401 int[] x = new int[rv.size()];
093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	402 int i = 0;
093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	403 for (int v : rv) {
093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	404 x[i++] = v;
093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	405 }
093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	406 return x;
549 83afa680555d Annotate merge revision (combined diff against two parents without looking further) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 548 diff changeset	407 }
83afa680555d Annotate merge revision (combined diff against two parents without looking further) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 548 diff changeset	408
573 e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	409 int[] getReportedRevisionPairs() {
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	410 return reportedRevisionPairs.toArray();
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	411 }
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	412
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	413 void reset() {
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	414 reportedRevisionPairs.clear();
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	415 }
e49f9d9513fa Partial blame when start/end revisions are in the middle of a single filename history Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 570 diff changeset	416
545 15b406c7cd9d First round of annotate file is functional Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 544 diff changeset	417 public void same(EqualBlock block) {
543 1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	418 // nothing
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	419 }
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	420
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	421 public void deleted(DeleteBlock block) {
549 83afa680555d Annotate merge revision (combined diff against two parents without looking further) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 548 diff changeset	422 printRevs(block);
543 1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	423 out.printf("@@ -%d,%d +%d,0 @@\n", block.firstRemovedLine() + 1, block.totalRemovedLines(), block.removedAt());
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	424 }
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	425
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	426 public void changed(ChangeBlock block) {
549 83afa680555d Annotate merge revision (combined diff against two parents without looking further) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 548 diff changeset	427 printRevs(block);
543 1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	428 out.printf("@@ -%d,%d +%d,%d @@\n", block.firstRemovedLine() + 1, block.totalRemovedLines(), block.firstAddedLine() + 1, block.totalAddedLines());
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	429 }
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	430
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	431 public void added(AddBlock block) {
549 83afa680555d Annotate merge revision (combined diff against two parents without looking further) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 548 diff changeset	432 printRevs(block);
543 1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	433 out.printf("@@ -%d,0 +%d,%d @@\n", block.insertedAt(), block.firstAddedLine() + 1, block.totalAddedLines());
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	434 }
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	435 }
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	436
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	437 public static class LineGrepOutputParser implements OutputParser {
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	438
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	439 private final Pattern pattern;
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	440 private final StringBuilder result = new StringBuilder();
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	441
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	442 public LineGrepOutputParser(String regexp) {
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	443 pattern = Pattern.compile(regexp);
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	444 }
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	445
553 093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	446 public void reset() {
093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	447 result.setLength(0);
093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	448 }
093a2022dad5 Test (with tailored repository) for annotation of multiple revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 552 diff changeset	449
543 1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	450 public CharSequence result() {
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	451 return result;
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	452 }
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	453
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	454 public void parse(CharSequence seq) {
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	455 int lineStart = 0, lineEnd = 0;
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	456 do {
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	457 while (lineEnd < seq.length() && seq.charAt(lineEnd) != '\n') lineEnd++;
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	458 if (lineEnd == lineStart) {
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	459 continue;
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	460 }
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	461 CharSequence line = seq.subSequence(lineStart, lineEnd);
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	462 if (pattern.matcher(line).matches()) {
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	463 result.append(line);
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	464 result.append('\n');
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	465 }
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	466 lineStart = ++lineEnd;
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	467 } while (lineStart < seq.length());
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	468 }
1e95f48d9886 Report line index for insertion and deletion, test against 'hg diff' output Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 542 diff changeset	469 }
545 15b406c7cd9d First round of annotate file is functional Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 544 diff changeset	470
555 e623aa2ca526 Annotate: RevisionDescriptor provides extra knowledge about inspected/annotated revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 554 diff changeset	471 private static class FileAnnotateInspector implements LineInspector {
570 36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	472 private Integer[] lineRevisions;
557 b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	473 private String[] lines;
545 15b406c7cd9d First round of annotate file is functional Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 544 diff changeset	474
546 cd78e8b9d7bc File annotate test. Refactored FileAnnotation as standalone class, introduced LineInspector to make line offset calc code shared Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 545 diff changeset	475 FileAnnotateInspector() {
545 15b406c7cd9d First round of annotate file is functional Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 544 diff changeset	476 }
15b406c7cd9d First round of annotate file is functional Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 544 diff changeset	477
557 b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	478 public void line(int lineNumber, int changesetRevIndex, BlockData lineContent, LineDescriptor ld) {
545 15b406c7cd9d First round of annotate file is functional Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 544 diff changeset	479 if (lineRevisions == null) {
570 36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	480 lineRevisions = new Integer[ld.totalLines()];
545 15b406c7cd9d First round of annotate file is functional Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 544 diff changeset	481 Arrays.fill(lineRevisions, NO_REVISION);
557 b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	482 lines = new String[ld.totalLines()];
545 15b406c7cd9d First round of annotate file is functional Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 544 diff changeset	483 }
546 cd78e8b9d7bc File annotate test. Refactored FileAnnotation as standalone class, introduced LineInspector to make line offset calc code shared Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 545 diff changeset	484 lineRevisions[lineNumber] = changesetRevIndex;
557 b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	485 lines[lineNumber] = new String(lineContent.asArray());
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	486 }
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	487
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	488 public String line(int i) {
b9e5ac26dd83 Annotate: Line annotation needs true line position from merged blocks; test-annotate repo updated to show elements from both parents in the merged revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 556 diff changeset	489 return lines[i];
545 15b406c7cd9d First round of annotate file is functional Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 544 diff changeset	490 }
15b406c7cd9d First round of annotate file is functional Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 544 diff changeset	491 }
546 cd78e8b9d7bc File annotate test. Refactored FileAnnotation as standalone class, introduced LineInspector to make line offset calc code shared Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 545 diff changeset	492
562 6fbca6506bb5 Allow HgBlameFacility.Inspector (former BlockInspector) to throw an exception Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 561 diff changeset	493 private static class LineDumpInspector implements HgBlameFacility.Inspector {
554 a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	494
a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	495 private final boolean lineByLine;
a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	496
a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	497 public LineDumpInspector(boolean lineByLine) {
a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	498 this.lineByLine = lineByLine;
a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	499 }
a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	500
a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	501 public void same(EqualBlock block) {
a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	502 }
a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	503
a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	504 public void added(AddBlock block) {
a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	505 BlockData lines = block.addedLines();
a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	506 printBlock(lines, block.targetChangesetIndex(), block.firstAddedLine(), block.totalAddedLines(), "+++");
a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	507 }
a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	508
a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	509 public void changed(ChangeBlock block) {
a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	510 deleted(block);
a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	511 added(block);
a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	512 }
a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	513
a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	514 public void deleted(DeleteBlock block) {
a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	515 BlockData lines = block.removedLines();
a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	516 assert lines.elementCount() == block.totalRemovedLines();
a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	517 printBlock(lines, block.originChangesetIndex(), block.firstRemovedLine(), block.totalRemovedLines(), "---");
a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	518 }
a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	519
a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	520 private void printBlock(BlockData lines, int cset, int first, int length, String marker) {
a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	521 assert lines.elementCount() == length;
a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	522 if (lineByLine) {
a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	523 for (int i = 0, ln = first; i < length; i++, ln++) {
a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	524 String line = new String(lines.elementAt(i).asArray());
a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	525 System.out.printf("%3d:%3d:%s:%s", cset, ln, marker, line);
a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	526 }
a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	527 } else {
a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	528 String content = new String(lines.asArray());
a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	529 System.out.printf("%3d:%s:[%d..%d):\n%s", cset, marker, first, first+length, content);
a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	530 }
a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	531 }
a5fd757d1b5d Access to content of annotated files through BlockData interface Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 553 diff changeset	532 }
570 36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	533
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	534 static class AnnotateInspector implements HgAnnotateCommand.Inspector {
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	535 private int lineNumber = 1;
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	536 public final ArrayList<String> lines = new ArrayList<String>();
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	537 public final ArrayList<Integer> changesets = new ArrayList<Integer>();
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	538
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	539 public void next(LineInfo lineInfo) throws HgCallbackTargetException {
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	540 Assert.assertEquals(lineInfo.getLineNumber(), lineNumber);
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	541 lineNumber++;
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	542 lines.add(new String(lineInfo.getContent()));
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	543 changesets.add(lineInfo.getChangesetIndex());
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	544 }
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	545 }
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	546
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	547 private static class AnnotateRunner {
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	548 private final ExecHelper eh;
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	549 private final OutputParser.Stub op;
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	550 private final Path file;
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	551
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	552 public AnnotateRunner(Path filePath, File repoDir) {
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	553 file = filePath;
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	554 op = new OutputParser.Stub();
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	555 eh = new ExecHelper(op, repoDir);
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	556 }
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	557
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	558 public void run(int cset, boolean follow) throws Exception {
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	559 op.reset();
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	560 ArrayList<String> args = new ArrayList<String>();
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	561 args.add("hg");
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	562 args.add("annotate");
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	563 args.add("-r");
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	564 args.add(cset == TIP ? "tip" : String.valueOf(cset));
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	565 if (!follow) {
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	566 args.add("--no-follow");
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	567 }
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	568 args.add(file.toString());
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	569 eh.run(args);
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	570 }
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	571
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	572 public String[] getLines() {
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	573 return splitLines(op.result());
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	574 }
36853bb80a35 Tests for HgAnnotateCommand with follow/no-follow option Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 568 diff changeset	575 }
542 a71a05ec11bc Towards annotate/blame support: general outline of the functionality Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	576 }

Mercurial > hg4j

annotate test/org/tmatesoft/hg/test/TestBlame.java @ 573:e49f9d9513fa