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

annotate src/org/tmatesoft/hg/internal/RepositoryComparator.java @ 566:32453f30de07 v1.1m3

Annotate command with command-line example

author	Artem Tikhomirov <tikhomirov.artem@gmail.com>
date	Tue, 09 Apr 2013 19:25:34 +0200
parents	1fc0da631200
children	6526d8adbc0f

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 /*
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 423 diff changeset	2 * Copyright (c) 2011-2012 TMate Software Ltd
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	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;
423 9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	22 import java.util.Arrays;
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	23 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	24 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	25 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	26 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	27 import java.util.List;
192 e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	28 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	29 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	30 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	31 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	32
215 41a778e3fd31 Issue 5: Facilities for progress and cancellation. More specific exceptions. Exceptions from callbacks as RuntimeException Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 210 diff changeset	33 import org.tmatesoft.hg.core.HgRemoteConnectionException;
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	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;
423 9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	36 import org.tmatesoft.hg.repo.HgInvalidControlFileException;
9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	37 import org.tmatesoft.hg.repo.HgInvalidStateException;
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	38 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	39 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	40 import org.tmatesoft.hg.repo.HgRemoteRepository.RemoteBranch;
432 1fc0da631200 Revlog.ParentWalker helper class got promoted as TLC, renamed to HgParentChildMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	41 import org.tmatesoft.hg.repo.HgParentChildMap;
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	42 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	43 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	44 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	45
cd3371670f0b Refactor incoming and outgoing code 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 /**
cd3371670f0b Refactor incoming and outgoing code 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 * @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	49 * @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	50 */
cd3371670f0b Refactor incoming and outgoing code 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 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	52
206 63c9fed4369e Sample command line tools for incoming/outgoing to use commands Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 203 diff changeset	53 private final boolean debug = Boolean.parseBoolean(System.getProperty("hg4j.remote.debug"));
432 1fc0da631200 Revlog.ParentWalker helper class got promoted as TLC, renamed to HgParentChildMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	54 private final HgParentChildMap<HgChangelog> localRepo;
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	55 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	56 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	57
432 1fc0da631200 Revlog.ParentWalker helper class got promoted as TLC, renamed to HgParentChildMap Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 425 diff changeset	58 public RepositoryComparator(HgParentChildMap<HgChangelog> pwLocal, HgRemoteRepository hgRemote) {
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	59 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	60 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	61 }
cd3371670f0b Refactor incoming and outgoing code 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
215 41a778e3fd31 Issue 5: Facilities for progress and cancellation. More specific exceptions. Exceptions from callbacks as RuntimeException Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 210 diff changeset	63 public RepositoryComparator compare(ProgressSupport progressSupport, CancelSupport cancelSupport) throws HgRemoteConnectionException, CancelledException {
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	64 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	65 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	66 common = Collections.unmodifiableList(findCommonWithRemote());
192 e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	67 // sanity check
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	68 for (Nodeid n : common) {
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	69 if (!localRepo.knownNode(n)) {
423 9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	70 throw new HgInvalidStateException("Unknown node reported as common:" + n);
192 e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	71 }
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	72 }
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	73 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	74 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	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
cd3371670f0b Refactor incoming and outgoing code 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 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	78 if (common == null) {
423 9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	79 throw new HgInvalidStateException("Call #compare(Object) first");
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	80 }
cd3371670f0b Refactor incoming and outgoing code 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 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	82 }
192 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 /**
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	85 * @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	86 */
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	87 public List<Nodeid> getLocalOnlyRevisions() {
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	88 return localRepo.childrenOf(getCommon());
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 /**
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	92 * 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	93 * only its revision number.
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	94 * @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	95 */
354 5f9073eabf06 Propagate errors with exceptions up to a end client Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 295 diff changeset	96 public void visitLocalOnlyRevisions(HgChangelog.Inspector inspector) throws HgInvalidControlFileException {
192 e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	97 if (inspector == null) {
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	98 throw new IllegalArgumentException();
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	99 }
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	100 // 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	101 // 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	102 // 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	103 final HgChangelog changelog = localRepo.getRepo().getChangelog();
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	104 int earliestRevision = Integer.MAX_VALUE;
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	105 List<Nodeid> commonKnown = getCommon();
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	106 for (Nodeid n : commonKnown) {
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	107 if (!localRepo.hasChildren(n)) {
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	108 // 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	109 // 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	110 continue;
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	111 }
367 2fadf8695f8a Use 'revision index' instead of the vague 'local revision number' concept in the API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 354 diff changeset	112 int lr = changelog.getRevisionIndex(n);
192 e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	113 if (lr < earliestRevision) {
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	114 earliestRevision = lr;
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	115 }
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	116 }
203 66fd2c73c56f Basic test for HgOutgoingCommand. Handle cases with no outgoing changes in RepositoryComparator Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 202 diff changeset	117 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	118 // 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	119 // 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	120 // 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	121 // 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	122 return;
66fd2c73c56f Basic test for HgOutgoingCommand. Handle cases with no outgoing changes in RepositoryComparator Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 202 diff changeset	123 }
192 e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	124 if (earliestRevision < 0 \|\| earliestRevision >= changelog.getLastRevision()) {
423 9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	125 throw new HgInvalidStateException(String.format("Invalid index of common known revision: %d in total of %d", earliestRevision, 1+changelog.getLastRevision()));
192 e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	126 }
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	127 changelog.range(earliestRevision+1, changelog.getLastRevision(), inspector);
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	128 }
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	129
215 41a778e3fd31 Issue 5: Facilities for progress and cancellation. More specific exceptions. Exceptions from callbacks as RuntimeException Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 210 diff changeset	130 private List<Nodeid> findCommonWithRemote() throws HgRemoteConnectionException {
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	131 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	132 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	133 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	134 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	135 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	136 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	137 } 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	138 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	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 }
cd3371670f0b Refactor incoming and outgoing code 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 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	142 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	143 }
cd3371670f0b Refactor incoming and outgoing code 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 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	145 // 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	146 // 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	147 // 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	148 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	149 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	150 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	151 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	152 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	153 // 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	154 // 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	155 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	156 // 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	157 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	158 } 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	159 // dig deeper in the history, if necessary
274 9fb50c04f03c Use Nodeid.isNull check instead of NULL.equals Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 215 diff changeset	160 if (!rb.p1.isNull() && !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	161 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	162 }
274 9fb50c04f03c Use Nodeid.isNull check instead of NULL.equals Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 215 diff changeset	163 if (!rb.p2.isNull() && !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	164 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	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 }
cd3371670f0b Refactor incoming and outgoing code 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 // 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	170 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	171 // 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	172 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	173 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	174 // 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	175 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	176 } 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	177 // 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	178 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	179 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	180 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	181 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	182 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	183 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	184 // 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	185 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	186 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	187 }
cd3371670f0b Refactor incoming and outgoing code 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 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	189 // 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	190 // 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	191 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	192 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	193 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	194 }
cd3371670f0b Refactor incoming and outgoing code 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 // 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	196 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	197 } 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	198 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	199 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	200 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	201 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	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 }
cd3371670f0b Refactor incoming and outgoing code 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 // 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	208 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	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
cd3371670f0b Refactor incoming and outgoing code 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 // somewhat similar to Outgoing.findCommonWithRemote()
215 41a778e3fd31 Issue 5: Facilities for progress and cancellation. More specific exceptions. Exceptions from callbacks as RuntimeException Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 210 diff changeset	212 public List<BranchChain> calculateMissingBranches() throws HgRemoteConnectionException {
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	213 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	214 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	215 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	216 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	217 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	218 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	219 } 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	220 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	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 }
cd3371670f0b Refactor incoming and outgoing code 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 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	224 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	225 }
cd3371670f0b Refactor incoming and outgoing code 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 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	227 // 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	228 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	229 // 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	230 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	231 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	232 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	233 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	234 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	235 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	236 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	237 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	238 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	239 // 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	240 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	241 // 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	242 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	243 }
cd3371670f0b Refactor incoming and outgoing code 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 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	245 // 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	246 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	247 } 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	248 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	249 // dig deeper in the history, if necessary
274 9fb50c04f03c Use Nodeid.isNull check instead of NULL.equals Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 215 diff changeset	250 boolean hasP1 = !rb.p1.isNull(), hasP2 = !rb.p2.isNull();
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	251 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	252 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	253 // 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	254 // 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	255 // 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	256
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 // 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	258 // 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	259 // 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	260 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	261 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	262 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	263 }
210 6a2481866491 Wrong parent assignment when building branch chain Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 209 diff changeset	264 chainElement.p1 = 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	265 }
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	266 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	267 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	268 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	269 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	270 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	271 }
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	272 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	273 }
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	274 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	275 // 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	276 // 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	277 // 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	278 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	279 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	280 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	281 }
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	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 }
cd3371670f0b Refactor incoming and outgoing code 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 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	286 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	287 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	288 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	289 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	290 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	291 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	292 // 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	293 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	294 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	295 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	296 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	297 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	298 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	299 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	300 } 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	301 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	302 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	303 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	304 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	305 } 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	306 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	307 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	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 }
cd3371670f0b Refactor incoming and outgoing code 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 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	311 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	312 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	313 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	314 } 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	315 // 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	316 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	317 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	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 }
cd3371670f0b Refactor incoming and outgoing code 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 } 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	321 if (watchdog == 0) {
423 9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	322 throw new HgInvalidStateException(String.format("Can't narrow down branch [%s, %s]", rb.head.shortNotation(), rb.root.shortNotation()));
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	323 }
cd3371670f0b Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	324 }
206 63c9fed4369e Sample command line tools for incoming/outgoing to use commands Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 203 diff changeset	325 if (debug) {
207 1bf0a5af2d5d Conditional debug printouts Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 206 diff changeset	326 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	327 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	328 bc.dump();
63c9fed4369e Sample command line tools for incoming/outgoing to use commands Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 203 diff changeset	329 }
63c9fed4369e Sample command line tools for incoming/outgoing to use commands Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 203 diff changeset	330 }
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	331 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	332 }
cd3371670f0b Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	333
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	334 // 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	335 // 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	336 // 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	337 // 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	338 // 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	339 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	340 // 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	341 // 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	342 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	343 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	344 // 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	345 // 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	346 // 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	347 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	348 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	349
cd3371670f0b Refactor incoming and outgoing code 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 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	351 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	352 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	353 }
cd3371670f0b Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	354 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	355 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	356 }
cd3371670f0b Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	357
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	358 // 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	359 // 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	360 /package-local/ boolean isRepoStart() {
274 9fb50c04f03c Use Nodeid.isNull check instead of NULL.equals Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 215 diff changeset	361 return p1 == p2 && p1 != null && p1.branchHead == p1.branchRoot && p1.branchHead.isNull();
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	362 }
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	363
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	364 @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	365 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	366 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	367 }
cd3371670f0b Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	368
206 63c9fed4369e Sample command line tools for incoming/outgoing to use commands Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 203 diff changeset	369 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	370 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	371 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	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
cd3371670f0b Refactor incoming and outgoing code 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 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	375 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	376 System.out.println(prefix + p1.toString());
210 6a2481866491 Wrong parent assignment when building branch chain Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 209 diff changeset	377 } else if (p2 != null) {
6a2481866491 Wrong parent assignment when building branch chain Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 209 diff changeset	378 System.out.println(prefix + "NONE?!");
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	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 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	381 System.out.println(prefix + p2.toString());
210 6a2481866491 Wrong parent assignment when building branch chain Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 209 diff changeset	382 } else if (p1 != null) {
6a2481866491 Wrong parent assignment when building branch chain Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 209 diff changeset	383 System.out.println(prefix + "NONE?!");
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	384 }
cd3371670f0b Refactor incoming and outgoing code 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 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 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	387 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	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 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	390 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	391 }
cd3371670f0b Refactor incoming and outgoing code 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 }
cd3371670f0b Refactor incoming and outgoing code 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
cd3371670f0b Refactor incoming and outgoing code 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 /**
cd3371670f0b Refactor incoming and outgoing code 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 * @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	397 */
295 981f9f50bb6c Issue 11: Error log facility. SessionContext to share common facilities Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	398 public List<Nodeid> completeBranch(final Nodeid branchRoot, final Nodeid branchHead) throws HgRemoteConnectionException {
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	399 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	400 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	401 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	402 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	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 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	405 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	406 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	407 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	408 }
cd3371670f0b Refactor incoming and outgoing code 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 };
cd3371670f0b Refactor incoming and outgoing code 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
cd3371670f0b Refactor incoming and outgoing code 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 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	412 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	413 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	414 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	415 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	416 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	417 } 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	418 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	419 }
cd3371670f0b Refactor incoming and outgoing code 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 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	421 // 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	422 // 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	423 // 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	424 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	425 //
cd3371670f0b Refactor incoming and outgoing code 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 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	427 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	428 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	429 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	430 // 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	431 // 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	432 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	433 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	434 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	435 // 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	436 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	437 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	438 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	439 }
cd3371670f0b Refactor incoming and outgoing code 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 // 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	441 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	442 /* 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	443 * 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	444 * [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	445 */
cd3371670f0b Refactor incoming and outgoing code 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 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	447 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	448 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	449 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	450 /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	451 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	452 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	453 }
cd3371670f0b Refactor incoming and outgoing code 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 }
cd3371670f0b Refactor incoming and outgoing code 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 } 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	457 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	458 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	459 }
cd3371670f0b Refactor incoming and outgoing code 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 // 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	461 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	462 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	463 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	464 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	465 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	466 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	467 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	468 }
cd3371670f0b Refactor incoming and outgoing code 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 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	470 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	471 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	472 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	473 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	474 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	475 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	476 // 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	477 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	478 rootIndex = numberOfElementsExcludingRootAndHead + 1;
207 1bf0a5af2d5d Conditional debug printouts Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 206 diff changeset	479 if (debug) {
1bf0a5af2d5d Conditional debug printouts Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 206 diff changeset	480 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	481 }
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	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 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	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 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	486 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	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 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	489 }
cd3371670f0b Refactor incoming and outgoing code 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 if (rootIndex == -1) {
425 48f993aa2f41 FIXMEs: exceptions, javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 423 diff changeset	491 throw new HgInvalidStateException("Shall not happen, provided between output is correct");
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	492 }
cd3371670f0b Refactor incoming and outgoing code 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 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	494 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	495 LinkedList<Nodeid> fromRootToHead = new LinkedList<Nodeid>();
423 9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	496 IntVector missing = new IntVector();
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	497 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	498 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	499 if (n == null) {
423 9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	500 missing.add(i);
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	501 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	502 }
cd3371670f0b Refactor incoming and outgoing code 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 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	504 }
207 1bf0a5af2d5d Conditional debug printouts Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 206 diff changeset	505 if (debug) {
1bf0a5af2d5d Conditional debug printouts Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 206 diff changeset	506 System.out.println("Total queries:" + totalQueries);
1bf0a5af2d5d Conditional debug printouts Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 206 diff changeset	507 }
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	508 if (!resultOk) {
423 9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	509 assert missing.size() > 0;
9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	510 // TODO post-1.0 perhaps, there's better alternative than HgInvalidStateException, e.g. HgDataFormatException?
9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 383 diff changeset	511 throw new HgInvalidStateException(String.format("Missing elements with indexes: %s", Arrays.toString(missing.toArray())));
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	512 }
cd3371670f0b Refactor incoming and outgoing code to be shared with RepositoryComparator. Placeholders for in/out commands. Refactor common remote lookup code Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	513 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	514 }
192 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 /**
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	517 * 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	518 * 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	519 */
295 981f9f50bb6c Issue 11: Error log facility. SessionContext to share common facilities Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	520 public List<Nodeid> visitBranches(BranchChain bc) throws HgRemoteConnectionException {
192 e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	521 if (bc == null) {
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	522 return Collections.emptyList();
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	523 }
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	524 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	525 if (bc.isTerminal() \|\| bc.isRepoStart()) {
192 e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	526 return mine;
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	527 }
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	528 List<Nodeid> parentBranch1 = visitBranches(bc.p1);
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	529 List<Nodeid> parentBranch2 = visitBranches(bc.p2);
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	530 // merge
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	531 LinkedList<Nodeid> merged = new LinkedList<Nodeid>();
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	532 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	533 while (i1.hasNext() && i2.hasNext()) {
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	534 Nodeid n1 = i1.next();
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	535 Nodeid n2 = i2.next();
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	536 if (n1.equals(n2)) {
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	537 merged.addLast(n1);
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	538 } else {
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	539 // 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	540 merged.add(n2);
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	541 merged.add(n1);
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	542 break;
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	543 }
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 // copy rest of second parent branch
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	546 while (i2.hasNext()) {
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	547 merged.add(i2.next());
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	548 }
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	549 // copy rest of first parent branch
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	550 while (i1.hasNext()) {
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	551 merged.add(i1.next());
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	552 }
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	553 //
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	554 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	555 rv.addAll(merged);
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	556 rv.addAll(mine);
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	557 return rv;
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	558 }
e5407b5a586a Incoming and Outgoing commands are alive Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 184 diff changeset	559
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	560 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	561 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	562 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	563 }
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 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	565 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	566 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	567 }
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	568 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	569 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	570 }
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	571 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	572 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	573 }
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	574 }

Mercurial > hg4j

annotate src/org/tmatesoft/hg/internal/RepositoryComparator.java @ 566:32453f30de07 v1.1m3