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

annotate src/org/tmatesoft/hg/core/HgLogCommand.java @ 516:0ae5768081aa

Allow walking file rename history independently from file ancestry (native hg log --follow does both at once)

author	Artem Tikhomirov <tikhomirov.artem@gmail.com>
date	Tue, 18 Dec 2012 18:57:03 +0100
parents	e6c8b9b654b2
children	9922d1f7cb2a

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 /*
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	2 s * Copyright (c) 2011-2012 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
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 70 diff changeset	19 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	20 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	21
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	22 import java.util.ArrayList;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	23 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	24 import java.util.Calendar;
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	25 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	26 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	27 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	28 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	29 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	30 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	31 import java.util.List;
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	32 import java.util.ListIterator;
64 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
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	36 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	37 import org.tmatesoft.hg.internal.IntVector;
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	38 import org.tmatesoft.hg.repo.HgChangelog;
154 ba2bf656f00f Changeset => RawChangeset Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 148 diff changeset	39 import org.tmatesoft.hg.repo.HgChangelog.RawChangeset;
80 4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	40 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	41 import org.tmatesoft.hg.repo.HgInvalidControlFileException;
457 d78cb5ca3053 Get rid of ambiguity in method name Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 456 diff changeset	42 import org.tmatesoft.hg.repo.HgInvalidRevisionException;
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	43 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	44 import org.tmatesoft.hg.repo.HgParentChildMap;
74 6f1b88693d48 Complete refactoring to org.tmatesoft Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 70 diff changeset	45 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	46 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	47 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	48 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	49 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	50 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	51 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	52 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	53 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	54
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	55
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	56 /**
131 aa1629f36482 Renamed .core classes to start with Hg prefix Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 129 diff changeset	57 * 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	58 *
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	59 * <pre>
131 aa1629f36482 Renamed .core classes to start with Hg prefix Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 129 diff changeset	60 * Usage:
70 993f6f8e1314 Test for log command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 64 diff changeset	61 * 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	62 * </pre>
131 aa1629f36482 Renamed .core classes to start with Hg prefix Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 129 diff changeset	63 * 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	64 *
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	65 * @author Artem Tikhomirov
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	66 * @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	67 */
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	68 public class HgLogCommand extends HgAbstractCommand<HgLogCommand> implements HgChangelog.Inspector {
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	69
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	70 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	71 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	72 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	73 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	74 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	75 private Calendar date;
77 c677e1593919 Moved RevlogStream implementation into .internal Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 74 diff changeset	76 private Path file;
514 5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	77 /*
5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	78 * 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	79 * 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	80 */
5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	81 private boolean followRenames;
5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	82 /*
5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	83 * 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	84 * 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	85 * 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	86 */
5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	87 private boolean followAncestry;
193 37f3d4a596e4 Use common low to hi-level changeset api transformer Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 157 diff changeset	88 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	89 private HgParentChildMap<HgChangelog> parentHelper;
80 4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	90
131 aa1629f36482 Renamed .core classes to start with Hg prefix Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 129 diff changeset	91 public HgLogCommand(HgRepository hgRepo) {
107 7ec89d637f50 CatCommand Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 102 diff changeset	92 repo = hgRepo;
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	93 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	94
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	95 /**
148 1a7a9a20e1f9 Exceptions, javadoc. Initial cancel and progress support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 142 diff changeset	96 * 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	97 * 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	98 * @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	99 * @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	100 * @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	101 */
131 aa1629f36482 Renamed .core classes to start with Hg prefix Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 129 diff changeset	102 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	103 if (user == null) {
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	104 throw new IllegalArgumentException();
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	105 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	106 if (users == null) {
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	107 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	108 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	109 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	110 return this;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	111 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	112
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	113 /**
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	114 * 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	115 * 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	116 * 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	117 * @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	118 * @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	119 * @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	120 */
131 aa1629f36482 Renamed .core classes to start with Hg prefix Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 129 diff changeset	121 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	122 if (branch == null) {
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	123 throw new IllegalArgumentException();
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	124 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	125 if (branches == null) {
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	126 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	127 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	128 branches.add(branch);
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	129 return this;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	130 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	131
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	132 // 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	133 // multiple?
131 aa1629f36482 Renamed .core classes to start with Hg prefix Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 129 diff changeset	134 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	135 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	136 // 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	137 // isSet(field) - false => don't use in detection of 'same date'
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	138 throw HgRepository.notImplemented();
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 /**
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	142 *
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	143 * @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	144 * @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	145 */
131 aa1629f36482 Renamed .core classes to start with Hg prefix Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 129 diff changeset	146 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	147 limit = num;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	148 return this;
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 * 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	153 * 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	154 *
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	155 * @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	156 * @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	157 * @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	158 */
131 aa1629f36482 Renamed .core classes to start with Hg prefix Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 129 diff changeset	159 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	160 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	161 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	162 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	163 } 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	164 startRev = rev2;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	165 endRev = rev1;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	166 } else {
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	167 startRev = rev1;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	168 endRev = rev2;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	169 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	170 return this;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	171 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	172
77 c677e1593919 Moved RevlogStream implementation into .internal Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 74 diff changeset	173 /**
253 1874d11054e5 HgLogCommand.changeset(Nodeid) to ease command configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 250 diff changeset	174 * Select specific changeset
1874d11054e5 HgLogCommand.changeset(Nodeid) to ease command configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 250 diff changeset	175 *
1874d11054e5 HgLogCommand.changeset(Nodeid) to ease command configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 250 diff changeset	176 * @param nid changeset revision
1874d11054e5 HgLogCommand.changeset(Nodeid) to ease command configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 250 diff changeset	177 * @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	178 * @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	179 */
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	180 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	181 // XXX perhaps, shall support multiple (...) arguments and extend #execute to handle not only range, but also set of revisions.
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	182 try {
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	183 final int csetRevIndex = repo.getChangelog().getRevisionIndex(nid);
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	184 return range(csetRevIndex, csetRevIndex);
457 d78cb5ca3053 Get rid of ambiguity in method name Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 456 diff changeset	185 } catch (HgInvalidRevisionException ex) {
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	186 throw new HgBadArgumentException("Can't find revision", ex).setRevision(nid);
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	187 }
253 1874d11054e5 HgLogCommand.changeset(Nodeid) to ease command configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 250 diff changeset	188 }
1874d11054e5 HgLogCommand.changeset(Nodeid) to ease command configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 250 diff changeset	189
1874d11054e5 HgLogCommand.changeset(Nodeid) to ease command configuration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 250 diff changeset	190 /**
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	191 * 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	192 * 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	193 * 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	194 * {@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	195 *
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	196 * @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	197 * @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	198 * @return <code>this</code> for convenience
77 c677e1593919 Moved RevlogStream implementation into .internal Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 74 diff changeset	199 */
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	200 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	201 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	202 }
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
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 /**
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	205 * 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	206 *
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 * @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	208 * @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	209 * @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	210 * 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	211 * 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	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 * @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	214 */
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 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	216 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	217 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	218 followAncestry = followFileAncestry;
77 c677e1593919 Moved RevlogStream implementation into .internal Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 74 diff changeset	219 return this;
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	220 }
142 37a34044e6bd More reasonable use of path normalizer and path.source Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	221
37a34044e6bd More reasonable use of path normalizer and path.source Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	222 /**
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	223 * 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	224 * @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	225 */
37a34044e6bd More reasonable use of path normalizer and path.source Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	226 public HgLogCommand file(String file, boolean followCopyRename) {
37a34044e6bd More reasonable use of path normalizer and path.source Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	227 return file(Path.create(repo.getToRepoPathHelper().rewrite(file)), followCopyRename);
37a34044e6bd More reasonable use of path normalizer and path.source Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 133 diff changeset	228 }
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	229
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	230 /**
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	231 * 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	232 * @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	233 */
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	234 public HgLogCommand file(String file, 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	235 return file(Path.create(repo.getToRepoPathHelper().rewrite(file)), followCopyRename, 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	236 }
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	237
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 /**
419 7f136a3fa671 Clean javadoc to fix obvious warnings Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 418 diff changeset	239 * 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	240 *
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	241 * @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	242 * @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	243 */
396 0ae53c32ecef Straighten out exceptions thrown when file access failed - three is too much Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	244 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	245 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	246 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	247 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	248 } 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	249 // 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	250 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	251 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	252 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	253 } 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	254 // 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	255 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	256 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	257 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	258 }
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	259 return collector.getChanges();
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	260 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	261
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	262 /**
402 1fcc7f7b6d65 FIXMEs/javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	263 * 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	264 *
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	265 * @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	266 * @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	267 * @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	268 * @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	269 * @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	270 * @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	271 */
370 a2341e761609 Let callback implementations deliver errors (e,g. own exceptions) to client code Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 368 diff changeset	272 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	273 if (handler == null) {
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	274 throw new IllegalArgumentException();
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	275 }
193 37f3d4a596e4 Use common low to hi-level changeset api transformer Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 157 diff changeset	276 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	277 throw new ConcurrentModificationException();
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	278 }
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 final ProgressSupport progressHelper = getProgressSupport(handler);
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	280 try {
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	281 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	282 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	283 // 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	284 // 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	285 csetTransform = new ChangesetTransformer(repo, handler, pw, progressHelper, getCancelSupport(handler, true));
77 c677e1593919 Moved RevlogStream implementation into .internal Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 74 diff changeset	286 if (file == 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	287 progressHelper.start(endRev - startRev + 1);
77 c677e1593919 Moved RevlogStream implementation into .internal Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 74 diff changeset	288 repo.getChangelog().range(startRev, endRev, this);
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	289 csetTransform.checkFailure();
77 c677e1593919 Moved RevlogStream implementation into .internal Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 74 diff changeset	290 } else {
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	291 progressHelper.start(-1/XXX enum const, or a dedicated method startUnspecified(). How about startAtLeast(int)?/);
80 4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	292 HgDataFile fileNode = repo.getFileNode(file);
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	293 if (!fileNode.exists()) {
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	294 throw new HgPathNotFoundException(String.format("File %s not found in the repository", file), file);
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	295 }
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	296 // FIXME startRev and endRev ARE CHANGESET REVISIONS, not that of FILE!!!
80 4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	297 fileNode.history(startRev, endRev, this);
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	298 csetTransform.checkFailure();
514 5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	299 final HgFileRenameHandlerMixin withCopyHandler = Adaptable.Factory.getAdapter(handler, HgFileRenameHandlerMixin.class, null);
126 b92a638764be Dispatch chnagesets even if Handler is not FileHistoryHandler Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 107 diff changeset	300 if (fileNode.isCopy()) {
80 4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	301 // even if we do not follow history, report file rename
4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	302 do {
514 5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	303 if (withCopyHandler != null) {
415 ee8264d80747 Explicit constant for regular file flags, access to flags for a given file revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	304 HgFileRevision src = new HgFileRevision(repo, fileNode.getCopySourceRevision(), null, fileNode.getCopySourceName());
ee8264d80747 Explicit constant for regular file flags, access to flags for a given file revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 403 diff changeset	305 HgFileRevision dst = new HgFileRevision(repo, fileNode.getRevision(0), null, fileNode.getPath(), src.getPath());
514 5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	306 withCopyHandler.copy(src, dst);
126 b92a638764be Dispatch chnagesets even if Handler is not FileHistoryHandler Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 107 diff changeset	307 }
80 4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	308 if (limit > 0 && count >= limit) {
4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	309 // if limit reach, follow is useless.
4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	310 break;
4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	311 }
514 5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	312 if (followRenames) {
126 b92a638764be Dispatch chnagesets even if Handler is not FileHistoryHandler Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 107 diff changeset	313 fileNode = repo.getFileNode(fileNode.getCopySourceName());
80 4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	314 fileNode.history(this);
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	315 csetTransform.checkFailure();
80 4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	316 }
514 5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	317 } while (followRenames && fileNode.isCopy());
80 4222b04f34ee Follow history of a file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 77 diff changeset	318 }
77 c677e1593919 Moved RevlogStream implementation into .internal Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 74 diff changeset	319 }
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	320 } 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	321 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	322 } finally {
193 37f3d4a596e4 Use common low to hi-level changeset api transformer Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 157 diff changeset	323 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	324 progressHelper.done();
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	325 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	326 }
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	327
370 a2341e761609 Let callback implementations deliver errors (e,g. own exceptions) to client code Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 368 diff changeset	328 /**
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	329 * 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	330 * 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	331 * 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	332 *
1fcc7f7b6d65 FIXMEs/javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	333 * @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	334 * @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	335 * @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	336 * @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	337 * @throws CancelledException if execution of the command was cancelled
402 1fcc7f7b6d65 FIXMEs/javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	338 * @throws IllegalArgumentException if command is not satisfied with its arguments
1fcc7f7b6d65 FIXMEs/javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 396 diff changeset	339 * @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	340 */
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	341 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	342 if (handler == null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	343 throw new IllegalArgumentException();
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	344 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	345 if (csetTransform != null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	346 throw new ConcurrentModificationException();
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	347 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	348 if (file == null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	349 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	350 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	351 final ProgressSupport progressHelper = getProgressSupport(handler);
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	352 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	353 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	354
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	355
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	356 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	357
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	358 @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	359 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	360 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	361 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	362 }
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	363 };
508 ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	364
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	365 // 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	366 // i.e. if we iterate from new to old, recent filenames come first
514 5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	367 List<Pair<HgDataFile, Nodeid>> fileRenamesQueue = buildFileRenamesQueue();
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	368 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	369 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	370
514 5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	371 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	372 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	373 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	374 if (namesIndex > 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	375 dispatcher.connectWithLastJunctionPoint(renameInfo, fileRenamesQueue.get(namesIndex - 1), renameHandler);
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	376 }
514 5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	377 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	378 // there's at least one more name we are going to look at
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	379 dispatcher.updateJunctionPoint(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	380 } 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	381 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	382 }
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	383 dispatcher.dispatchAllChanges();
514 5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	384 } // for fileRenamesQueue;
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	385 progressHelper.done();
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	386 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	387
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	388 private IterateDirection iterateDirection = IterateDirection.FromOldToNew;
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	389
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	390 private static class ReverseIterator<E> implements Iterator<E> {
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	391 private final ListIterator<E> listIterator;
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	392
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	393 public ReverseIterator(List<E> list) {
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	394 listIterator = list.listIterator(list.size());
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	395 }
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	396
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	397 public boolean hasNext() {
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	398 return listIterator.hasPrevious();
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	399 }
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	400 public E next() {
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	401 return listIterator.previous();
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	402 }
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	403 public void remove() {
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	404 listIterator.remove();
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	405 }
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	406 }
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	407
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	408 /**
508 ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	409 * Follows file renames and build a list of all corresponding file nodes and revisions they were
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	410 * copied/renamed/branched at (IOW, their latest revision to look at).
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	411 *
514 5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	412 * If {@link #followRenames} is <code>false</code>, the list contains one element only,
508 ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	413 * file node with the name of the file as it was specified by the user.
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	414 *
514 5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	415 * For the most recent file revision depends on {@link #followAncestry}, and is file revision from working copy parent
5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	416 * in it's true. <code>null</code> indicates file's TIP revision shall be used.
508 ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	417 *
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	418 * TODO may use HgFileRevision (after some refactoring to accept HgDataFile and Nodeid) instead of Pair
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	419 * and possibly reuse this functionality
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	420 *
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	421 * @return list of file renames, ordered with respect to {@link #iterateDirection}
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	422 */
514 5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	423 private List<Pair<HgDataFile, Nodeid>> buildFileRenamesQueue() {
508 ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	424 LinkedList<Pair<HgDataFile, Nodeid>> rv = new LinkedList<Pair<HgDataFile, Nodeid>>();
514 5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	425 Nodeid startRev = null;
5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	426 HgDataFile fileNode = repo.getFileNode(file);
5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	427 if (followAncestry) {
5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	428 // TODO subject to dedicated method either in HgRepository (getWorkingCopyParentRevisionIndex)
5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	429 // or in the HgDataFile (getWorkingCopyOriginRevision)
5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	430 Nodeid wdParentChangeset = repo.getWorkingCopyParents().first();
5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	431 if (!wdParentChangeset.isNull()) {
5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	432 int wdParentRevIndex = repo.getChangelog().getRevisionIndex(wdParentChangeset);
5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	433 startRev = repo.getManifest().getFileRevision(wdParentRevIndex, fileNode.getPath());
5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	434 }
5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	435 // else fall-through, assume null (eventually, lastRevision()) is ok here
5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	436 }
5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	437 rv.add(new Pair<HgDataFile, Nodeid>(fileNode, startRev));
5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	438 if (!followRenames) {
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	439 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	440 }
514 5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	441 while (fileNode.isCopy()) {
5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	442 Path fp = fileNode.getCopySourceName();
5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	443 Nodeid copyRev = fileNode.getCopySourceRevision();
5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	444 fileNode = repo.getFileNode(fp);
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	445 Pair<HgDataFile, Nodeid> p = new Pair<HgDataFile, Nodeid>(fileNode, copyRev);
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	446 if (iterateDirection == IterateDirection.FromOldToNew) {
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	447 rv.addFirst(p);
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	448 } else {
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	449 assert iterateDirection == IterateDirection.FromNewToOld;
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	450 rv.addLast(p);
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	451 }
514 5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	452 };
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	453 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	454 }
508 ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	455
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	456 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	457 private final boolean followAncestry;
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	458
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	459 private HistoryNode[] completeHistory;
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	460 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	461 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	462
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	463 TreeBuildInspector(boolean _followAncestry) {
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	464 followAncestry = _followAncestry;
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	465 }
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	466
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	467 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	468 commitRevisions[revisionNumber] = linkedRevision;
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	469 }
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	470
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	471 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	472 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	473 // 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	474 if (parent1 != -1) {
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	475 p1 = completeHistory[parent1];
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	476 }
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	477 if (parent2!= -1) {
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	478 p2 = completeHistory[parent2];
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	479 }
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	480 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	481 }
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	482
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	483 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	484 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	485 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	486 }
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	487
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	488 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	489 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	490 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	491 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	492 }
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	493 // 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	494 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	495 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	496 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	497 // 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	498 // 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	499 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	500 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	501 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	502 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	503 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	504 }
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	505
508 ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	506 /**
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	507 * 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	508 * 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	509 * 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	510 *
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	511 * @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	512 * 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	513 */
514 5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	514 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	515 resultHistory = null;
514 5dcb4581c8ef Report renames when following file history tree with HgFileRenameHandlerMixin Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 511 diff changeset	516 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	517 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	518 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	519 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	520 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	521 // 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	522 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	523 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	524 // 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	525 // 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	526 return resultHistory;
508 ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	527 }
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	528 /*
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	529 * 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	530 * 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	531 * \| 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	532 * 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	533 * \| 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	534 * \|/
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	535 * 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	536 * \|
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	537 * 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	538 *
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	539 * 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	540 *
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	541 * 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	542 */
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	543 // 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	544 // 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	545 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	546 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	547 // 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	548 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	549 do {
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	550 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	551 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	552 // 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	553 // 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	554 continue;
122e0600799f Respect multiple joins/forks in a history of a single file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 510 diff changeset	555 }
508 ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	556 if (withFileChange.children != null) {
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	557 withFileChange.children.retainAll(strippedHistoryList);
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	558 }
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	559 strippedHistoryList.addFirst(withFileChange);
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	560 if (withFileChange.parent1 != null) {
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	561 queue.addLast(withFileChange.parent1);
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	562 }
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	563 if (withFileChange.parent2 != null) {
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	564 queue.addLast(withFileChange.parent2);
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	565 }
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	566 } 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	567 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	568
122e0600799f Respect multiple joins/forks in a history of a single file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 510 diff changeset	569 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	570 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	571 }
122e0600799f Respect multiple joins/forks in a history of a single file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 510 diff changeset	572 });
508 ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	573 completeHistory = null;
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	574 commitRevisions = null;
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	575 // 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	576 // 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	577 // 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	578 return resultHistory = strippedHistoryList;
508 ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	579 }
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	580
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	581 /**
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	582 * 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	583 */
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	584 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	585 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	586 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	587 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	588 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	589 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	590 }
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	591 }
508 ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	592 return commitRevisions;
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	593 }
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	594 };
ca5202afea90 Support follow history option when walking file history tree Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 507 diff changeset	595
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	596 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	597 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	598 // 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	599 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	600 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	601 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	602 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	603 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	604 // 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	605 // 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	606 private HistoryNode 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	607
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	608 // 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	609 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	610 // 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	611 // 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	612 // 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	613 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	614 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	615 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	616 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	617 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	618 // 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	619 // (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	620 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	621 }
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	622 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	623 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	624 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	625 // 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	626 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	627 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	628 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	629 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	630 } 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	631 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	632 }
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	633 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	634 // 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	635 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	636 }
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	637
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	638 public void updateJunctionPoint(Pair<HgDataFile, Nodeid> curRename, Pair<HgDataFile, Nodeid> nextRename) {
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	639 // 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	640 // curRename.second() points to 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	641 if (iterateDirection == IterateDirection.FromOldToNew) {
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	642 // 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	643 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	644 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	645 // 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	646 // 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	647 // 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	648 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	649 // 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	650 // 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	651 junctionNode = new HistoryNode(junctionSrc.changeset, junctionSrc.fileRevision, null, 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	652 } 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	653 assert iterateDirection == IterateDirection.FromNewToOld;
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	654 // 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	655 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	656 // 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	657 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	658 // 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	659 // 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	660 // 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	661 // 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	662 // 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	663 // 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	664 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	665 // 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	666 junctionNode = new HistoryNode(junctionDest.changeset, junctionDest.fileRevision, null, 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	667 }
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	668 }
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	669
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 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	671 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	672 }
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	673
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	674 public void connectWithLastJunctionPoint(Pair<HgDataFile, Nodeid> curRename, Pair<HgDataFile, Nodeid> prevRename, HgFileRenameHandlerMixin renameHandler) throws HgCallbackTargetException {
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	675 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	676 // A renamed to B. 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	677 if (iterateDirection == IterateDirection.FromOldToNew) {
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	678 // 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	679 // 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	680 // 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	681 // 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	682 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	683 // 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	684 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	685 if (renameHandler != null) { // shall report renames
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 HgFileRevision copiedFrom = new HgFileRevision(prevRename.first(), junctionNode.fileRevision, null); // "A", 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	687 HgFileRevision copiedTo = new HgFileRevision(curRename.first(), junctionDest.fileRevision, copiedFrom.getPath()); // "B", 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	688 renameHandler.copy(copiedFrom, copiedTo);
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 } 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	691 assert iterateDirection == IterateDirection.FromNewToOld;
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 // 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	693 // 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	694 // 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	695 // 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	696 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	697 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	698 if (renameHandler != 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	699 HgFileRevision copiedFrom = new HgFileRevision(curRename.first(), junctionSrc.fileRevision, null); // "A", 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	700 HgFileRevision copiedTo = new HgFileRevision(prevRename.first(), junctionNode.fileRevision, copiedFrom.getPath()); // "B", 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	701 renameHandler.copy(copiedFrom, copiedTo);
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 }
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	703 }
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	704 }
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	705
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	706 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	707 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	708 // 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	709 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	710 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	711 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	712 }
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	713 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	714 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	715 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	716 }
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	717 }
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	718 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	719 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	720 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	721 }
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	722
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	723 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	724
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	725 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	726 // 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	727 Iterator<HistoryNode> 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	728 if (iterateDirection == IterateDirection.FromOldToNew) {
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	729 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	730 } 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	731 assert iterateDirection == IterateDirection.FromNewToOld;
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	732 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	733 }
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	734 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	735 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	736 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	737 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	738 }
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	739 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	740 }
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	741
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	742 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	743 // 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	744 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	745 }
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	746 }
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	747
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	748
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	749 //
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	750
154 ba2bf656f00f Changeset => RawChangeset Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 148 diff changeset	751 public void next(int revisionNumber, Nodeid nodeid, RawChangeset cset) {
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	752 if (limit > 0 && count >= limit) {
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	753 return;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	754 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	755 if (branches != null && !branches.contains(cset.branch())) {
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	756 return;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	757 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	758 if (users != null) {
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	759 String csetUser = cset.user().toLowerCase();
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	760 boolean found = false;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	761 for (String u : users) {
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	762 if (csetUser.indexOf(u) != -1) {
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	763 found = true;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	764 break;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	765 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	766 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	767 if (!found) {
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	768 return;
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	769 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	770 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	771 if (date != null) {
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	772 // TODO post-1.0 implement date support for log
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	773 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	774 count++;
193 37f3d4a596e4 Use common low to hi-level changeset api transformer Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 157 diff changeset	775 csetTransform.next(revisionNumber, nodeid, cset);
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	776 }
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	777
432 1fc0da631200 Revlog.ParentWalker helper class got promoted as TLC, renamed to HgParentChildMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 431 diff changeset	778 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	779 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	780 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	781 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	782 }
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	783 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	784 }
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	785
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	786
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	787 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	788 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	789
129 645829962785 core.Cset renamed to HgChangeset; repo.Changeset moved into HgChangelog Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 126 diff changeset	790 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	791 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	792 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	793
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	794 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	795 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	796 }
19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	797 }
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	798
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	799 private static class HistoryNode {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	800 final int changeset;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	801 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	802 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	803 final HistoryNode parent2;
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	804 List<HistoryNode> children;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	805
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	806 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	807 changeset = cs;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	808 fileRevision = revision;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	809 parent1 = p1;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	810 parent2 = p2;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	811 if (p1 != null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	812 p1.addChild(this);
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	813 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	814 if (p2 != null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	815 p2.addChild(this);
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	816 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	817 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	818
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	819 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	820 if (children == null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	821 children = new ArrayList<HistoryNode>(2);
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	822 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	823 children.add(child);
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	824 }
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	825
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	826 /**
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	827 * method to merge two history chunks for renamed file so that
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	828 * this node's history continues with that of 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	829 * @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	830 */
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	831 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	832 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	833 // for the last element in history empty children are by construction:
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	834 // we don't iterate further than last element of interest in TreeBuildInspector#go
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	835 assert children == null \|\| children.isEmpty();
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	836 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	837 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	838 }
511 122e0600799f Respect multiple joins/forks in a history of a single file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 510 diff changeset	839
122e0600799f Respect multiple joins/forks in a history of a single file Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 510 diff changeset	840 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	841 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	842 }
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	843 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	844
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	845 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	846 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	847 private HgDataFile fileNode;
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	848 private Pair<HgChangeset, HgChangeset> parents;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	849 private List<HgChangeset> children;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	850 private IntMap<HgChangeset> cachedChangesets;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	851 private ChangesetTransformer.Transformation transform;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	852 private Nodeid changesetRevision;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	853 private Pair<Nodeid,Nodeid> parentRevisions;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	854 private List<Nodeid> childRevisions;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	855
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	856 public ElementImpl(int total) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	857 cachedChangesets = new IntMap<HgChangeset>(total);
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	858 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	859
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	860 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	861 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	862 fileNode = df;
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	863 parents = null;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	864 children = null;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	865 changesetRevision = null;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	866 parentRevisions = null;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	867 childRevisions = null;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	868 return this;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	869 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	870
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	871 public Nodeid fileRevision() {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	872 return historyNode.fileRevision;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	873 }
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	874
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	875 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	876 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	877 }
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	878
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	879 public HgChangeset changeset() {
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	880 return get(historyNode.changeset)[0];
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	881 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	882
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	883 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	884 if (parents != null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	885 return parents;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	886 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	887 HistoryNode p;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	888 final int p1, p2;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	889 if ((p = historyNode.parent1) != null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	890 p1 = p.changeset;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	891 } else {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	892 p1 = -1;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	893 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	894 if ((p = historyNode.parent2) != null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	895 p2 = p.changeset;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	896 } else {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	897 p2 = -1;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	898 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	899 HgChangeset[] r = get(p1, p2);
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	900 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	901 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	902
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	903 public Collection<HgChangeset> children() {
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	904 if (children != null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	905 return children;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	906 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	907 if (historyNode.children == null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	908 children = Collections.emptyList();
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	909 } else {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	910 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	911 int j = 0;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	912 for (HistoryNode hn : historyNode.children) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	913 childrentChangesetNumbers[j++] = hn.changeset;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	914 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	915 children = Arrays.asList(get(childrentChangesetNumbers));
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	916 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	917 return children;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	918 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	919
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	920 void populate(HgChangeset cs) {
403 2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	921 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	922 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	923
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	924 private HgChangeset[] get(int... changelogRevisionIndex) {
403 2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	925 HgChangeset[] rv = new HgChangeset[changelogRevisionIndex.length];
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	926 IntVector misses = new IntVector(changelogRevisionIndex.length, -1);
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	927 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	928 if (changelogRevisionIndex[i] == -1) {
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	929 rv[i] = null;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	930 continue;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	931 }
403 2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	932 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	933 if (cached != null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	934 rv[i] = cached;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	935 } else {
403 2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	936 misses.add(changelogRevisionIndex[i]);
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	937 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	938 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	939 if (misses.size() > 0) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	940 final int[] changesets2read = misses.toArray();
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	941 initTransform();
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	942 repo.getChangelog().range(this, changesets2read);
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	943 for (int changeset2read : changesets2read) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	944 HgChangeset cs = cachedChangesets.get(changeset2read);
403 2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	945 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	946 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	947 throw t.setRevisionIndex(changeset2read);
403 2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	948 }
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	949 // 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	950 // thus need to find original index
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	951 boolean sanity = false;
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	952 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	953 if (changelogRevisionIndex[i] == cs.getRevisionIndex()) {
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	954 rv[i] = cs;
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	955 sanity = true;
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	956 break;
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	957 }
403 2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	958 }
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	959 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	960 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	961 }
2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	962 assert sanity;
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	963 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	964 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	965 return rv;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	966 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	967
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	968 // 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	969 void initTransform() throws HgRuntimeException {
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	970 if (transform == null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	971 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	972 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	973 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	974
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	975 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	976 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	977 populate(cs.clone());
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	978 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	979
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	980 public Nodeid changesetRevision() {
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	981 if (changesetRevision == null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	982 changesetRevision = getRevision(historyNode.changeset);
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	983 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	984 return changesetRevision;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	985 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	986
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	987 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	988 if (parentRevisions == null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	989 HistoryNode p;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	990 final Nodeid p1, p2;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	991 if ((p = historyNode.parent1) != null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	992 p1 = getRevision(p.changeset);
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	993 } else {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	994 p1 = Nodeid.NULL;;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	995 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	996 if ((p = historyNode.parent2) != null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	997 p2 = getRevision(p.changeset);
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	998 } else {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	999 p2 = Nodeid.NULL;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1000 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1001 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	1002 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1003 return parentRevisions;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1004 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1005
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	1006 public Collection<Nodeid> childRevisions() {
328 a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1007 if (childRevisions != null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1008 return childRevisions;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1009 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1010 if (historyNode.children == null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1011 childRevisions = Collections.emptyList();
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1012 } else {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1013 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	1014 for (HistoryNode hn : historyNode.children) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1015 rv.add(getRevision(hn.changeset));
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1016 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1017 childRevisions = Collections.unmodifiableList(rv);
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1018 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1019 return childRevisions;
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1020 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1021
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1022 // 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	1023 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	1024 // 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	1025 HgChangeset cs = cachedChangesets.get(changelogRevisionNumber);
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1026 if (cs != null) {
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1027 return cs.getNodeid();
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1028 } else {
403 2747b0723867 FIXMEs: work on exceptions and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 402 diff changeset	1029 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	1030 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1031 }
a674b8590362 Move file tree history to upper API level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 322 diff changeset	1032 }
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	1033
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	1034 private enum 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	1035 FromOldToNew, FromNewToOld
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	1036 }
64 19e9e220bf68 Convenient commands constitute hi-level API. org.tmatesoft namespace, GPL2 statement Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	1037 }

Mercurial > hg4j

annotate src/org/tmatesoft/hg/core/HgLogCommand.java @ 516:0ae5768081aa