hg4j: src/org/tmatesoft/hg/core/HgLogCommand.java annotate

annotate src/org/tmatesoft/hg/core/HgLogCommand.java @ 596:43cfa08ff3fd

HgBlameFacility refactoring: extract code to build file history that spans renames

author	Artem Tikhomirov <tikhomirov.artem@gmail.com>
date	Thu, 02 May 2013 19:23:53 +0200
parents	e4ee4bf4c7d0
children	6526d8adbc0f

rev	line source
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	1 /*
565 78a9e26e670d Refactor common code to initialize changelog revision for a command into standalone class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 559 diff changeset	2 s * Copyright (c) 2011-2013 TMate Software Ltd
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	3 *
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	4 * This program is free software; you can redistribute it and/or modify
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	5 * it under the terms of the GNU General Public License as published by
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	6 * the Free Software Foundation; version 2 of the License.
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	7 *
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	8 * This program is distributed in the hope that it will be useful,
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	11 * GNU General Public License for more details.
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	12 *
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	13 * For information on how to redistribute this software under
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	14 * the terms of a license other than GNU General Public License
102 a3a2e5deb320 Updated contact address to support@hg4j.com Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 94 diff changeset	15 * contact TMate Software at support@hg4j.com
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	16 */
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	17 package org.tmatesoft.hg.core;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	18
518 0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	19 import static org.tmatesoft.hg.repo.HgRepository.BAD_REVISION;
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 70 diff changeset	20 import static org.tmatesoft.hg.repo.HgRepository.TIP;
456 909306e412e2 Refactor LogFacility and SessionContext, better API for both Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 432 diff changeset	21 import static org.tmatesoft.hg.util.LogFacility.Severity.Error;
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	22
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	23 import java.util.ArrayList;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	24 import java.util.Arrays;
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	25 import java.util.Calendar;
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	26 import java.util.Collection;
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	27 import java.util.Collections;
511 122e0600799f Respect multiple joins/forks in a history of a single file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 510 diff changeset	28 import java.util.Comparator;
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	29 import java.util.ConcurrentModificationException;
510 90093ee56c0d Full-fledged test repo to follow file history. Investigating iteration direction alternatives (from new to old in addition to existing old to new) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 509 diff changeset	30 import java.util.Iterator;
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	31 import java.util.LinkedList;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	32 import java.util.List;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	33 import java.util.Set;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	34 import java.util.TreeSet;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	35
520 1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	36 import org.tmatesoft.hg.internal.AdapterPlug;
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	37 import org.tmatesoft.hg.internal.BatchRangeHelper;
565 78a9e26e670d Refactor common code to initialize changelog revision for a command into standalone class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 559 diff changeset	38 import org.tmatesoft.hg.internal.CsetParamKeeper;
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	39 import org.tmatesoft.hg.internal.IntMap;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	40 import org.tmatesoft.hg.internal.IntVector;
526 2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 522 diff changeset	41 import org.tmatesoft.hg.internal.Internals;
518 0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	42 import org.tmatesoft.hg.internal.Lifecycle;
520 1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	43 import org.tmatesoft.hg.internal.LifecycleProxy;
596 43cfa08ff3fd HgBlameFacility refactoring: extract code to build file history that spans renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 571 diff changeset	44 import org.tmatesoft.hg.internal.ReverseIterator;
215 41a778e3fd31 Issue 5: Facilities for progress and cancellation. More specific exceptions. Exceptions from callbacks as RuntimeException Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 205 diff changeset	45 import org.tmatesoft.hg.repo.HgChangelog;
154 ba2bf656f00f Changeset => RawChangeset Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 148 diff changeset	46 import org.tmatesoft.hg.repo.HgChangelog.RawChangeset;
80 4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	47 import org.tmatesoft.hg.repo.HgDataFile;
423 9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 419 diff changeset	48 import org.tmatesoft.hg.repo.HgInvalidControlFileException;
9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 419 diff changeset	49 import org.tmatesoft.hg.repo.HgInvalidStateException;
456 909306e412e2 Refactor LogFacility and SessionContext, better API for both Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 432 diff changeset	50 import org.tmatesoft.hg.repo.HgParentChildMap;
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 70 diff changeset	51 import org.tmatesoft.hg.repo.HgRepository;
423 9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 419 diff changeset	52 import org.tmatesoft.hg.repo.HgRuntimeException;
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	53 import org.tmatesoft.hg.repo.HgStatusCollector;
514 5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	54 import org.tmatesoft.hg.util.Adaptable;
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	55 import org.tmatesoft.hg.util.CancelSupport;
157 d5268ca7715b Merged branch wrap-data-access into default for resource-friendly data access. Updated API to promote that friendliness to clients (channels, not byte[]). More exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 154 diff changeset	56 import org.tmatesoft.hg.util.CancelledException;
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	57 import org.tmatesoft.hg.util.Pair;
133 4a948ec83980 core.Path to util.Path as it's not Hg repo dependant Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 131 diff changeset	58 import org.tmatesoft.hg.util.Path;
215 41a778e3fd31 Issue 5: Facilities for progress and cancellation. More specific exceptions. Exceptions from callbacks as RuntimeException Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 205 diff changeset	59 import org.tmatesoft.hg.util.ProgressSupport;
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	60
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	61
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	62 /**
131 aa1629f36482 Renamed .core classes to start with Hg prefix Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 129 diff changeset	63 * Access to changelog, 'hg log' command counterpart.
aa1629f36482 Renamed .core classes to start with Hg prefix Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 129 diff changeset	64 *
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	65 * <pre>
131 aa1629f36482 Renamed .core classes to start with Hg prefix Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 129 diff changeset	66 * Usage:
70 993f6f8e1314 Test for log command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 64 diff changeset	67 * new LogCommand().limit(20).branch("maintenance-2.1").user("me").execute(new MyHandler());
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	68 * </pre>
131 aa1629f36482 Renamed .core classes to start with Hg prefix Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 129 diff changeset	69 * Not thread-safe (each thread has to use own {@link HgLogCommand} instance).
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	70 *
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	71 * @author Artem Tikhomirov
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	72 * @author TMate Software Ltd.
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	73 */
518 0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	74 public class HgLogCommand extends HgAbstractCommand<HgLogCommand> {
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	75
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	76 private final HgRepository repo;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	77 private Set<String> users;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	78 private Set<String> branches;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	79 private int limit = 0, count = 0;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	80 private int startRev = 0, endRev = TIP;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	81 private Calendar date;
77 c677e1593919 Moved RevlogStream implementation into .internal Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 74 diff changeset	82 private Path file;
514 5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	83 /*
5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	84 * Whether to iterate file origins, if any.
5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	85 * Makes sense only when file != null
5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	86 */
5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	87 private boolean followRenames;
5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	88 /*
5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	89 * Whether to track history of the selected file version (based on file revision
5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	90 * in working dir parent), follow ancestors only.
5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	91 * Note, 'hg log --follow' combines both #followHistory and #followAncestry
5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	92 */
5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	93 private boolean followAncestry;
522 2103388d4010 Expose option to report changesets in reversed order Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 520 diff changeset	94
2103388d4010 Expose option to report changesets in reversed order Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 520 diff changeset	95 private HgIterateDirection iterateDirection = HgIterateDirection.OldToNew;
2103388d4010 Expose option to report changesets in reversed order Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 520 diff changeset	96
193 37f3d4a596e4 Use common low to hi-level changeset api transformer Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 157 diff changeset	97 private ChangesetTransformer csetTransform;
432 1fc0da631200 Revlog.ParentWalker helper class got promoted as TLC, renamed to HgParentChildMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 431 diff changeset	98 private HgParentChildMap<HgChangelog> parentHelper;
80 4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	99
131 aa1629f36482 Renamed .core classes to start with Hg prefix Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 129 diff changeset	100 public HgLogCommand(HgRepository hgRepo) {
107 7ec89d637f50 CatCommand Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	101 repo = hgRepo;
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	102 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	103
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	104 /**
148 1a7a9a20e1f9 Exceptions, javadoc. Initial cancel and progress support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 142 diff changeset	105 * Limit search to specified user. Multiple user names may be specified. Once set, user names can't be
1a7a9a20e1f9 Exceptions, javadoc. Initial cancel and progress support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 142 diff changeset	106 * cleared, use new command instance in such cases.
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	107 * @param user - full or partial name of the user, case-insensitive, non-null.
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	108 * @return <code>this</code> instance for convenience
148 1a7a9a20e1f9 Exceptions, javadoc. Initial cancel and progress support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 142 diff changeset	109 * @throws IllegalArgumentException when argument is null
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	110 */
131 aa1629f36482 Renamed .core classes to start with Hg prefix Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 129 diff changeset	111 public HgLogCommand user(String user) {
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	112 if (user == null) {
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	113 throw new IllegalArgumentException();
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	114 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	115 if (users == null) {
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	116 users = new TreeSet<String>();
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	117 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	118 users.add(user.toLowerCase());
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	119 return this;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	120 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	121
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	122 /**
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	123 * Limit search to specified branch. Multiple branch specification possible (changeset from any of these
148 1a7a9a20e1f9 Exceptions, javadoc. Initial cancel and progress support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 142 diff changeset	124 * would be included in result). If unspecified, all branches are considered. There's no way to clean branch selection
1a7a9a20e1f9 Exceptions, javadoc. Initial cancel and progress support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 142 diff changeset	125 * once set, create fresh new command instead.
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	126 * @param branch - branch name, case-sensitive, non-null.
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	127 * @return <code>this</code> instance for convenience
148 1a7a9a20e1f9 Exceptions, javadoc. Initial cancel and progress support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 142 diff changeset	128 * @throws IllegalArgumentException when branch argument is null
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	129 */
131 aa1629f36482 Renamed .core classes to start with Hg prefix Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 129 diff changeset	130 public HgLogCommand branch(String branch) {
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	131 if (branch == null) {
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	132 throw new IllegalArgumentException();
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	133 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	134 if (branches == null) {
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	135 branches = new TreeSet<String>();
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	136 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	137 branches.add(branch);
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	138 return this;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	139 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	140
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	141 // limit search to specific date
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	142 // multiple?
131 aa1629f36482 Renamed .core classes to start with Hg prefix Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 129 diff changeset	143 public HgLogCommand date(Calendar date) {
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	144 this.date = date;
418 528b6780a8bd A bit of FIXME cleanup (mostly degraded to TODO post 1.0), comments and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 415 diff changeset	145 // TODO post-1.0 implement
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	146 // isSet(field) - false => don't use in detection of 'same date'
526 2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 522 diff changeset	147 throw Internals.notImplemented();
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	148 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	149
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	150 /**
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	151 *
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	152 * @param num - number of changeset to produce. Pass 0 to clear the limit.
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	153 * @return <code>this</code> instance for convenience
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	154 */
131 aa1629f36482 Renamed .core classes to start with Hg prefix Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 129 diff changeset	155 public HgLogCommand limit(int num) {
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	156 limit = num;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	157 return this;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	158 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	159
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	160 /**
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	161 * Limit to specified subset of Changelog, [min(rev1,rev2), max(rev1,rev2)], inclusive.
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	162 * Revision may be specified with {@link HgRepository#TIP}
427 31a89587eb04 FIXMEs: consistent names, throws for commands and their handlers. Use of checked exceptions in hi-level api Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	163 *
31a89587eb04 FIXMEs: consistent names, throws for commands and their handlers. Use of checked exceptions in hi-level api Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	164 * @param rev1 - local index of start changeset revision
31a89587eb04 FIXMEs: consistent names, throws for commands and their handlers. Use of checked exceptions in hi-level api Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	165 * @param rev2 - index of end changeset revision
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	166 * @return <code>this</code> instance for convenience
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	167 */
131 aa1629f36482 Renamed .core classes to start with Hg prefix Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 129 diff changeset	168 public HgLogCommand range(int rev1, int rev2) {
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	169 if (rev1 != TIP && rev2 != TIP) {
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	170 startRev = rev2 < rev1 ? rev2 : rev1;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	171 endRev = startRev == rev2 ? rev1 : rev2;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	172 } else if (rev1 == TIP && rev2 != TIP) {
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	173 startRev = rev2;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	174 endRev = rev1;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	175 } else {
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	176 startRev = rev1;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	177 endRev = rev2;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	178 }
565 78a9e26e670d Refactor common code to initialize changelog revision for a command into standalone class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 559 diff changeset	179 // TODO [2.0 API break] shall throw HgBadArgumentException, like other commands do
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	180 return this;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	181 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	182
77 c677e1593919 Moved RevlogStream implementation into .internal Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 74 diff changeset	183 /**
253 1874d11054e5 HgLogCommand.changeset(Nodeid) to ease command configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 250 diff changeset	184 * Select specific changeset
1874d11054e5 HgLogCommand.changeset(Nodeid) to ease command configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 250 diff changeset	185 *
1874d11054e5 HgLogCommand.changeset(Nodeid) to ease command configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 250 diff changeset	186 * @param nid changeset revision
1874d11054e5 HgLogCommand.changeset(Nodeid) to ease command configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 250 diff changeset	187 * @return <code>this</code> for convenience
427 31a89587eb04 FIXMEs: consistent names, throws for commands and their handlers. Use of checked exceptions in hi-level api Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	188 * @throws HgBadArgumentException if failed to find supplied changeset revision
253 1874d11054e5 HgLogCommand.changeset(Nodeid) to ease command configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 250 diff changeset	189 */
427 31a89587eb04 FIXMEs: consistent names, throws for commands and their handlers. Use of checked exceptions in hi-level api Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	190 public HgLogCommand changeset(Nodeid nid) throws HgBadArgumentException {
253 1874d11054e5 HgLogCommand.changeset(Nodeid) to ease command configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 250 diff changeset	191 // XXX perhaps, shall support multiple (...) arguments and extend #execute to handle not only range, but also set of revisions.
565 78a9e26e670d Refactor common code to initialize changelog revision for a command into standalone class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 559 diff changeset	192 final int csetRevIndex = new CsetParamKeeper(repo).set(nid).get();
78a9e26e670d Refactor common code to initialize changelog revision for a command into standalone class Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 559 diff changeset	193 return range(csetRevIndex, csetRevIndex);
253 1874d11054e5 HgLogCommand.changeset(Nodeid) to ease command configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 250 diff changeset	194 }
1874d11054e5 HgLogCommand.changeset(Nodeid) to ease command configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 250 diff changeset	195
1874d11054e5 HgLogCommand.changeset(Nodeid) to ease command configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 250 diff changeset	196 /**
516 0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	197 * Visit history of a given file only. Note, unlike native <code>hg log</code> command argument <code>--follow</code>, this method doesn't
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	198 * follow file ancestry, but reports complete file history (with <code>followCopyRenames == true</code>, for each
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	199 * name of the file known in sequence). To achieve output similar to that of <code>hg log --follow filePath</code>, use
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	200 * {@link #file(Path, boolean, boolean) file(filePath, true, true)} alternative.
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	201 *
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	202 * @param filePath path relative to repository root. Pass <code>null</code> to reset.
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	203 * @param followCopyRename true to report changesets of the original file(-s), if copy/rename ever occured to the file.
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	204 * @return <code>this</code> for convenience
77 c677e1593919 Moved RevlogStream implementation into .internal Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 74 diff changeset	205 */
516 0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	206 public HgLogCommand file(Path filePath, boolean followCopyRename) {
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	207 return file(filePath, followCopyRename, false);
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	208 }
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	209
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	210 /**
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	211 * Full control over file history iteration.
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	212 *
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	213 * @param filePath path relative to repository root. Pass <code>null</code> to reset.
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	214 * @param followCopyRename true to report changesets of the original file(-s), if copy/rename ever occured to the file.
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	215 * @param followFileAncestry true to follow file history starting from revision at working copy parent. Note, only revisions
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	216 * accessible (i.e. on direct parent line) from the selected one will be reported. This is how <code>hg log --follow filePath</code>
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	217 * behaves, with the difference that this method allows separate control whether to follow renames or not.
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	218 *
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	219 * @return <code>this</code> for convenience
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	220 */
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	221 public HgLogCommand file(Path filePath, boolean followCopyRename, boolean followFileAncestry) {
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	222 file = filePath;
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	223 followRenames = followCopyRename;
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	224 followAncestry = followFileAncestry;
77 c677e1593919 Moved RevlogStream implementation into .internal Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 74 diff changeset	225 return this;
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	226 }
142 37a34044e6bd More reasonable use of path normalizer and path.source Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	227
37a34044e6bd More reasonable use of path normalizer and path.source Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	228 /**
516 0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	229 * Handy analog to {@link #file(Path, boolean)} when clients' paths come from filesystem and need conversion to repository's
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	230 * @return <code>this</code> for convenience
142 37a34044e6bd More reasonable use of path normalizer and path.source Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	231 */
37a34044e6bd More reasonable use of path normalizer and path.source Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	232 public HgLogCommand file(String file, boolean followCopyRename) {
571 e4ee4bf4c7d0 Let session context control creation of Path instances Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 565 diff changeset	233 Path.Source ps = repo.getSessionContext().getPathFactory();
e4ee4bf4c7d0 Let session context control creation of Path instances Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 565 diff changeset	234 return file(ps.path(repo.getToRepoPathHelper().rewrite(file)), followCopyRename);
142 37a34044e6bd More reasonable use of path normalizer and path.source Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	235 }
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	236
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	237 /**
516 0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	238 * Handy analog to {@link #file(Path, boolean, boolean)} when clients' paths come from filesystem and need conversion to repository's
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	239 * @return <code>this</code> for convenience
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	240 */
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	241 public HgLogCommand file(String file, boolean followCopyRename, boolean followFileAncestry) {
571 e4ee4bf4c7d0 Let session context control creation of Path instances Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 565 diff changeset	242 Path.Source ps = repo.getSessionContext().getPathFactory();
e4ee4bf4c7d0 Let session context control creation of Path instances Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 565 diff changeset	243 return file(ps.path(repo.getToRepoPathHelper().rewrite(file)), followCopyRename, followFileAncestry);
516 0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	244 }
522 2103388d4010 Expose option to report changesets in reversed order Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 520 diff changeset	245
2103388d4010 Expose option to report changesets in reversed order Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 520 diff changeset	246 /**
2103388d4010 Expose option to report changesets in reversed order Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 520 diff changeset	247 * Specifies order for changesets reported through #execute(...) methods.
2103388d4010 Expose option to report changesets in reversed order Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 520 diff changeset	248 * By default, command reports changeset in their natural repository order, older first,
2103388d4010 Expose option to report changesets in reversed order Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 520 diff changeset	249 * newer last (i.e. {@link HgIterateDirection#OldToNew}
2103388d4010 Expose option to report changesets in reversed order Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 520 diff changeset	250 *
2103388d4010 Expose option to report changesets in reversed order Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 520 diff changeset	251 * @param order {@link HgIterateDirection#NewToOld} to get newer revisions first
2103388d4010 Expose option to report changesets in reversed order Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 520 diff changeset	252 * @return <code>this</code> for convenience
2103388d4010 Expose option to report changesets in reversed order Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 520 diff changeset	253 */
2103388d4010 Expose option to report changesets in reversed order Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 520 diff changeset	254 public HgLogCommand order(HgIterateDirection order) {
2103388d4010 Expose option to report changesets in reversed order Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 520 diff changeset	255 iterateDirection = order;
2103388d4010 Expose option to report changesets in reversed order Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 520 diff changeset	256 return this;
2103388d4010 Expose option to report changesets in reversed order Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 520 diff changeset	257 }
516 0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	258
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	259 /**
419 7f136a3fa671 Clean javadoc to fix obvious warnings Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 418 diff changeset	260 * Similar to {@link #execute(HgChangesetHandler)}, collects and return result as a list.
427 31a89587eb04 FIXMEs: consistent names, throws for commands and their handlers. Use of checked exceptions in hi-level api Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	261 *
31a89587eb04 FIXMEs: consistent names, throws for commands and their handlers. Use of checked exceptions in hi-level api Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	262 * @see #execute(HgChangesetHandler)
31a89587eb04 FIXMEs: consistent names, throws for commands and their handlers. Use of checked exceptions in hi-level api Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	263 * @throws HgException subclass thereof to indicate specific issue with the command arguments or repository state
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	264 */
396 0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	265 public List<HgChangeset> execute() throws HgException {
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	266 CollectHandler collector = new CollectHandler();
215 41a778e3fd31 Issue 5: Facilities for progress and cancellation. More specific exceptions. Exceptions from callbacks as RuntimeException Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 205 diff changeset	267 try {
41a778e3fd31 Issue 5: Facilities for progress and cancellation. More specific exceptions. Exceptions from callbacks as RuntimeException Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 205 diff changeset	268 execute(collector);
423 9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 419 diff changeset	269 } catch (HgCallbackTargetException ex) {
9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 419 diff changeset	270 // see below for CanceledException
9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 419 diff changeset	271 HgInvalidStateException t = new HgInvalidStateException("Internal error");
9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 419 diff changeset	272 t.initCause(ex);
9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 419 diff changeset	273 throw t;
396 0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	274 } catch (CancelledException ex) {
215 41a778e3fd31 Issue 5: Facilities for progress and cancellation. More specific exceptions. Exceptions from callbacks as RuntimeException Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 205 diff changeset	275 // can't happen as long as our CollectHandler doesn't throw any exception
423 9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 419 diff changeset	276 HgInvalidStateException t = new HgInvalidStateException("Internal error");
9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 419 diff changeset	277 t.initCause(ex);
9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 419 diff changeset	278 throw t;
215 41a778e3fd31 Issue 5: Facilities for progress and cancellation. More specific exceptions. Exceptions from callbacks as RuntimeException Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 205 diff changeset	279 }
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	280 return collector.getChanges();
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	281 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	282
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	283 /**
402 1fcc7f7b6d65 FIXMEs/javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	284 * Iterate over range of changesets configured in the command.
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	285 *
205 ffc5f6d59f7e HgLogCommand.Handler is used in few places, pull up to top-level class, HgChangesetHandler Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	286 * @param handler callback to process changesets.
427 31a89587eb04 FIXMEs: consistent names, throws for commands and their handlers. Use of checked exceptions in hi-level api Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	287 * @throws HgCallbackTargetException propagated exception from the handler
31a89587eb04 FIXMEs: consistent names, throws for commands and their handlers. Use of checked exceptions in hi-level api Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	288 * @throws HgException subclass thereof to indicate specific issue with the command arguments or repository state
380 9517df1ef7ec Comments/javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 370 diff changeset	289 * @throws CancelledException if execution of the command was cancelled
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	290 * @throws IllegalArgumentException when inspector argument is null
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	291 * @throws ConcurrentModificationException if this log command instance is already running
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	292 */
370 a2341e761609 Let callback implementations deliver errors (e,g. own exceptions) to client code Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 368 diff changeset	293 public void execute(HgChangesetHandler handler) throws HgCallbackTargetException, HgException, CancelledException {
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	294 if (handler == null) {
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	295 throw new IllegalArgumentException();
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	296 }
193 37f3d4a596e4 Use common low to hi-level changeset api transformer Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 157 diff changeset	297 if (csetTransform != null) {
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	298 throw new ConcurrentModificationException();
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	299 }
559 6ca3d0c5b4bc Commit: tests and fixes for defects discovered Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 528 diff changeset	300 if (repo.getChangelog().getRevisionCount() == 0) {
6ca3d0c5b4bc Commit: tests and fixes for defects discovered Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 528 diff changeset	301 return;
6ca3d0c5b4bc Commit: tests and fixes for defects discovered Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 528 diff changeset	302 }
518 0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	303 final int lastCset = endRev == TIP ? repo.getChangelog().getLastRevision() : endRev;
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	304 // XXX pretty much like HgInternals.checkRevlogRange
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	305 if (lastCset < 0 \|\| lastCset > repo.getChangelog().getLastRevision()) {
559 6ca3d0c5b4bc Commit: tests and fixes for defects discovered Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 528 diff changeset	306 throw new HgBadArgumentException(String.format("Bad value %d for end revision", lastCset), null);
518 0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	307 }
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	308 if (startRev < 0 \|\| startRev > lastCset) {
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	309 throw new HgBadArgumentException(String.format("Bad value %d for start revision for range [%1$d..%d]", startRev, lastCset), null);
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	310 }
215 41a778e3fd31 Issue 5: Facilities for progress and cancellation. More specific exceptions. Exceptions from callbacks as RuntimeException Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 205 diff changeset	311 final ProgressSupport progressHelper = getProgressSupport(handler);
520 1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	312 final int BATCH_SIZE = 100;
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	313 try {
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	314 count = 0;
432 1fc0da631200 Revlog.ParentWalker helper class got promoted as TLC, renamed to HgParentChildMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 431 diff changeset	315 HgParentChildMap<HgChangelog> pw = getParentHelper(file == null); // leave it uninitialized unless we iterate whole repo
193 37f3d4a596e4 Use common low to hi-level changeset api transformer Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 157 diff changeset	316 // ChangesetTransfrom creates a blank PathPool, and #file(String, boolean) above
37f3d4a596e4 Use common low to hi-level changeset api transformer Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 157 diff changeset	317 // may utilize it as well. CommandContext? How about StatusCollector there as well?
322 d68dcb3b5f49 Propagate command's CancelSupport to low-level API. CancelSupport from context got priority over one from command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 316 diff changeset	318 csetTransform = new ChangesetTransformer(repo, handler, pw, progressHelper, getCancelSupport(handler, true));
520 1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	319 // FilteringInspector is responsible to check command arguments: users, branches, limit, etc.
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	320 // prior to passing cset to next Inspector, which is either (a) collector to reverse cset order, then invokes
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	321 // transformer from (b), below, with alternative cset order or (b) transformer to hi-level csets.
518 0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	322 FilteringInspector filterInsp = new FilteringInspector();
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	323 filterInsp.changesets(startRev, lastCset);
77 c677e1593919 Moved RevlogStream implementation into .internal Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 74 diff changeset	324 if (file == null) {
520 1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	325 progressHelper.start(lastCset - startRev + 1);
522 2103388d4010 Expose option to report changesets in reversed order Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 520 diff changeset	326 if (iterateDirection == HgIterateDirection.OldToNew) {
520 1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	327 filterInsp.delegateTo(csetTransform);
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	328 repo.getChangelog().range(startRev, lastCset, filterInsp);
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	329 csetTransform.checkFailure();
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	330 } else {
522 2103388d4010 Expose option to report changesets in reversed order Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 520 diff changeset	331 assert iterateDirection == HgIterateDirection.NewToOld;
520 1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	332 BatchRangeHelper brh = new BatchRangeHelper(startRev, lastCset, BATCH_SIZE, true);
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	333 BatchChangesetInspector batchInspector = new BatchChangesetInspector(Math.min(lastCset-startRev+1, BATCH_SIZE));
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	334 filterInsp.delegateTo(batchInspector);
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	335 while (brh.hasNext()) {
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	336 brh.next();
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	337 repo.getChangelog().range(brh.start(), brh.end(), filterInsp);
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	338 for (BatchChangesetInspector.BatchRecord br : batchInspector.iterate(true)) {
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	339 csetTransform.next(br.csetIndex, br.csetRevision, br.cset);
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	340 csetTransform.checkFailure();
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	341 }
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	342 batchInspector.reset();
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	343 }
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	344 }
77 c677e1593919 Moved RevlogStream implementation into .internal Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 74 diff changeset	345 } else {
520 1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	346 filterInsp.delegateTo(csetTransform);
514 5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	347 final HgFileRenameHandlerMixin withCopyHandler = Adaptable.Factory.getAdapter(handler, HgFileRenameHandlerMixin.class, null);
528 f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	348 FileRenameQueueBuilder frqBuilder = new FileRenameQueueBuilder();
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	349 List<Pair<HgDataFile, Nodeid>> fileRenames = frqBuilder.buildFileRenamesQueue();
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	350 progressHelper.start(fileRenames.size());
518 0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	351 for (int nameIndex = 0, fileRenamesSize = fileRenames.size(); nameIndex < fileRenamesSize; nameIndex++) {
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	352 Pair<HgDataFile, Nodeid> curRename = fileRenames.get(nameIndex);
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	353 HgDataFile fileNode = curRename.first();
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	354 if (followAncestry) {
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	355 TreeBuildInspector treeBuilder = new TreeBuildInspector(followAncestry);
520 1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	356 @SuppressWarnings("unused")
518 0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	357 List<HistoryNode> fileAncestry = treeBuilder.go(fileNode, curRename.second());
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	358 int[] commitRevisions = narrowChangesetRange(treeBuilder.getCommitRevisions(), startRev, lastCset);
522 2103388d4010 Expose option to report changesets in reversed order Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 520 diff changeset	359 if (iterateDirection == HgIterateDirection.OldToNew) {
518 0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	360 repo.getChangelog().range(filterInsp, commitRevisions);
520 1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	361 csetTransform.checkFailure();
518 0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	362 } else {
522 2103388d4010 Expose option to report changesets in reversed order Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 520 diff changeset	363 assert iterateDirection == HgIterateDirection.NewToOld;
518 0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	364 // visit one by one in the opposite direction
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	365 for (int i = commitRevisions.length-1; i >= 0; i--) {
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	366 int csetWithFileChange = commitRevisions[i];
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	367 repo.getChangelog().range(csetWithFileChange, csetWithFileChange, filterInsp);
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	368 }
126 b92a638764be Dispatch chnagesets even if Handler is not FileHistoryHandler Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 107 diff changeset	369 }
518 0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	370 } else {
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	371 // report complete file history (XXX may narrow range with [startRev, endRev], but need to go from file rev to link rev)
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	372 int fileStartRev = 0; //fileNode.getChangesetRevisionIndex(0) >= startRev
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	373 int fileEndRev = fileNode.getLastRevision();
522 2103388d4010 Expose option to report changesets in reversed order Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 520 diff changeset	374 if (iterateDirection == HgIterateDirection.OldToNew) {
520 1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	375 fileNode.history(fileStartRev, fileEndRev, filterInsp);
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	376 csetTransform.checkFailure();
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	377 } else {
522 2103388d4010 Expose option to report changesets in reversed order Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 520 diff changeset	378 assert iterateDirection == HgIterateDirection.NewToOld;
520 1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	379 BatchRangeHelper brh = new BatchRangeHelper(fileStartRev, fileEndRev, BATCH_SIZE, true);
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	380 BatchChangesetInspector batchInspector = new BatchChangesetInspector(Math.min(fileEndRev-fileStartRev+1, BATCH_SIZE));
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	381 filterInsp.delegateTo(batchInspector);
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	382 while (brh.hasNext()) {
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	383 brh.next();
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	384 fileNode.history(brh.start(), brh.end(), filterInsp);
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	385 for (BatchChangesetInspector.BatchRecord br : batchInspector.iterate(true /iterateDirection == IterateDirection.FromNewToOld/)) {
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	386 csetTransform.next(br.csetIndex, br.csetRevision, br.cset);
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	387 csetTransform.checkFailure();
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	388 }
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	389 batchInspector.reset();
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	390 }
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	391 }
518 0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	392 }
528 f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	393 if (withCopyHandler != null && nameIndex + 1 < fileRenamesSize) {
518 0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	394 Pair<HgDataFile, Nodeid> nextRename = fileRenames.get(nameIndex+1);
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	395 HgFileRevision src, dst;
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	396 // A -> B
522 2103388d4010 Expose option to report changesets in reversed order Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 520 diff changeset	397 if (iterateDirection == HgIterateDirection.OldToNew) {
518 0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	398 // curRename: A, nextRename: B
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	399 src = new HgFileRevision(fileNode, curRename.second(), null);
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	400 dst = new HgFileRevision(nextRename.first(), nextRename.first().getRevision(0), src.getPath());
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	401 } else {
522 2103388d4010 Expose option to report changesets in reversed order Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 520 diff changeset	402 assert iterateDirection == HgIterateDirection.NewToOld;
518 0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	403 // curRename: B, nextRename: A
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	404 src = new HgFileRevision(nextRename.first(), nextRename.second(), null);
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	405 dst = new HgFileRevision(fileNode, fileNode.getRevision(0), src.getPath());
80 4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	406 }
518 0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	407 withCopyHandler.copy(src, dst);
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	408 }
528 f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	409 progressHelper.worked(1);
518 0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	410 } // for renames
528 f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	411 frqBuilder.reportRenameIfNotInQueue(fileRenames, withCopyHandler);
518 0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	412 } // file != null
427 31a89587eb04 FIXMEs: consistent names, throws for commands and their handlers. Use of checked exceptions in hi-level api Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	413 } catch (HgRuntimeException ex) {
31a89587eb04 FIXMEs: consistent names, throws for commands and their handlers. Use of checked exceptions in hi-level api Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	414 throw new HgLibraryFailureException(ex);
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	415 } finally {
193 37f3d4a596e4 Use common low to hi-level changeset api transformer Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 157 diff changeset	416 csetTransform = null;
215 41a778e3fd31 Issue 5: Facilities for progress and cancellation. More specific exceptions. Exceptions from callbacks as RuntimeException Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 205 diff changeset	417 progressHelper.done();
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	418 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	419 }
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	420
520 1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	421 private static class BatchChangesetInspector extends AdapterPlug implements HgChangelog.Inspector {
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	422 private static class BatchRecord {
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	423 public final int csetIndex;
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	424 public final Nodeid csetRevision;
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	425 public final RawChangeset cset;
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	426
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	427 public BatchRecord(int index, Nodeid nodeid, RawChangeset changeset) {
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	428 csetIndex = index;
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	429 csetRevision = nodeid;
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	430 cset = changeset;
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	431 }
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	432 }
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	433 private final ArrayList<BatchRecord> batch;
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	434
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	435 public BatchChangesetInspector(int batchSizeHint) {
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	436 batch = new ArrayList<BatchRecord>(batchSizeHint);
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	437 }
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	438
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	439 public BatchChangesetInspector reset() {
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	440 batch.clear();
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	441 return this;
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	442 }
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	443
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	444 public void next(int revisionIndex, Nodeid nodeid, RawChangeset cset) {
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	445 batch.add(new BatchRecord(revisionIndex, nodeid, cset.clone()));
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	446 }
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	447
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	448 public Iterable<BatchRecord> iterate(final boolean reverse) {
596 43cfa08ff3fd HgBlameFacility refactoring: extract code to build file history that spans renames Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 571 diff changeset	449 return reverse ? ReverseIterator.reversed(batch) : batch;
520 1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	450 }
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	451
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	452 // alternative would be dispatch(HgChangelog.Inspector) and dispatchReverse()
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	453 // methods, but progress and cancellation might get messy then
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	454 }
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	455
518 0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	456 // public static void main(String[] args) {
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	457 // int[] r = new int[] {17, 19, 21, 23, 25, 29};
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	458 // System.out.println(Arrays.toString(narrowChangesetRange(r, 0, 45)));
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	459 // System.out.println(Arrays.toString(narrowChangesetRange(r, 0, 25)));
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	460 // System.out.println(Arrays.toString(narrowChangesetRange(r, 5, 26)));
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	461 // System.out.println(Arrays.toString(narrowChangesetRange(r, 20, 26)));
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	462 // System.out.println(Arrays.toString(narrowChangesetRange(r, 26, 28)));
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	463 // }
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	464
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	465 private static int[] narrowChangesetRange(int[] csetRange, int startCset, int endCset) {
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	466 int lastInRange = csetRange[csetRange.length-1];
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	467 assert csetRange.length < 2 \|\| csetRange[0] < lastInRange; // sorted
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	468 assert startCset >= 0 && startCset <= endCset;
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	469 if (csetRange[0] >= startCset && lastInRange <= endCset) {
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	470 // completely fits in
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	471 return csetRange;
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	472 }
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	473 if (csetRange[0] > endCset \|\| lastInRange < startCset) {
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	474 return new int[0]; // trivial
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	475 }
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	476 int i = 0;
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	477 while (i < csetRange.length && csetRange[i] < startCset) {
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	478 i++;
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	479 }
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	480 int j = csetRange.length - 1;
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	481 while (j > i && csetRange[j] > endCset) {
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	482 j--;
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	483 }
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	484 if (i == j) {
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	485 // no values in csetRange fit into [startCset, endCset]
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	486 return new int[0];
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	487 }
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	488 int[] rv = new int[j-i+1];
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	489 System.arraycopy(csetRange, i, rv, 0, rv.length);
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	490 return rv;
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	491 }
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	492
370 a2341e761609 Let callback implementations deliver errors (e,g. own exceptions) to client code Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 368 diff changeset	493 /**
515 e6c8b9b654b2 Provide access to HgDataFile being iterated into HgChangesetTreeHandler.TreeElement to give context for renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 514 diff changeset	494 * Tree-wise iteration of a file history, with handy access to parent-child relations between changesets.
e6c8b9b654b2 Provide access to HgDataFile being iterated into HgChangesetTreeHandler.TreeElement to give context for renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 514 diff changeset	495 * When file history is being followed, handler may additionally implement {@link HgFileRenameHandlerMixin}
e6c8b9b654b2 Provide access to HgDataFile being iterated into HgChangesetTreeHandler.TreeElement to give context for renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 514 diff changeset	496 * to get notified about switching between history chunks that belong to different names.
402 1fcc7f7b6d65 FIXMEs/javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	497 *
1fcc7f7b6d65 FIXMEs/javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	498 * @param handler callback to process changesets.
515 e6c8b9b654b2 Provide access to HgDataFile being iterated into HgChangesetTreeHandler.TreeElement to give context for renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 514 diff changeset	499 * @see HgFileRenameHandlerMixin
427 31a89587eb04 FIXMEs: consistent names, throws for commands and their handlers. Use of checked exceptions in hi-level api Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	500 * @throws HgCallbackTargetException propagated exception from the handler
31a89587eb04 FIXMEs: consistent names, throws for commands and their handlers. Use of checked exceptions in hi-level api Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	501 * @throws HgException subclass thereof to indicate specific issue with the command arguments or repository state
380 9517df1ef7ec Comments/javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 370 diff changeset	502 * @throws CancelledException if execution of the command was cancelled
402 1fcc7f7b6d65 FIXMEs/javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	503 * @throws IllegalArgumentException if command is not satisfied with its arguments
1fcc7f7b6d65 FIXMEs/javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	504 * @throws ConcurrentModificationException if this log command instance is already running
370 a2341e761609 Let callback implementations deliver errors (e,g. own exceptions) to client code Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 368 diff changeset	505 */
515 e6c8b9b654b2 Provide access to HgDataFile being iterated into HgChangesetTreeHandler.TreeElement to give context for renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 514 diff changeset	506 public void execute(final HgChangesetTreeHandler handler) throws HgCallbackTargetException, HgException, CancelledException {
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	507 if (handler == null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	508 throw new IllegalArgumentException();
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	509 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	510 if (csetTransform != null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	511 throw new ConcurrentModificationException();
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	512 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	513 if (file == null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	514 throw new IllegalArgumentException("History tree is supported for files only (at least now), please specify file");
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	515 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	516 final ProgressSupport progressHelper = getProgressSupport(handler);
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	517 final CancelSupport cancelHelper = getCancelSupport(handler, true);
514 5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	518 final HgFileRenameHandlerMixin renameHandler = Adaptable.Factory.getAdapter(handler, HgFileRenameHandlerMixin.class, null);
507 a6435c1a42d0 Test for HgChangesetTreeHandler - make sure nothing is broken prior to adding --follow support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	519
509 a30e74dca193 Establish parent-child between first and last elements of history chunks for two renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 508 diff changeset	520
517 9922d1f7cb2a Update test to use new command configuration argument (used to have followAncestry == true by default) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 516 diff changeset	521 // XXX rename. dispatcher is not a proper name (most of the job done - managing history chunk interconnection)
516 0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	522 final HandlerDispatcher dispatcher = new HandlerDispatcher() {
515 e6c8b9b654b2 Provide access to HgDataFile being iterated into HgChangesetTreeHandler.TreeElement to give context for renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 514 diff changeset	523
516 0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	524 @Override
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	525 protected void once(HistoryNode n) throws HgCallbackTargetException, CancelledException {
515 e6c8b9b654b2 Provide access to HgDataFile being iterated into HgChangesetTreeHandler.TreeElement to give context for renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 514 diff changeset	526 handler.treeElement(ei.init(n, currentFileNode));
e6c8b9b654b2 Provide access to HgDataFile being iterated into HgChangesetTreeHandler.TreeElement to give context for renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 514 diff changeset	527 cancelHelper.checkCancelled();
e6c8b9b654b2 Provide access to HgDataFile being iterated into HgChangesetTreeHandler.TreeElement to give context for renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 514 diff changeset	528 }
e6c8b9b654b2 Provide access to HgDataFile being iterated into HgChangesetTreeHandler.TreeElement to give context for renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 514 diff changeset	529 };
508 ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	530
510 90093ee56c0d Full-fledged test repo to follow file history. Investigating iteration direction alternatives (from new to old in addition to existing old to new) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 509 diff changeset	531 // renamed files in the queue are placed with respect to #iterateDirection
90093ee56c0d Full-fledged test repo to follow file history. Investigating iteration direction alternatives (from new to old in addition to existing old to new) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 509 diff changeset	532 // i.e. if we iterate from new to old, recent filenames come first
528 f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	533 FileRenameQueueBuilder frqBuilder = new FileRenameQueueBuilder();
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	534 List<Pair<HgDataFile, Nodeid>> fileRenamesQueue = frqBuilder.buildFileRenamesQueue();
517 9922d1f7cb2a Update test to use new command configuration argument (used to have followAncestry == true by default) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 516 diff changeset	535 // XXX perhaps, makes sense to look at selected file's revision when followAncestry is true
9922d1f7cb2a Update test to use new command configuration argument (used to have followAncestry == true by default) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 516 diff changeset	536 // to ensure file we attempt to trace is in the WC's parent. Native hg aborts if not.
507 a6435c1a42d0 Test for HgChangesetTreeHandler - make sure nothing is broken prior to adding --follow support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	537 progressHelper.start(4 * fileRenamesQueue.size());
514 5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	538 for (int namesIndex = 0, renamesQueueSize = fileRenamesQueue.size(); namesIndex < renamesQueueSize; namesIndex++) {
510 90093ee56c0d Full-fledged test repo to follow file history. Investigating iteration direction alternatives (from new to old in addition to existing old to new) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 509 diff changeset	539
514 5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	540 final Pair<HgDataFile, Nodeid> renameInfo = fileRenamesQueue.get(namesIndex);
516 0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	541 dispatcher.prepare(progressHelper, renameInfo);
423 9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 419 diff changeset	542 cancelHelper.checkCancelled();
516 0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	543 if (namesIndex > 0) {
528 f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	544 dispatcher.connectWithLastJunctionPoint(renameInfo, fileRenamesQueue.get(namesIndex - 1));
509 a30e74dca193 Establish parent-child between first and last elements of history chunks for two renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 508 diff changeset	545 }
514 5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	546 if (namesIndex + 1 < renamesQueueSize) {
516 0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	547 // there's at least one more name we are going to look at
528 f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	548 dispatcher.updateJunctionPoint(renameInfo, fileRenamesQueue.get(namesIndex+1), renameHandler != null);
509 a30e74dca193 Establish parent-child between first and last elements of history chunks for two renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 508 diff changeset	549 } else {
516 0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	550 dispatcher.clearJunctionPoint();
509 a30e74dca193 Establish parent-child between first and last elements of history chunks for two renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 508 diff changeset	551 }
516 0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	552 dispatcher.dispatchAllChanges();
528 f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	553 if (renameHandler != null && namesIndex + 1 < renamesQueueSize) {
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	554 dispatcher.reportRenames(renameHandler);
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	555 }
514 5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	556 } // for fileRenamesQueue;
528 f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	557 frqBuilder.reportRenameIfNotInQueue(fileRenamesQueue, renameHandler);
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	558 progressHelper.done();
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	559 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	560
507 a6435c1a42d0 Test for HgChangesetTreeHandler - make sure nothing is broken prior to adding --follow support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	561 /**
528 f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	562 * Utility to build sequence of file renames
507 a6435c1a42d0 Test for HgChangesetTreeHandler - make sure nothing is broken prior to adding --follow support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	563 */
528 f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	564 private class FileRenameQueueBuilder {
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	565
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	566 /**
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	567 * Follows file renames and build a list of all corresponding file nodes and revisions they were
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	568 * copied/renamed/branched at (IOW, their latest revision to look at).
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	569 *
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	570 * @param followRename when <code>false</code>, the list contains one element only,
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	571 * file node with the name of the file as it was specified by the user.
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	572 *
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	573 * @param followAncestry the most recent file revision reported depends on this parameter,
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	574 * and it is file revision from working copy parent in there when it's true.
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	575 * <code>null</code> as Pair's second indicates file's TIP revision shall be used.
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	576 *
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	577 * TODO may use HgFileRevision (after some refactoring to accept HgDataFile and Nodeid) instead of Pair
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	578 * and possibly reuse this functionality
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	579 *
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	580 * @return list of file renames, ordered with respect to {@link #iterateDirection}
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	581 */
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	582 public List<Pair<HgDataFile, Nodeid>> buildFileRenamesQueue() throws HgPathNotFoundException {
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	583 LinkedList<Pair<HgDataFile, Nodeid>> rv = new LinkedList<Pair<HgDataFile, Nodeid>>();
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	584 Nodeid startRev = null;
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	585 HgDataFile fileNode = repo.getFileNode(file);
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	586 if (!fileNode.exists()) {
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	587 throw new HgPathNotFoundException(String.format("File %s not found in the repository", file), file);
514 5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	588 }
528 f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	589 if (followAncestry) {
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	590 // TODO subject to dedicated method either in HgRepository (getWorkingCopyParentRevisionIndex)
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	591 // or in the HgDataFile (getWorkingCopyOriginRevision)
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	592 Nodeid wdParentChangeset = repo.getWorkingCopyParents().first();
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	593 if (!wdParentChangeset.isNull()) {
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	594 int wdParentRevIndex = repo.getChangelog().getRevisionIndex(wdParentChangeset);
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	595 startRev = repo.getManifest().getFileRevision(wdParentRevIndex, fileNode.getPath());
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	596 }
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	597 // else fall-through, assume null (eventually, lastRevision()) is ok here
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	598 }
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	599 Pair<HgDataFile, Nodeid> p = new Pair<HgDataFile, Nodeid>(fileNode, startRev);
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	600 rv.add(p);
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	601 if (!followRenames) {
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	602 return rv;
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	603 }
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	604 while (hasOrigin(p)) {
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	605 p = origin(p);
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	606 if (iterateDirection == HgIterateDirection.OldToNew) {
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	607 rv.addFirst(p);
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	608 } else {
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	609 assert iterateDirection == HgIterateDirection.NewToOld;
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	610 rv.addLast(p);
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	611 }
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	612 };
507 a6435c1a42d0 Test for HgChangesetTreeHandler - make sure nothing is broken prior to adding --follow support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	613 return rv;
a6435c1a42d0 Test for HgChangesetTreeHandler - make sure nothing is broken prior to adding --follow support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	614 }
528 f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	615
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	616 public boolean hasOrigin(Pair<HgDataFile, Nodeid> p) {
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	617 return p.first().isCopy();
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	618 }
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	619
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	620 public Pair<HgDataFile, Nodeid> origin(Pair<HgDataFile, Nodeid> p) {
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	621 HgDataFile fileNode = p.first();
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	622 assert fileNode.isCopy();
514 5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	623 Path fp = fileNode.getCopySourceName();
5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	624 Nodeid copyRev = fileNode.getCopySourceRevision();
5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	625 fileNode = repo.getFileNode(fp);
528 f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	626 return new Pair<HgDataFile, Nodeid>(fileNode, copyRev);
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	627 }
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	628
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	629 /**
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	630 * Shall report renames based solely on HgFileRenameHandlerMixin presence,
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	631 * even if queue didn't get rename information due to followRenames == false
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	632 *
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	633 * @param queue value from {@link #buildFileRenamesQueue()}
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	634 * @param renameHandler may be <code>null</code>
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	635 */
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	636 public void reportRenameIfNotInQueue(List<Pair<HgDataFile, Nodeid>> queue, HgFileRenameHandlerMixin renameHandler) throws HgCallbackTargetException {
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	637 if (renameHandler != null && !followRenames) {
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	638 // If followRenames is true, all the historical names were in the queue and are processed already.
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	639 // Hence, shall process origin explicitly only when renameHandler is present but followRenames is not requested.
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	640 assert queue.size() == 1; // see the way queue is constructed above
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	641 Pair<HgDataFile, Nodeid> curRename = queue.get(0);
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	642 if (hasOrigin(curRename)) {
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	643 Pair<HgDataFile, Nodeid> origin = origin(curRename);
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	644 HgFileRevision src, dst;
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	645 src = new HgFileRevision(origin.first(), origin.second(), null);
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	646 dst = new HgFileRevision(curRename.first(), curRename.first().getRevision(0), src.getPath());
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	647 renameHandler.copy(src, dst);
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	648 }
510 90093ee56c0d Full-fledged test repo to follow file history. Investigating iteration direction alternatives (from new to old in addition to existing old to new) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 509 diff changeset	649 }
528 f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	650 }
507 a6435c1a42d0 Test for HgChangesetTreeHandler - make sure nothing is broken prior to adding --follow support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	651 }
508 ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	652
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	653 private static class TreeBuildInspector implements HgChangelog.ParentInspector, HgChangelog.RevisionInspector {
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	654 private final boolean followAncestry;
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	655
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	656 private HistoryNode[] completeHistory;
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	657 private int[] commitRevisions;
509 a30e74dca193 Establish parent-child between first and last elements of history chunks for two renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 508 diff changeset	658 private List<HistoryNode> resultHistory;
508 ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	659
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	660 TreeBuildInspector(boolean _followAncestry) {
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	661 followAncestry = _followAncestry;
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	662 }
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	663
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	664 public void next(int revisionNumber, Nodeid revision, int linkedRevision) {
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	665 commitRevisions[revisionNumber] = linkedRevision;
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	666 }
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	667
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	668 public void next(int revisionNumber, Nodeid revision, int parent1, int parent2, Nodeid nidParent1, Nodeid nidParent2) {
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	669 HistoryNode p1 = null, p2 = null;
516 0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	670 // IMPORTANT: method #one(), below, doesn't expect this code expects reasonable values at parent indexes
508 ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	671 if (parent1 != -1) {
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	672 p1 = completeHistory[parent1];
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	673 }
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	674 if (parent2!= -1) {
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	675 p2 = completeHistory[parent2];
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	676 }
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	677 completeHistory[revisionNumber] = new HistoryNode(commitRevisions[revisionNumber], revision, p1, p2);
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	678 }
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	679
516 0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	680 HistoryNode one(HgDataFile fileNode, Nodeid fileRevision) throws HgInvalidControlFileException {
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	681 int fileRevIndexToVisit = fileNode.getRevisionIndex(fileRevision);
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	682 return one(fileNode, fileRevIndexToVisit);
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	683 }
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	684
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	685 HistoryNode one(HgDataFile fileNode, int fileRevIndexToVisit) throws HgInvalidControlFileException {
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	686 resultHistory = null;
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	687 if (fileRevIndexToVisit == HgRepository.TIP) {
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	688 fileRevIndexToVisit = fileNode.getLastRevision();
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	689 }
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	690 // still, allocate whole array, for #next to be able to get null parent values
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	691 completeHistory = new HistoryNode[fileRevIndexToVisit+1];
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	692 commitRevisions = new int[completeHistory.length];
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	693 fileNode.indexWalk(fileRevIndexToVisit, fileRevIndexToVisit, this);
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	694 // it's only single revision, no need to care about followAncestry
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	695 // but won't hurt to keep resultHistory != null and commitRevisions initialized just in case
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	696 HistoryNode rv = completeHistory[fileRevIndexToVisit];
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	697 commitRevisions = new int[] { commitRevisions[fileRevIndexToVisit] };
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	698 completeHistory = null; // no need to keep almost empty array in memory
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	699 resultHistory = Collections.singletonList(rv);
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	700 return rv;
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	701 }
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	702
508 ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	703 /**
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	704 * Builds history of file changes (in natural order, from oldest to newest) up to (and including) file revision specified.
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	705 * If {@link TreeBuildInspector} follows ancestry, only elements that are on the line of ancestry of the revision at
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	706 * lastRevisionIndex would be included.
509 a30e74dca193 Establish parent-child between first and last elements of history chunks for two renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 508 diff changeset	707 *
a30e74dca193 Establish parent-child between first and last elements of history chunks for two renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 508 diff changeset	708 * @return list of history elements, from oldest to newest. In case {@link #followAncestry} is <code>true</code>, the list
a30e74dca193 Establish parent-child between first and last elements of history chunks for two renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 508 diff changeset	709 * is modifiable (to further augment with last/first elements of renamed file histories)
508 ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	710 */
514 5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	711 List<HistoryNode> go(HgDataFile fileNode, Nodeid fileLastRevisionToVisit) throws HgInvalidControlFileException {
509 a30e74dca193 Establish parent-child between first and last elements of history chunks for two renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 508 diff changeset	712 resultHistory = null;
514 5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	713 int fileLastRevIndexToVisit = fileLastRevisionToVisit == null ? fileNode.getLastRevision() : fileNode.getRevisionIndex(fileLastRevisionToVisit);
5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	714 completeHistory = new HistoryNode[fileLastRevIndexToVisit+1];
508 ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	715 commitRevisions = new int[completeHistory.length];
514 5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	716 fileNode.indexWalk(0, fileLastRevIndexToVisit, this);
508 ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	717 if (!followAncestry) {
509 a30e74dca193 Establish parent-child between first and last elements of history chunks for two renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 508 diff changeset	718 // in case when ancestor not followed, it's safe to return unmodifiable list
a30e74dca193 Establish parent-child between first and last elements of history chunks for two renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 508 diff changeset	719 resultHistory = Arrays.asList(completeHistory);
a30e74dca193 Establish parent-child between first and last elements of history chunks for two renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 508 diff changeset	720 completeHistory = null;
a30e74dca193 Establish parent-child between first and last elements of history chunks for two renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 508 diff changeset	721 // keep commitRevisions initialized, no need to recalculate them
a30e74dca193 Establish parent-child between first and last elements of history chunks for two renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 508 diff changeset	722 // as they correspond 1:1 to resultHistory
a30e74dca193 Establish parent-child between first and last elements of history chunks for two renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 508 diff changeset	723 return resultHistory;
508 ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	724 }
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	725 /*
509 a30e74dca193 Establish parent-child between first and last elements of history chunks for two renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 508 diff changeset	726 * Changesets, newest at the top:
508 ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	727 * o <-- cset from working dir parent (as in dirstate), file not changed (file revision recorded points to that from A)
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	728 * \| x <-- revision with file changed (B')
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	729 * x / <-- revision with file changed (A)
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	730 * \| x <-- revision with file changed (B)
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	731 * \|/
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	732 * o <-- another changeset, where file wasn't changed
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	733 * \|
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	734 * x <-- revision with file changed (C)
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	735 *
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	736 * File history: B', A, B, C
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	737 *
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	738 * When "follow", SHALL NOT report B and B', but A and C
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	739 */
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	740 // strippedHistory: only those HistoryNodes from completeHistory that are on the same
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	741 // line of descendant, in order from older to newer
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	742 LinkedList<HistoryNode> strippedHistoryList = new LinkedList<HistoryNode>();
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	743 LinkedList<HistoryNode> queue = new LinkedList<HistoryNode>();
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	744 // look for ancestors of the selected history node
514 5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	745 queue.add(completeHistory[fileLastRevIndexToVisit]);
508 ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	746 do {
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	747 HistoryNode withFileChange = queue.removeFirst();
511 122e0600799f Respect multiple joins/forks in a history of a single file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 510 diff changeset	748 if (strippedHistoryList.contains(withFileChange)) {
122e0600799f Respect multiple joins/forks in a history of a single file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 510 diff changeset	749 // fork point for the change that was later merged (and we traced
122e0600799f Respect multiple joins/forks in a history of a single file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 510 diff changeset	750 // both lines of development by now.
122e0600799f Respect multiple joins/forks in a history of a single file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 510 diff changeset	751 continue;
122e0600799f Respect multiple joins/forks in a history of a single file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 510 diff changeset	752 }
508 ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	753 if (withFileChange.children != null) {
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	754 withFileChange.children.retainAll(strippedHistoryList);
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	755 }
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	756 strippedHistoryList.addFirst(withFileChange);
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	757 if (withFileChange.parent1 != null) {
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	758 queue.addLast(withFileChange.parent1);
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	759 }
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	760 if (withFileChange.parent2 != null) {
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	761 queue.addLast(withFileChange.parent2);
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	762 }
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	763 } while (!queue.isEmpty());
511 122e0600799f Respect multiple joins/forks in a history of a single file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 510 diff changeset	764 Collections.sort(strippedHistoryList, new Comparator<HistoryNode>() {
122e0600799f Respect multiple joins/forks in a history of a single file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 510 diff changeset	765
122e0600799f Respect multiple joins/forks in a history of a single file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 510 diff changeset	766 public int compare(HistoryNode o1, HistoryNode o2) {
122e0600799f Respect multiple joins/forks in a history of a single file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 510 diff changeset	767 return o1.changeset - o2.changeset;
122e0600799f Respect multiple joins/forks in a history of a single file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 510 diff changeset	768 }
122e0600799f Respect multiple joins/forks in a history of a single file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 510 diff changeset	769 });
508 ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	770 completeHistory = null;
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	771 commitRevisions = null;
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	772 // collected values are no longer valid - shall
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	773 // strip off elements for missing HistoryNodes, but it's easier just to re-create the array
509 a30e74dca193 Establish parent-child between first and last elements of history chunks for two renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 508 diff changeset	774 // from resultHistory later, once (and if) needed
a30e74dca193 Establish parent-child between first and last elements of history chunks for two renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 508 diff changeset	775 return resultHistory = strippedHistoryList;
508 ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	776 }
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	777
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	778 /**
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	779 * handy access to all HistoryNode[i].changeset values
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	780 */
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	781 int[] getCommitRevisions() {
509 a30e74dca193 Establish parent-child between first and last elements of history chunks for two renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 508 diff changeset	782 if (commitRevisions == null) {
a30e74dca193 Establish parent-child between first and last elements of history chunks for two renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 508 diff changeset	783 commitRevisions = new int[resultHistory.size()];
a30e74dca193 Establish parent-child between first and last elements of history chunks for two renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 508 diff changeset	784 int i = 0;
a30e74dca193 Establish parent-child between first and last elements of history chunks for two renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 508 diff changeset	785 for (HistoryNode n : resultHistory) {
a30e74dca193 Establish parent-child between first and last elements of history chunks for two renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 508 diff changeset	786 commitRevisions[i++] = n.changeset;
a30e74dca193 Establish parent-child between first and last elements of history chunks for two renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 508 diff changeset	787 }
a30e74dca193 Establish parent-child between first and last elements of history chunks for two renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 508 diff changeset	788 }
508 ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	789 return commitRevisions;
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	790 }
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	791 };
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	792
516 0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	793 private abstract class HandlerDispatcher {
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	794 private final int CACHE_CSET_IN_ADVANCE_THRESHOLD = 100; /* XXX is it really worth it? */
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	795 // builds tree of nodes according to parents in file's revlog
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	796 private final TreeBuildInspector treeBuildInspector = new TreeBuildInspector(followAncestry);
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	797 private List<HistoryNode> changeHistory;
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	798 protected ElementImpl ei = null;
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	799 private ProgressSupport progress;
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	800 protected HgDataFile currentFileNode;
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	801 // node where current file history chunk intersects with same file under other name history
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	802 // either mock of B(0) or A(k), depending on iteration order
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	803 private HistoryNode junctionNode;
528 f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	804 // initialized when there's HgFileRenameHandlerMixin
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	805 private HgFileRevision copiedFrom, copiedTo;
516 0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	806
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	807 // parentProgress shall be initialized with 4 XXX refactor all this stuff with parentProgress
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	808 public void prepare(ProgressSupport parentProgress, Pair<HgDataFile, Nodeid> renameInfo) {
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	809 // if we don't followAncestry, take complete history
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	810 // XXX treeBuildInspector knows followAncestry, perhaps the logic
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	811 // whether to take specific revision or the last one shall be there?
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	812 changeHistory = treeBuildInspector.go(renameInfo.first(), followAncestry ? renameInfo.second() : null);
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	813 assert changeHistory.size() > 0;
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	814 parentProgress.worked(1);
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	815 int historyNodeCount = changeHistory.size();
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	816 if (ei == null) {
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	817 // when follow is true, changeHistory.size() of the first revision might be quite short
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	818 // (e.g. bad fname recognized soon), hence ensure at least cache size at once
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	819 ei = new ElementImpl(Math.max(CACHE_CSET_IN_ADVANCE_THRESHOLD, historyNodeCount));
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	820 }
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	821 if (historyNodeCount < CACHE_CSET_IN_ADVANCE_THRESHOLD ) {
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	822 int[] commitRevisions = treeBuildInspector.getCommitRevisions();
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	823 assert commitRevisions.length == changeHistory.size();
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	824 // read bunch of changesets at once and cache 'em
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	825 ei.initTransform();
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	826 repo.getChangelog().range(ei, commitRevisions);
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	827 parentProgress.worked(1);
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	828 progress = new ProgressSupport.Sub(parentProgress, 2);
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	829 } else {
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	830 progress = new ProgressSupport.Sub(parentProgress, 3);
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	831 }
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	832 progress.start(historyNodeCount);
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	833 // switch to present chunk's file node
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	834 switchTo(renameInfo.first());
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	835 }
528 f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	836
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	837 public void updateJunctionPoint(Pair<HgDataFile, Nodeid> curRename, Pair<HgDataFile, Nodeid> nextRename, boolean needCopyFromTo) {
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	838 copiedFrom = copiedTo = null;
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	839 //
516 0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	840 // A (old) renamed to B(new). A(0..k..n) -> B(0..m). If followAncestry, k == n
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	841 // curRename.second() points to A(k)
522 2103388d4010 Expose option to report changesets in reversed order Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 520 diff changeset	842 if (iterateDirection == HgIterateDirection.OldToNew) {
516 0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	843 // looking at A chunk (curRename), nextRename points to B
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	844 HistoryNode junctionSrc = findJunctionPointInCurrentChunk(curRename.second()); // A(k)
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	845 HistoryNode junctionDestMock = treeBuildInspector.one(nextRename.first(), 0); // B(0)
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	846 // junstionDestMock is mock object, once we iterate next rename, there'd be different HistoryNode
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	847 // for B's first revision. This means we read it twice, but this seems to be reasonable
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	848 // price for simplicity of the code (and opportunity to follow renames while not following ancestry)
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	849 junctionSrc.bindChild(junctionDestMock);
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	850 // Save mock A(k) 1) not to keep whole A history in memory 2) Don't need it's parent and children once get to B
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	851 // moreover, children of original A(k) (junctionSrc) would list mock B(0) which is undesired once we iterate over real B
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	852 junctionNode = new HistoryNode(junctionSrc.changeset, junctionSrc.fileRevision, null, null);
528 f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	853 if (needCopyFromTo) {
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	854 copiedFrom = new HgFileRevision(curRename.first(), junctionNode.fileRevision, null); // "A", A(k)
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	855 copiedTo = new HgFileRevision(nextRename.first(), junctionDestMock.fileRevision, copiedFrom.getPath()); // "B", B(0)
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	856 }
516 0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	857 } else {
522 2103388d4010 Expose option to report changesets in reversed order Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 520 diff changeset	858 assert iterateDirection == HgIterateDirection.NewToOld;
516 0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	859 // looking at B chunk (curRename), nextRename points at A
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	860 HistoryNode junctionDest = changeHistory.get(0); // B(0)
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	861 // prepare mock A(k)
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	862 HistoryNode junctionSrcMock = treeBuildInspector.one(nextRename.first(), nextRename.second()); // A(k)
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	863 // B(0) to list A(k) as its parent
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	864 // NOTE, A(k) would be different when we reach A chunk on the next iteration,
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	865 // but we do not care as long as TreeElement needs only parent/child changesets
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	866 // and not other TreeElements; so that it's enough to have mock parent node (just
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	867 // for the sake of parent cset revisions). We have to, indeed, update real A(k),
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	868 // once we get to iteration over A, with B(0) (junctionDest) as one more child.
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	869 junctionSrcMock.bindChild(junctionDest);
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	870 // Save mock B(0), for reasons see above for opposite direction
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	871 junctionNode = new HistoryNode(junctionDest.changeset, junctionDest.fileRevision, null, null);
528 f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	872 if (needCopyFromTo) {
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	873 copiedFrom = new HgFileRevision(nextRename.first(), junctionSrcMock.fileRevision, null); // "A", A(k)
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	874 copiedTo = new HgFileRevision(curRename.first(), junctionNode.fileRevision, copiedFrom.getPath()); // "B", B(0)
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	875 }
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	876 }
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	877 }
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	878
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	879 public void reportRenames(HgFileRenameHandlerMixin renameHandler) throws HgCallbackTargetException {
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	880 if (renameHandler != null) { // shall report renames
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	881 assert copiedFrom != null;
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	882 assert copiedTo != null;
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	883 renameHandler.copy(copiedFrom, copiedTo);
516 0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	884 }
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	885 }
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	886
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	887 public void clearJunctionPoint() {
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	888 junctionNode = null;
528 f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	889 copiedFrom = copiedTo = null;
516 0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	890 }
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	891
528 f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	892 /**
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	893 * Replace mock src/dest HistoryNode connected to junctionNode with a real one
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	894 */
f7fbf48b9383 Report rename when walking file history regardless of followRenames parameter, solely based on HgFileRenameHandlerMixin presence Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	895 public void connectWithLastJunctionPoint(Pair<HgDataFile, Nodeid> curRename, Pair<HgDataFile, Nodeid> prevRename) {
516 0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	896 assert junctionNode != null;
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	897 // A renamed to B. A(0..k..n) -> B(0..m). If followAncestry: k == n
522 2103388d4010 Expose option to report changesets in reversed order Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 520 diff changeset	898 if (iterateDirection == HgIterateDirection.OldToNew) {
516 0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	899 // forward, from old to new:
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	900 // changeHistory points to B
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	901 // Already reported: A(0)..A(n), A(k) is in junctionNode
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	902 // Shall connect histories: A(k).bind(B(0))
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	903 HistoryNode junctionDest = changeHistory.get(0); // B(0)
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	904 // junctionNode is A(k)
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	905 junctionNode.bindChild(junctionDest);
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	906 } else {
522 2103388d4010 Expose option to report changesets in reversed order Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 520 diff changeset	907 assert iterateDirection == HgIterateDirection.NewToOld;
516 0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	908 // changeHistory points to A
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	909 // Already reported B(m), B(m-1)...B(0), B(0) is in junctionNode
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	910 // Shall connect histories A(k).bind(B(0))
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	911 // if followAncestry: A(k) is latest in changeHistory (k == n)
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	912 HistoryNode junctionSrc = findJunctionPointInCurrentChunk(curRename.second()); // A(k)
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	913 junctionSrc.bindChild(junctionNode);
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	914 }
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	915 }
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	916
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	917 private HistoryNode findJunctionPointInCurrentChunk(Nodeid fileRevision) {
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	918 if (followAncestry) {
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	919 // use the fact we don't go past junction point when followAncestry == true
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	920 HistoryNode rv = changeHistory.get(changeHistory.size() - 1);
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	921 assert rv.fileRevision.equals(fileRevision);
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	922 return rv;
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	923 }
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	924 for (HistoryNode n : changeHistory) {
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	925 if (n.fileRevision.equals(fileRevision)) {
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	926 return n;
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	927 }
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	928 }
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	929 int csetStart = changeHistory.get(0).changeset;
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	930 int csetEnd = changeHistory.get(changeHistory.size() - 1).changeset;
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	931 throw new HgInvalidStateException(String.format("For change history (cset[%d..%d]) could not find node for file change %s", csetStart, csetEnd, fileRevision.shortNotation()));
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	932 }
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	933
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	934 protected abstract void once(HistoryNode n) throws HgCallbackTargetException, CancelledException;
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	935
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	936 public void dispatchAllChanges() throws HgCallbackTargetException, CancelledException {
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	937 // XXX shall sort changeHistory according to changeset numbers?
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	938 Iterator<HistoryNode> it;
522 2103388d4010 Expose option to report changesets in reversed order Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 520 diff changeset	939 if (iterateDirection == HgIterateDirection.OldToNew) {
516 0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	940 it = changeHistory.listIterator();
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	941 } else {
522 2103388d4010 Expose option to report changesets in reversed order Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 520 diff changeset	942 assert iterateDirection == HgIterateDirection.NewToOld;
516 0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	943 it = new ReverseIterator<HistoryNode>(changeHistory);
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	944 }
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	945 while(it.hasNext()) {
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	946 HistoryNode n = it.next();
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	947 once(n);
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	948 progress.worked(1);
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	949 }
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	950 changeHistory = null;
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	951 }
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	952
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	953 public void switchTo(HgDataFile df) {
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	954 // from now on, use df in TreeElement
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	955 currentFileNode = df;
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	956 }
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	957 }
0ae5768081aa Allow walking file rename history independently from file ancestry (native hg log --follow does both at once) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 515 diff changeset	958
507 a6435c1a42d0 Test for HgChangesetTreeHandler - make sure nothing is broken prior to adding --follow support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	959
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	960 //
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	961
520 1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	962 private class FilteringInspector extends AdapterPlug implements HgChangelog.Inspector, Adaptable {
518 0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	963
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	964 private int firstCset = BAD_REVISION, lastCset = BAD_REVISION;
520 1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	965 private HgChangelog.Inspector delegate;
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	966 // we use lifecycle to stop when limit is reached.
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	967 // delegate, however, may use lifecycle, too, so give it a chance
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	968 private LifecycleProxy lifecycleProxy;
518 0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	969
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	970 // limit to changesets in this range only
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	971 public void changesets(int start, int end) {
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	972 firstCset = start;
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	973 lastCset = end;
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	974 }
520 1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	975
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	976 public void delegateTo(HgChangelog.Inspector inspector) {
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	977 delegate = inspector;
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	978 // let delegate control life cycle, too
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	979 if (lifecycleProxy == null) {
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	980 super.attachAdapter(Lifecycle.class, lifecycleProxy = new LifecycleProxy(inspector));
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	981 } else {
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	982 lifecycleProxy.init(inspector);
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	983 }
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	984 }
518 0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	985
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	986 public void next(int revisionNumber, Nodeid nodeid, RawChangeset cset) {
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	987 if (limit > 0 && count >= limit) {
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	988 return;
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	989 }
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	990 // XXX may benefit from optional interface with #isInterested(int csetRev) - to avoid
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	991 // RawChangeset instantiation
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	992 if (firstCset != BAD_REVISION && revisionNumber < firstCset) {
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	993 return;
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	994 }
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	995 if (lastCset != BAD_REVISION && revisionNumber > lastCset) {
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	996 return;
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	997 }
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	998 if (branches != null && !branches.contains(cset.branch())) {
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	999 return;
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	1000 }
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	1001 if (users != null) {
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	1002 String csetUser = cset.user().toLowerCase();
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	1003 boolean found = false;
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	1004 for (String u : users) {
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	1005 if (csetUser.indexOf(u) != -1) {
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	1006 found = true;
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	1007 break;
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	1008 }
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	1009 }
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	1010 if (!found) {
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	1011 return;
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	1012 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	1013 }
518 0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	1014 if (date != null) {
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	1015 // TODO post-1.0 implement date support for log
0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	1016 }
520 1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	1017 delegate.next(revisionNumber, nodeid, cset);
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	1018 count++;
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	1019 if (limit > 0 && count >= limit) {
1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	1020 lifecycleProxy.stop();
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	1021 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	1022 }
520 1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	1023 }
518 0d5e1ea7955e Tests for HgLogCommand#execute(HgChangesetHandler) with various combination of follow renames and ancestry Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 517 diff changeset	1024
432 1fc0da631200 Revlog.ParentWalker helper class got promoted as TLC, renamed to HgParentChildMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 431 diff changeset	1025 private HgParentChildMap<HgChangelog> getParentHelper(boolean create) throws HgInvalidControlFileException {
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1026 if (parentHelper == null && create) {
432 1fc0da631200 Revlog.ParentWalker helper class got promoted as TLC, renamed to HgParentChildMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 431 diff changeset	1027 parentHelper = new HgParentChildMap<HgChangelog>(repo.getChangelog());
195 c9b305df0b89 Optimization: use ParentWalker to get changeset's parents, if possible. Do not keep duplicating nodeids and strings in manifest revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 193 diff changeset	1028 parentHelper.init();
c9b305df0b89 Optimization: use ParentWalker to get changeset's parents, if possible. Do not keep duplicating nodeids and strings in manifest revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 193 diff changeset	1029 }
c9b305df0b89 Optimization: use ParentWalker to get changeset's parents, if possible. Do not keep duplicating nodeids and strings in manifest revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 193 diff changeset	1030 return parentHelper;
c9b305df0b89 Optimization: use ParentWalker to get changeset's parents, if possible. Do not keep duplicating nodeids and strings in manifest revisions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 193 diff changeset	1031 }
520 1ee452f31187 Experimental support for inverse direction history walking. Refactored/streamlined cancellation in HgLogCommand and down the stack Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 518 diff changeset	1032
205 ffc5f6d59f7e HgLogCommand.Handler is used in few places, pull up to top-level class, HgChangesetHandler Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 195 diff changeset	1033 public static class CollectHandler implements HgChangesetHandler {
129 645829962785 core.Cset renamed to HgChangeset; repo.Changeset moved into HgChangelog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 126 diff changeset	1034 private final List<HgChangeset> result = new LinkedList<HgChangeset>();
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	1035
129 645829962785 core.Cset renamed to HgChangeset; repo.Changeset moved into HgChangelog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 126 diff changeset	1036 public List<HgChangeset> getChanges() {
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	1037 return Collections.unmodifiableList(result);
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	1038 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	1039
427 31a89587eb04 FIXMEs: consistent names, throws for commands and their handlers. Use of checked exceptions in hi-level api Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 424 diff changeset	1040 public void cset(HgChangeset changeset) {
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	1041 result.add(changeset.clone());
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	1042 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	1043 }
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1044
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1045 private static class HistoryNode {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1046 final int changeset;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1047 final Nodeid fileRevision;
509 a30e74dca193 Establish parent-child between first and last elements of history chunks for two renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 508 diff changeset	1048 HistoryNode parent1; // there's special case when we can alter it, see #bindChild()
a30e74dca193 Establish parent-child between first and last elements of history chunks for two renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 508 diff changeset	1049 final HistoryNode parent2;
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1050 List<HistoryNode> children;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1051
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1052 HistoryNode(int cs, Nodeid revision, HistoryNode p1, HistoryNode p2) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1053 changeset = cs;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1054 fileRevision = revision;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1055 parent1 = p1;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1056 parent2 = p2;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1057 if (p1 != null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1058 p1.addChild(this);
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1059 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1060 if (p2 != null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1061 p2.addChild(this);
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1062 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1063 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1064
509 a30e74dca193 Establish parent-child between first and last elements of history chunks for two renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 508 diff changeset	1065 private void addChild(HistoryNode child) {
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1066 if (children == null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1067 children = new ArrayList<HistoryNode>(2);
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1068 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1069 children.add(child);
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1070 }
509 a30e74dca193 Establish parent-child between first and last elements of history chunks for two renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 508 diff changeset	1071
a30e74dca193 Establish parent-child between first and last elements of history chunks for two renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 508 diff changeset	1072 /**
a30e74dca193 Establish parent-child between first and last elements of history chunks for two renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 508 diff changeset	1073 * method to merge two history chunks for renamed file so that
517 9922d1f7cb2a Update test to use new command configuration argument (used to have followAncestry == true by default) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 516 diff changeset	1074 * this node's history continues (or forks, if we don't followAncestry)
9922d1f7cb2a Update test to use new command configuration argument (used to have followAncestry == true by default) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 516 diff changeset	1075 * with that of child
509 a30e74dca193 Establish parent-child between first and last elements of history chunks for two renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 508 diff changeset	1076 * @param child
a30e74dca193 Establish parent-child between first and last elements of history chunks for two renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 508 diff changeset	1077 */
a30e74dca193 Establish parent-child between first and last elements of history chunks for two renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 508 diff changeset	1078 public void bindChild(HistoryNode child) {
a30e74dca193 Establish parent-child between first and last elements of history chunks for two renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 508 diff changeset	1079 assert child.parent1 == null && child.parent2 == null;
a30e74dca193 Establish parent-child between first and last elements of history chunks for two renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 508 diff changeset	1080 child.parent1 = this;
a30e74dca193 Establish parent-child between first and last elements of history chunks for two renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 508 diff changeset	1081 addChild(child);
a30e74dca193 Establish parent-child between first and last elements of history chunks for two renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 508 diff changeset	1082 }
511 122e0600799f Respect multiple joins/forks in a history of a single file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 510 diff changeset	1083
122e0600799f Respect multiple joins/forks in a history of a single file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 510 diff changeset	1084 public String toString() {
122e0600799f Respect multiple joins/forks in a history of a single file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 510 diff changeset	1085 return String.format("<cset:%d, parents: %s, %s>", changeset, parent1 == null ? "-" : String.valueOf(parent1.changeset), parent2 == null ? "-" : String.valueOf(parent2.changeset));
122e0600799f Respect multiple joins/forks in a history of a single file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 510 diff changeset	1086 }
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1087 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1088
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1089 private class ElementImpl implements HgChangesetTreeHandler.TreeElement, HgChangelog.Inspector {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1090 private HistoryNode historyNode;
515 e6c8b9b654b2 Provide access to HgDataFile being iterated into HgChangesetTreeHandler.TreeElement to give context for renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 514 diff changeset	1091 private HgDataFile fileNode;
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1092 private Pair<HgChangeset, HgChangeset> parents;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1093 private List<HgChangeset> children;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1094 private IntMap<HgChangeset> cachedChangesets;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1095 private ChangesetTransformer.Transformation transform;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1096 private Nodeid changesetRevision;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1097 private Pair<Nodeid,Nodeid> parentRevisions;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1098 private List<Nodeid> childRevisions;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1099
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1100 public ElementImpl(int total) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1101 cachedChangesets = new IntMap<HgChangeset>(total);
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1102 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1103
515 e6c8b9b654b2 Provide access to HgDataFile being iterated into HgChangesetTreeHandler.TreeElement to give context for renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 514 diff changeset	1104 ElementImpl init(HistoryNode n, HgDataFile df) {
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1105 historyNode = n;
515 e6c8b9b654b2 Provide access to HgDataFile being iterated into HgChangesetTreeHandler.TreeElement to give context for renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 514 diff changeset	1106 fileNode = df;
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1107 parents = null;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1108 children = null;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1109 changesetRevision = null;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1110 parentRevisions = null;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1111 childRevisions = null;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1112 return this;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1113 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1114
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1115 public Nodeid fileRevision() {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1116 return historyNode.fileRevision;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1117 }
515 e6c8b9b654b2 Provide access to HgDataFile being iterated into HgChangesetTreeHandler.TreeElement to give context for renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 514 diff changeset	1118
e6c8b9b654b2 Provide access to HgDataFile being iterated into HgChangesetTreeHandler.TreeElement to give context for renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 514 diff changeset	1119 public HgDataFile file() {
e6c8b9b654b2 Provide access to HgDataFile being iterated into HgChangesetTreeHandler.TreeElement to give context for renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 514 diff changeset	1120 return fileNode;
e6c8b9b654b2 Provide access to HgDataFile being iterated into HgChangesetTreeHandler.TreeElement to give context for renamed files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 514 diff changeset	1121 }
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1122
423 9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 419 diff changeset	1123 public HgChangeset changeset() {
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1124 return get(historyNode.changeset)[0];
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1125 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1126
423 9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 419 diff changeset	1127 public Pair<HgChangeset, HgChangeset> parents() {
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1128 if (parents != null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1129 return parents;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1130 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1131 HistoryNode p;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1132 final int p1, p2;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1133 if ((p = historyNode.parent1) != null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1134 p1 = p.changeset;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1135 } else {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1136 p1 = -1;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1137 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1138 if ((p = historyNode.parent2) != null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1139 p2 = p.changeset;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1140 } else {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1141 p2 = -1;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1142 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1143 HgChangeset[] r = get(p1, p2);
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1144 return parents = new Pair<HgChangeset, HgChangeset>(r[0], r[1]);
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1145 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1146
423 9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 419 diff changeset	1147 public Collection<HgChangeset> children() {
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1148 if (children != null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1149 return children;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1150 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1151 if (historyNode.children == null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1152 children = Collections.emptyList();
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1153 } else {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1154 int[] childrentChangesetNumbers = new int[historyNode.children.size()];
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1155 int j = 0;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1156 for (HistoryNode hn : historyNode.children) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1157 childrentChangesetNumbers[j++] = hn.changeset;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1158 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1159 children = Arrays.asList(get(childrentChangesetNumbers));
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1160 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1161 return children;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1162 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1163
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1164 void populate(HgChangeset cs) {
403 2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	1165 cachedChangesets.put(cs.getRevisionIndex(), cs);
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1166 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1167
423 9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 419 diff changeset	1168 private HgChangeset[] get(int... changelogRevisionIndex) {
403 2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	1169 HgChangeset[] rv = new HgChangeset[changelogRevisionIndex.length];
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	1170 IntVector misses = new IntVector(changelogRevisionIndex.length, -1);
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	1171 for (int i = 0; i < changelogRevisionIndex.length; i++) {
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	1172 if (changelogRevisionIndex[i] == -1) {
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1173 rv[i] = null;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1174 continue;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1175 }
403 2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	1176 HgChangeset cached = cachedChangesets.get(changelogRevisionIndex[i]);
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1177 if (cached != null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1178 rv[i] = cached;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1179 } else {
403 2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	1180 misses.add(changelogRevisionIndex[i]);
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1181 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1182 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1183 if (misses.size() > 0) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1184 final int[] changesets2read = misses.toArray();
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1185 initTransform();
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1186 repo.getChangelog().range(this, changesets2read);
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1187 for (int changeset2read : changesets2read) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1188 HgChangeset cs = cachedChangesets.get(changeset2read);
403 2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	1189 if (cs == null) {
423 9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 419 diff changeset	1190 HgInvalidStateException t = new HgInvalidStateException(String.format("Can't get changeset for revision %d", changeset2read));
9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 419 diff changeset	1191 throw t.setRevisionIndex(changeset2read);
403 2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	1192 }
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	1193 // HgChangelog.range may reorder changesets according to their order in the changelog
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	1194 // thus need to find original index
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	1195 boolean sanity = false;
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	1196 for (int i = 0; i < changelogRevisionIndex.length; i++) {
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	1197 if (changelogRevisionIndex[i] == cs.getRevisionIndex()) {
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	1198 rv[i] = cs;
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	1199 sanity = true;
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	1200 break;
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1201 }
403 2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	1202 }
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	1203 if (!sanity) {
490 b3c16d1aede0 Refactoring: move HgRepository's implementation aspects to Internals (which is now its imlementation counterpart and primary repository class to be used by other parts of the library) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 457 diff changeset	1204 repo.getSessionContext().getLog().dump(getClass(), Error, "Index of revision %d:%s doesn't match any of requested", cs.getRevisionIndex(), cs.getNodeid().shortNotation());
403 2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	1205 }
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	1206 assert sanity;
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1207 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1208 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1209 return rv;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1210 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1211
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1212 // init only when needed
423 9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 419 diff changeset	1213 void initTransform() throws HgRuntimeException {
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1214 if (transform == null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1215 transform = new ChangesetTransformer.Transformation(new HgStatusCollector(repo)/XXX try to reuse from context?/, getParentHelper(false));
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1216 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1217 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1218
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1219 public void next(int revisionNumber, Nodeid nodeid, RawChangeset cset) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1220 HgChangeset cs = transform.handle(revisionNumber, nodeid, cset);
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1221 populate(cs.clone());
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1222 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1223
423 9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 419 diff changeset	1224 public Nodeid changesetRevision() {
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1225 if (changesetRevision == null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1226 changesetRevision = getRevision(historyNode.changeset);
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1227 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1228 return changesetRevision;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1229 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1230
423 9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 419 diff changeset	1231 public Pair<Nodeid, Nodeid> parentRevisions() {
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1232 if (parentRevisions == null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1233 HistoryNode p;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1234 final Nodeid p1, p2;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1235 if ((p = historyNode.parent1) != null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1236 p1 = getRevision(p.changeset);
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1237 } else {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1238 p1 = Nodeid.NULL;;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1239 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1240 if ((p = historyNode.parent2) != null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1241 p2 = getRevision(p.changeset);
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1242 } else {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1243 p2 = Nodeid.NULL;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1244 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1245 parentRevisions = new Pair<Nodeid, Nodeid>(p1, p2);
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1246 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1247 return parentRevisions;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1248 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1249
423 9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 419 diff changeset	1250 public Collection<Nodeid> childRevisions() {
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1251 if (childRevisions != null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1252 return childRevisions;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1253 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1254 if (historyNode.children == null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1255 childRevisions = Collections.emptyList();
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1256 } else {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1257 ArrayList<Nodeid> rv = new ArrayList<Nodeid>(historyNode.children.size());
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1258 for (HistoryNode hn : historyNode.children) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1259 rv.add(getRevision(hn.changeset));
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1260 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1261 childRevisions = Collections.unmodifiableList(rv);
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1262 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1263 return childRevisions;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1264 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1265
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1266 // reading nodeid involves reading index only, guess, can afford not to optimize multiple reads
423 9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 419 diff changeset	1267 private Nodeid getRevision(int changelogRevisionNumber) {
9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 419 diff changeset	1268 // TODO post-1.0 pipe through pool
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1269 HgChangeset cs = cachedChangesets.get(changelogRevisionNumber);
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1270 if (cs != null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1271 return cs.getNodeid();
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1272 } else {
403 2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	1273 return repo.getChangelog().getRevision(changelogRevisionNumber);
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1274 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1275 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1276 }
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	1277 }

Mercurial > hg4j

annotate src/org/tmatesoft/hg/core/HgLogCommand.java @ 596:43cfa08ff3fd