jhg: src/org/tmatesoft/hg/internal/RepositoryComparator.java annotate

annotate src/org/tmatesoft/hg/internal/RepositoryComparator.java @ 209:9ce3b26798c4

Few branches (distinct BranchChains from distinct heads) may end up with same nodes. Building BC structure fixed to reuse chain elements

author	Artem Tikhomirov <tikhomirov.artem@gmail.com>
date	Thu, 28 Apr 2011 03:44:45 +0200
parents	1bf0a5af2d5d
children	6a2481866491

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

Mercurial > jhg

annotate src/org/tmatesoft/hg/internal/RepositoryComparator.java @ 209:9ce3b26798c4