hg4j: hg4j/src/main/java/org/tmatesoft/hg/internal/RepositoryComparator.java annotate

annotate hg4j/src/main/java/org/tmatesoft/hg/internal/RepositoryComparator.java @ 213:6ec4af642ba8 gradle

Project uses Gradle for build - actual changes

author	Alexander Kitaev <kitaev@gmail.com>
date	Tue, 10 May 2011 10:52:53 +0200
parents
children

rev	line source
213 6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	1 /*
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	2 * Copyright (c) 2011 TMate Software Ltd
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	3 *
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	4 * This program is free software; you can redistribute it and/or modify
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	5 * it under the terms of the GNU General Public License as published by
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	6 * the Free Software Foundation; version 2 of the License.
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	7 *
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	8 * This program is distributed in the hope that it will be useful,
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	11 * GNU General Public License for more details.
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	12 *
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	13 * For information on how to redistribute this software under
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	14 * the terms of a license other than GNU General Public License
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	15 * contact TMate Software at support@hg4j.com
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	16 */
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	17 package org.tmatesoft.hg.internal;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	18
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	19 import static org.tmatesoft.hg.core.Nodeid.NULL;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	20
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	21 import java.util.ArrayList;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	22 import java.util.Collections;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	23 import java.util.HashMap;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	24 import java.util.HashSet;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	25 import java.util.LinkedList;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	26 import java.util.List;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	27 import java.util.ListIterator;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	28 import java.util.Map;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	29 import java.util.Map.Entry;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	30 import java.util.Set;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	31
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	32 import org.tmatesoft.hg.core.HgBadStateException;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	33 import org.tmatesoft.hg.core.HgException;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	34 import org.tmatesoft.hg.core.Nodeid;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	35 import org.tmatesoft.hg.repo.HgChangelog;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	36 import org.tmatesoft.hg.repo.HgRemoteRepository;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	37 import org.tmatesoft.hg.repo.HgRemoteRepository.Range;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	38 import org.tmatesoft.hg.repo.HgRemoteRepository.RemoteBranch;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	39 import org.tmatesoft.hg.util.CancelSupport;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	40 import org.tmatesoft.hg.util.CancelledException;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	41 import org.tmatesoft.hg.util.ProgressSupport;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	42
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	43 /**
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	44 *
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	45 * @author Artem Tikhomirov
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	46 * @author TMate Software Ltd.
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	47 */
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	48 public class RepositoryComparator {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	49
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	50 private final boolean debug = Boolean.parseBoolean(System.getProperty("hg4j.remote.debug"));
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	51 private final HgChangelog.ParentWalker localRepo;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	52 private final HgRemoteRepository remoteRepo;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	53 private List<Nodeid> common;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	54
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	55 public RepositoryComparator(HgChangelog.ParentWalker pwLocal, HgRemoteRepository hgRemote) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	56 localRepo = pwLocal;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	57 remoteRepo = hgRemote;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	58 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	59
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	60 public RepositoryComparator compare(Object context) throws HgException, CancelledException {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	61 ProgressSupport progressSupport = ProgressSupport.Factory.get(context);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	62 CancelSupport cancelSupport = CancelSupport.Factory.get(context);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	63 cancelSupport.checkCancelled();
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	64 progressSupport.start(10);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	65 common = Collections.unmodifiableList(findCommonWithRemote());
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	66 // sanity check
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	67 for (Nodeid n : common) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	68 if (!localRepo.knownNode(n)) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	69 throw new HgBadStateException("Unknown node reported as common:" + n);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	70 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	71 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	72 progressSupport.done();
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	73 return this;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	74 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	75
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	76 public List<Nodeid> getCommon() {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	77 if (common == null) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	78 throw new HgBadStateException("Call #compare(Object) first");
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	79 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	80 return common;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	81 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	82
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	83 /**
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	84 * @return revisions that are children of common entries, i.e. revisions that are present on the local server and not on remote.
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	85 */
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	86 public List<Nodeid> getLocalOnlyRevisions() {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	87 return localRepo.childrenOf(getCommon());
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	88 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	89
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	90 /**
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	91 * Similar to @link {@link #getLocalOnlyRevisions()}, use this one if you need access to changelog entry content, not
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	92 * only its revision number.
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	93 * @param inspector delegate to analyze changesets, shall not be <code>null</code>
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	94 */
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	95 public void visitLocalOnlyRevisions(HgChangelog.Inspector inspector) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	96 if (inspector == null) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	97 throw new IllegalArgumentException();
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	98 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	99 // one can use localRepo.childrenOf(getCommon()) and then iterate over nodeids, but there seems to be
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	100 // another approach to get all changes after common:
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	101 // find index of earliest revision, and report all that were later
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	102 final HgChangelog changelog = localRepo.getRepo().getChangelog();
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	103 int earliestRevision = Integer.MAX_VALUE;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	104 List<Nodeid> commonKnown = getCommon();
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	105 for (Nodeid n : commonKnown) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	106 if (!localRepo.hasChildren(n)) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	107 // there might be (old) nodes, known both locally and remotely, with no children
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	108 // hence, we don't need to consider their local revision number
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	109 continue;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	110 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	111 int lr = changelog.getLocalRevision(n);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	112 if (lr < earliestRevision) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	113 earliestRevision = lr;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	114 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	115 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	116 if (earliestRevision == Integer.MAX_VALUE) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	117 // either there are no common nodes (known locally and at remote)
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	118 // or no local children found (local is up to date). In former case, perhaps I shall bit return silently,
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	119 // but check for possible wrong repo comparison (hs says 'repository is unrelated' if I try to
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	120 // check in/out for a repo that has no common nodes.
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	121 return;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	122 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	123 if (earliestRevision < 0 \|\| earliestRevision >= changelog.getLastRevision()) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	124 throw new HgBadStateException(String.format("Invalid index of common known revision: %d in total of %d", earliestRevision, 1+changelog.getLastRevision()));
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	125 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	126 changelog.range(earliestRevision+1, changelog.getLastRevision(), inspector);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	127 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	128
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	129 private List<Nodeid> findCommonWithRemote() throws HgException {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	130 List<Nodeid> remoteHeads = remoteRepo.heads();
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	131 LinkedList<Nodeid> resultCommon = new LinkedList<Nodeid>(); // these remotes are known in local
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	132 LinkedList<Nodeid> toQuery = new LinkedList<Nodeid>(); // these need further queries to find common
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	133 for (Nodeid rh : remoteHeads) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	134 if (localRepo.knownNode(rh)) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	135 resultCommon.add(rh);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	136 } else {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	137 toQuery.add(rh);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	138 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	139 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	140 if (toQuery.isEmpty()) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	141 return resultCommon;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	142 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	143 LinkedList<RemoteBranch> checkUp2Head = new LinkedList<RemoteBranch>(); // branch.root and branch.head are of interest only.
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	144 // these are branches with unknown head but known root, which might not be the last common known,
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	145 // i.e. there might be children changeset that are also available at remote, [..?..common-head..remote-head] - need to
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	146 // scroll up to common head.
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	147 while (!toQuery.isEmpty()) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	148 List<RemoteBranch> remoteBranches = remoteRepo.branches(toQuery); //head, root, first parent, second parent
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	149 toQuery.clear();
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	150 while(!remoteBranches.isEmpty()) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	151 RemoteBranch rb = remoteBranches.remove(0);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	152 // I assume branches remote call gives branches with head equal to what I pass there, i.e.
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	153 // that I don't need to check whether rb.head is unknown.
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	154 if (localRepo.knownNode(rb.root)) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	155 // we known branch start, common head is somewhere in its descendants line
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	156 checkUp2Head.add(rb);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	157 } else {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	158 // dig deeper in the history, if necessary
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	159 if (!NULL.equals(rb.p1) && !localRepo.knownNode(rb.p1)) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	160 toQuery.add(rb.p1);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	161 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	162 if (!NULL.equals(rb.p2) && !localRepo.knownNode(rb.p2)) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	163 toQuery.add(rb.p2);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	164 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	165 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	166 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	167 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	168 // can't check nodes between checkUp2Head element and local heads, remote might have distinct descendants sequence
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	169 for (RemoteBranch rb : checkUp2Head) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	170 // rb.root is known locally
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	171 List<Nodeid> remoteRevisions = remoteRepo.between(rb.head, rb.root);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	172 if (remoteRevisions.isEmpty()) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	173 // head is immediate child
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	174 resultCommon.add(rb.root);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	175 } else {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	176 // between gives result from head to root, I'd like to go in reverse direction
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	177 Collections.reverse(remoteRevisions);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	178 Nodeid root = rb.root;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	179 while(!remoteRevisions.isEmpty()) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	180 Nodeid n = remoteRevisions.remove(0);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	181 if (localRepo.knownNode(n)) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	182 if (remoteRevisions.isEmpty()) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	183 // this is the last known node before an unknown
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	184 resultCommon.add(n);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	185 break;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	186 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	187 if (remoteRevisions.size() == 1) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	188 // there's only one left between known n and unknown head
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	189 // this check is to save extra between query, not really essential
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	190 Nodeid last = remoteRevisions.remove(0);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	191 resultCommon.add(localRepo.knownNode(last) ? last : n);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	192 break;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	193 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	194 // might get handy for next between query, to narrow search down
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	195 root = n;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	196 } else {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	197 remoteRevisions = remoteRepo.between(n, root);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	198 Collections.reverse(remoteRevisions);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	199 if (remoteRevisions.isEmpty()) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	200 resultCommon.add(root);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	201 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	202 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	203 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	204 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	205 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	206 // TODO ensure unique elements in the list
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	207 return resultCommon;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	208 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	209
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	210 // somewhat similar to Outgoing.findCommonWithRemote()
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	211 public List<BranchChain> calculateMissingBranches() throws HgException {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	212 List<Nodeid> remoteHeads = remoteRepo.heads();
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	213 LinkedList<Nodeid> common = new LinkedList<Nodeid>(); // these remotes are known in local
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	214 LinkedList<Nodeid> toQuery = new LinkedList<Nodeid>(); // these need further queries to find common
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	215 for (Nodeid rh : remoteHeads) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	216 if (localRepo.knownNode(rh)) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	217 common.add(rh);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	218 } else {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	219 toQuery.add(rh);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	220 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	221 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	222 if (toQuery.isEmpty()) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	223 return Collections.emptyList(); // no incoming changes
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	224 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	225 LinkedList<BranchChain> branches2load = new LinkedList<BranchChain>(); // return value
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	226 // detailed comments are in Outgoing.findCommonWithRemote
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	227 LinkedList<RemoteBranch> checkUp2Head = new LinkedList<RemoteBranch>();
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	228 // records relation between branch head and its parent branch, if any
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	229 HashMap<Nodeid, BranchChain> head2chain = new HashMap<Nodeid, BranchChain>();
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	230 while (!toQuery.isEmpty()) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	231 List<RemoteBranch> remoteBranches = remoteRepo.branches(toQuery); //head, root, first parent, second parent
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	232 toQuery.clear();
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	233 while(!remoteBranches.isEmpty()) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	234 RemoteBranch rb = remoteBranches.remove(0);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	235 BranchChain chainElement = head2chain.get(rb.head);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	236 if (chainElement == null) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	237 chainElement = new BranchChain(rb.head);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	238 // record this unknown branch to download later
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	239 branches2load.add(chainElement);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	240 // the only chance we'll need chainElement in the head2chain is when we know this branch's root
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	241 head2chain.put(rb.head, chainElement);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	242 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	243 if (localRepo.knownNode(rb.root)) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	244 // we known branch start, common head is somewhere in its descendants line
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	245 checkUp2Head.add(rb);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	246 } else {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	247 chainElement.branchRoot = rb.root;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	248 // dig deeper in the history, if necessary
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	249 boolean hasP1 = !NULL.equals(rb.p1), hasP2 = !NULL.equals(rb.p2);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	250 if (hasP1 && !localRepo.knownNode(rb.p1)) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	251 toQuery.add(rb.p1);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	252 // we might have seen parent node already, and recorded it as a branch chain
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	253 // we shall reuse existing BC to get it completely initializer (head2chain map
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	254 // on second put with the same key would leave first BC uninitialized.
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	255
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	256 // It seems there's no reason to be affraid (XXX although shall double-check)
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	257 // that BC's chain would get corrupt (its p1 and p2 fields assigned twice with different values)
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	258 // as parents are always the same (and likely, BC that is common would be the last unknown)
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	259 BranchChain bc = head2chain.get(rb.p1);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	260 if (bc == null) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	261 head2chain.put(rb.p1, bc = new BranchChain(rb.p1));
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	262 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	263 chainElement.p1 = bc;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	264 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	265 if (hasP2 && !localRepo.knownNode(rb.p2)) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	266 toQuery.add(rb.p2);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	267 BranchChain bc = head2chain.get(rb.p2);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	268 if (bc == null) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	269 head2chain.put(rb.p2, bc = new BranchChain(rb.p2));
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	270 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	271 chainElement.p2 = bc;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	272 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	273 if (!hasP1 && !hasP2) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	274 // special case, when we do incoming against blank repository, chainElement.branchRoot
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	275 // is first unknown element (revision 0). We need to add another fake BranchChain
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	276 // to fill the promise that terminal BranchChain has branchRoot that is known both locally and remotely
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	277 BranchChain fake = new BranchChain(NULL);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	278 fake.branchRoot = NULL;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	279 chainElement.p1 = chainElement.p2 = fake;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	280 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	281 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	282 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	283 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	284 for (RemoteBranch rb : checkUp2Head) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	285 Nodeid h = rb.head;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	286 Nodeid r = rb.root;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	287 int watchdog = 1000;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	288 assert head2chain.containsKey(h);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	289 BranchChain bc = head2chain.get(h);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	290 assert bc != null : h.toString();
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	291 // if we know branch root locally, there could be no parent branch chain elements.
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	292 assert bc.p1 == null;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	293 assert bc.p2 == null;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	294 do {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	295 List<Nodeid> between = remoteRepo.between(h, r);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	296 if (between.isEmpty()) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	297 bc.branchRoot = r;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	298 break;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	299 } else {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	300 Collections.reverse(between);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	301 for (Nodeid n : between) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	302 if (localRepo.knownNode(n)) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	303 r = n;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	304 } else {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	305 h = n;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	306 break;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	307 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	308 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	309 Nodeid lastInBetween = between.get(between.size() - 1);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	310 if (r.equals(lastInBetween)) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	311 bc.branchRoot = r;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	312 break;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	313 } else if (h.equals(lastInBetween)) { // the only chance for current head pointer to point to the sequence tail
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	314 // is when r is second from the between list end (iow, head,1,[2],4,8...,root)
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	315 bc.branchRoot = r;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	316 break;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	317 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	318 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	319 } while(--watchdog > 0);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	320 if (watchdog == 0) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	321 throw new HgBadStateException(String.format("Can't narrow down branch [%s, %s]", rb.head.shortNotation(), rb.root.shortNotation()));
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	322 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	323 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	324 if (debug) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	325 System.out.println("calculateMissingBranches:");
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	326 for (BranchChain bc : branches2load) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	327 bc.dump();
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	328 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	329 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	330 return branches2load;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	331 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	332
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	333 // root and head (and all between) are unknown for each chain element but last (terminal), which has known root (revision
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	334 // known to be locally and at remote server
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	335 // alternative would be to keep only unknown elements (so that promise of calculateMissingBranches would be 100% true), but that
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	336 // seems to complicate the method, while being useful only for the case when we ask incoming for an empty repository (i.e.
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	337 // where branch chain return all nodes, -1..tip.
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	338 public static final class BranchChain {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	339 // when we construct a chain, we know head which is missing locally, hence init it right away.
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	340 // as for root (branch unknown start), we might happen to have one locally, and need further digging to find out right branch start
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	341 public final Nodeid branchHead;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	342 public Nodeid branchRoot;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	343 // either of these can be null, or both.
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	344 // although RemoteBranch has either both parents null, or both non-null, when we construct a chain
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	345 // we might encounter that we locally know one of branch's parent, hence in the chain corresponding field will be blank.
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	346 public BranchChain p1;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	347 public BranchChain p2;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	348
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	349 public BranchChain(Nodeid head) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	350 assert head != null;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	351 branchHead = head;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	352 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	353 public boolean isTerminal() {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	354 return p1 == null && p2 == null; // either can be null, see comment above. Terminal is only when no way to descent
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	355 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	356
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	357 // true when this BranchChain is a branch that spans up to very start of the repository
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	358 // Thus, the only common revision is NULL, recorded in a fake BranchChain object shared between p1 and p2
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	359 /package-local/ boolean isRepoStart() {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	360 return p1 == p2 && p1 != null && p1.branchHead == p1.branchRoot && NULL.equals(p1.branchHead);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	361 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	362
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	363 @Override
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	364 public String toString() {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	365 return String.format("BranchChain [%s, %s]", branchRoot, branchHead);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	366 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	367
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	368 void dump() {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	369 System.out.println(toString());
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	370 internalDump(" ");
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	371 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	372
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	373 private void internalDump(String prefix) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	374 if (p1 != null) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	375 System.out.println(prefix + p1.toString());
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	376 } else if (p2 != null) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	377 System.out.println(prefix + "NONE?!");
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	378 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	379 if (p2 != null) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	380 System.out.println(prefix + p2.toString());
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	381 } else if (p1 != null) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	382 System.out.println(prefix + "NONE?!");
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	383 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	384 prefix += " ";
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	385 if (p1 != null) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	386 p1.internalDump(prefix);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	387 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	388 if (p2 != null) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	389 p2.internalDump(prefix);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	390 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	391 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	392 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	393
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	394 /**
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	395 * @return list of nodeids from branchRoot to branchHead, inclusive. IOW, first element of the list is always root of the branch
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	396 */
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	397 public List<Nodeid> completeBranch(final Nodeid branchRoot, final Nodeid branchHead) throws HgException {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	398 class DataEntry {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	399 public final Nodeid queryHead;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	400 public final int headIndex;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	401 public List<Nodeid> entries;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	402
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	403 public DataEntry(Nodeid head, int index, List<Nodeid> data) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	404 queryHead = head;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	405 headIndex = index;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	406 entries = data;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	407 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	408 };
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	409
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	410 List<Nodeid> initial = remoteRepo.between(branchHead, branchRoot);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	411 Nodeid[] result = new Nodeid[1 + (1 << initial.size())];
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	412 result[0] = branchHead;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	413 int rootIndex = -1; // index in the result, where to place branche's root.
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	414 if (initial.isEmpty()) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	415 rootIndex = 1;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	416 } else if (initial.size() == 1) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	417 rootIndex = 2;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	418 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	419 LinkedList<DataEntry> datas = new LinkedList<DataEntry>();
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	420 // DataEntry in datas has entries list filled with 'between' data, whereas
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	421 // DataEntry in toQuery keeps only nodeid and its index, with entries to be initialized before
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	422 // moving to datas.
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	423 LinkedList<DataEntry> toQuery = new LinkedList<DataEntry>();
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	424 //
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	425 datas.add(new DataEntry(branchHead, 0, initial));
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	426 int totalQueries = 1;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	427 HashSet<Nodeid> queried = new HashSet<Nodeid>();
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	428 while(!datas.isEmpty()) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	429 // keep record of those planned to be queried next time we call between()
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	430 // although may keep these in queried, if really don't want separate collection
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	431 HashSet<Nodeid> scheduled = new HashSet<Nodeid>();
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	432 do {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	433 DataEntry de = datas.removeFirst();
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	434 // populate result with discovered elements between de.qiueryRoot and branch's head
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	435 for (int i = 1, j = 0; j < de.entries.size(); i = i << 1, j++) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	436 int idx = de.headIndex + i;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	437 result[idx] = de.entries.get(j);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	438 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	439 // form next query entries from new unknown elements
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	440 if (de.entries.size() > 1) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	441 /* when entries has only one element, it means de.queryRoot was at head-2 position, and thus
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	442 * no new information can be obtained. E.g. when it's 2, it might be case of [0..4] query with
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	443 * [1,2] result, and we need one more query to get element 3.
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	444 */
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	445 for (int i =1, j = 0; j < de.entries.size(); i = i<<1, j++) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	446 int idx = de.headIndex + i;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	447 Nodeid x = de.entries.get(j);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	448 if (!queried.contains(x) && !scheduled.contains(x) && (rootIndex == -1 \|\| rootIndex - de.headIndex > 1)) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	449 /queries for elements right before head is senseless, but unless we know head's index, do it anyway/
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	450 toQuery.add(new DataEntry(x, idx, null));
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	451 scheduled.add(x);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	452 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	453 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	454 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	455 } while (!datas.isEmpty());
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	456 if (!toQuery.isEmpty()) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	457 totalQueries++;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	458 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	459 // for each query, create an between request range, keep record Range->DataEntry to know range's start index
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	460 LinkedList<HgRemoteRepository.Range> betweenBatch = new LinkedList<HgRemoteRepository.Range>();
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	461 HashMap<HgRemoteRepository.Range, DataEntry> rangeToEntry = new HashMap<HgRemoteRepository.Range, DataEntry>();
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	462 for (DataEntry de : toQuery) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	463 queried.add(de.queryHead);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	464 HgRemoteRepository.Range r = new HgRemoteRepository.Range(branchRoot, de.queryHead);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	465 betweenBatch.add(r);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	466 rangeToEntry.put(r, de);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	467 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	468 if (!betweenBatch.isEmpty()) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	469 Map<Range, List<Nodeid>> between = remoteRepo.between(betweenBatch);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	470 for (Entry<Range, List<Nodeid>> e : between.entrySet()) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	471 DataEntry de = rangeToEntry.get(e.getKey());
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	472 assert de != null;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	473 de.entries = e.getValue();
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	474 if (rootIndex == -1 && de.entries.size() == 1) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	475 // returned sequence of length 1 means we used element from [head-2] as root
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	476 int numberOfElementsExcludingRootAndHead = de.headIndex + 1;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	477 rootIndex = numberOfElementsExcludingRootAndHead + 1;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	478 if (debug) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	479 System.out.printf("On query %d found out exact number of missing elements: %d\n", totalQueries, numberOfElementsExcludingRootAndHead);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	480 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	481 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	482 datas.add(de); // queue up to record result and construct further requests
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	483 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	484 betweenBatch.clear();
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	485 rangeToEntry.clear();
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	486 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	487 toQuery.clear();
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	488 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	489 if (rootIndex == -1) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	490 throw new HgBadStateException("Shall not happen, provided between output is correct"); // FIXME
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	491 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	492 result[rootIndex] = branchRoot;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	493 boolean resultOk = true;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	494 LinkedList<Nodeid> fromRootToHead = new LinkedList<Nodeid>();
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	495 for (int i = 0; i <= rootIndex; i++) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	496 Nodeid n = result[i];
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	497 if (n == null) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	498 System.out.printf("ERROR: element %d wasn't found\n",i);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	499 resultOk = false;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	500 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	501 fromRootToHead.addFirst(n); // reverse order
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	502 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	503 if (debug) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	504 System.out.println("Total queries:" + totalQueries);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	505 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	506 if (!resultOk) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	507 throw new HgBadStateException("See console for details"); // FIXME
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	508 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	509 return fromRootToHead;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	510 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	511
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	512 /**
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	513 * returns in order from branch root to head
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	514 * for a non-empty BranchChain, shall return modifiable list
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	515 */
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	516 public List<Nodeid> visitBranches(BranchChain bc) throws HgException {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	517 if (bc == null) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	518 return Collections.emptyList();
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	519 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	520 List<Nodeid> mine = completeBranch(bc.branchRoot, bc.branchHead);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	521 if (bc.isTerminal() \|\| bc.isRepoStart()) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	522 return mine;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	523 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	524 List<Nodeid> parentBranch1 = visitBranches(bc.p1);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	525 List<Nodeid> parentBranch2 = visitBranches(bc.p2);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	526 // merge
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	527 LinkedList<Nodeid> merged = new LinkedList<Nodeid>();
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	528 ListIterator<Nodeid> i1 = parentBranch1.listIterator(), i2 = parentBranch2.listIterator();
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	529 while (i1.hasNext() && i2.hasNext()) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	530 Nodeid n1 = i1.next();
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	531 Nodeid n2 = i2.next();
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	532 if (n1.equals(n2)) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	533 merged.addLast(n1);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	534 } else {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	535 // first different => add both, and continue adding both tails sequentially
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	536 merged.add(n2);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	537 merged.add(n1);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	538 break;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	539 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	540 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	541 // copy rest of second parent branch
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	542 while (i2.hasNext()) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	543 merged.add(i2.next());
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	544 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	545 // copy rest of first parent branch
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	546 while (i1.hasNext()) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	547 merged.add(i1.next());
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	548 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	549 //
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	550 ArrayList<Nodeid> rv = new ArrayList<Nodeid>(mine.size() + merged.size());
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	551 rv.addAll(merged);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	552 rv.addAll(mine);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	553 return rv;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	554 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	555
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	556 public void collectKnownRoots(BranchChain bc, Set<Nodeid> result) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	557 if (bc == null) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	558 return;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	559 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	560 if (bc.isTerminal()) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	561 result.add(bc.branchRoot);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	562 return;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	563 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	564 if (bc.isRepoStart()) {
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	565 return;
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	566 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	567 collectKnownRoots(bc.p1, result);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	568 collectKnownRoots(bc.p2, result);
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	569 }
6ec4af642ba8 Project uses Gradle for build - actual changes Alexander Kitaev <kitaev@gmail.com> parents: diff changeset	570 }

Mercurial > hg4j

annotate hg4j/src/main/java/org/tmatesoft/hg/internal/RepositoryComparator.java @ 213:6ec4af642ba8 gradle