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

annotate src/org/tmatesoft/hg/internal/PhasesHelper.java @ 709:497e697636fc

Report merged lines as changed block if possible, not as a sequence of added/deleted blocks. To facilitate access to merge parent lines AddBlock got mergeLineAt() method that reports index of the line in the second parent (if any), while insertedAt() has been changed to report index in the first parent always

author	Artem Tikhomirov <tikhomirov.artem@gmail.com>
date	Wed, 21 Aug 2013 16:23:27 +0200
parents	46b56864b483
children

rev	line source
445 d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	1 /*
628 6526d8adbc0f Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 501 diff changeset	2 * Copyright (c) 2012-2013 TMate Software Ltd
445 d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	3 *
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	4 * This program is free software; you can redistribute it and/or modify
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	5 * it under the terms of the GNU General Public License as published by
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	6 * the Free Software Foundation; version 2 of the License.
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	7 *
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	8 * This program is distributed in the hope that it will be useful,
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	11 * GNU General Public License for more details.
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	12 *
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	13 * For information on how to redistribute this software under
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	14 * the terms of a license other than GNU General Public License
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	15 * contact TMate Software at support@hg4j.com
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	16 */
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	17 package org.tmatesoft.hg.internal;
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	18
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	19 import static org.tmatesoft.hg.repo.HgPhase.Draft;
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	20 import static org.tmatesoft.hg.repo.HgPhase.Secret;
647 c75297c17867 Location of repository files as enumeration, use file constants instead of plain names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 628 diff changeset	21 import static org.tmatesoft.hg.repo.HgRepositoryFiles.Phaseroots;
471 7bcfbc255f48 Merge changes from smartgit3 branch into 1.1 stream Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 451 diff changeset	22 import static org.tmatesoft.hg.util.LogFacility.Severity.Warn;
445 d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	23
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	24 import java.io.File;
649 e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 648 diff changeset	25 import java.io.FileWriter;
445 d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	26 import java.io.IOException;
649 e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 648 diff changeset	27 import java.util.ArrayList;
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 648 diff changeset	28 import java.util.Collection;
445 d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	29 import java.util.Collections;
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	30 import java.util.HashMap;
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	31 import java.util.LinkedList;
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	32 import java.util.List;
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	33
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	34 import org.tmatesoft.hg.core.HgChangeset;
649 e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 648 diff changeset	35 import org.tmatesoft.hg.core.HgIOException;
445 d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	36 import org.tmatesoft.hg.core.Nodeid;
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	37 import org.tmatesoft.hg.repo.HgChangelog;
471 7bcfbc255f48 Merge changes from smartgit3 branch into 1.1 stream Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 451 diff changeset	38 import org.tmatesoft.hg.repo.HgInvalidControlFileException;
652 cd77bf51b562 Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 650 diff changeset	39 import org.tmatesoft.hg.repo.HgInvalidStateException;
471 7bcfbc255f48 Merge changes from smartgit3 branch into 1.1 stream Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 451 diff changeset	40 import org.tmatesoft.hg.repo.HgParentChildMap;
445 d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	41 import org.tmatesoft.hg.repo.HgPhase;
663 46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	42 import org.tmatesoft.hg.repo.HgRemoteRepository;
445 d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	43 import org.tmatesoft.hg.repo.HgRepository;
628 6526d8adbc0f Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 501 diff changeset	44 import org.tmatesoft.hg.repo.HgRuntimeException;
445 d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	45
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	46 /**
490 b3c16d1aede0 Refactoring: move HgRepository's implementation aspects to Internals (which is now its imlementation counterpart and primary repository class to be used by other parts of the library) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 474 diff changeset	47 * Support to deal with Mercurial phases feature (as of Mercurial version 2.1)
b3c16d1aede0 Refactoring: move HgRepository's implementation aspects to Internals (which is now its imlementation counterpart and primary repository class to be used by other parts of the library) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 474 diff changeset	48 *
b3c16d1aede0 Refactoring: move HgRepository's implementation aspects to Internals (which is now its imlementation counterpart and primary repository class to be used by other parts of the library) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 474 diff changeset	49 * @see http://mercurial.selenic.com/wiki/Phases
b3c16d1aede0 Refactoring: move HgRepository's implementation aspects to Internals (which is now its imlementation counterpart and primary repository class to be used by other parts of the library) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 474 diff changeset	50 * @see http://mercurial.selenic.com/wiki/PhasesDevel
445 d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	51 *
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	52 * @author Artem Tikhomirov
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	53 * @author TMate Software Ltd.
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	54 */
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	55 public final class PhasesHelper {
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	56
493 ba36f66c32b4 Refactor to keep knowledge about repository control files and their location in respect to .hg/ in a single place (facilitate future adoption of shared repositories) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	57 private final Internals repo;
471 7bcfbc255f48 Merge changes from smartgit3 branch into 1.1 stream Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 451 diff changeset	58 private final HgParentChildMap<HgChangelog> parentHelper;
445 d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	59 private Boolean repoSupporsPhases;
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	60 private List<Nodeid> draftPhaseRoots;
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	61 private List<Nodeid> secretPhaseRoots;
449 5787e912f60e Speed up changeset phase detection when no parent cache is avalable Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 448 diff changeset	62 private RevisionDescendants[][] phaseDescendants = new RevisionDescendants[HgPhase.values().length][];
445 d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	63
493 ba36f66c32b4 Refactor to keep knowledge about repository control files and their location in respect to .hg/ in a single place (facilitate future adoption of shared repositories) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	64 public PhasesHelper(Internals internalRepo) {
ba36f66c32b4 Refactor to keep knowledge about repository control files and their location in respect to .hg/ in a single place (facilitate future adoption of shared repositories) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	65 this(internalRepo, null);
445 d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	66 }
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	67
493 ba36f66c32b4 Refactor to keep knowledge about repository control files and their location in respect to .hg/ in a single place (facilitate future adoption of shared repositories) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	68 public PhasesHelper(Internals internalRepo, HgParentChildMap<HgChangelog> pw) {
ba36f66c32b4 Refactor to keep knowledge about repository control files and their location in respect to .hg/ in a single place (facilitate future adoption of shared repositories) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	69 repo = internalRepo;
445 d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	70 parentHelper = pw;
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	71 }
663 46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	72
474 09f2d38ecf26 Tests for phases support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	73 public HgRepository getRepo() {
493 ba36f66c32b4 Refactor to keep knowledge about repository control files and their location in respect to .hg/ in a single place (facilitate future adoption of shared repositories) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	74 return repo.getRepo();
474 09f2d38ecf26 Tests for phases support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 471 diff changeset	75 }
445 d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	76
628 6526d8adbc0f Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 501 diff changeset	77 public boolean isCapableOfPhases() throws HgRuntimeException {
445 d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	78 if (null == repoSupporsPhases) {
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	79 repoSupporsPhases = readRoots();
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	80 }
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	81 return repoSupporsPhases.booleanValue();
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	82 }
663 46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	83
650 3b275cc2d2aa Push: phase4 - settle local and remote phases, push updated phases regardless of server publishing state, do not push secret changesets Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 649 diff changeset	84 public boolean withSecretRoots() {
3b275cc2d2aa Push: phase4 - settle local and remote phases, push updated phases regardless of server publishing state, do not push secret changesets Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 649 diff changeset	85 return !secretPhaseRoots.isEmpty();
3b275cc2d2aa Push: phase4 - settle local and remote phases, push updated phases regardless of server publishing state, do not push secret changesets Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 649 diff changeset	86 }
445 d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	87
628 6526d8adbc0f Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 501 diff changeset	88 /**
663 46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	89 * @param cset
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	90 * revision to query
628 6526d8adbc0f Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 501 diff changeset	91 * @return phase of the changeset, never <code>null</code>
663 46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	92 * @throws HgInvalidControlFileException
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	93 * if failed to access revlog index/data entry. <em>Runtime exception</em>
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	94 * @throws HgRuntimeException
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	95 * subclass thereof to indicate other issues with the library. <em>Runtime exception</em>
628 6526d8adbc0f Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 501 diff changeset	96 */
6526d8adbc0f Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 501 diff changeset	97 public HgPhase getPhase(HgChangeset cset) throws HgRuntimeException {
445 d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	98 final Nodeid csetRev = cset.getNodeid();
471 7bcfbc255f48 Merge changes from smartgit3 branch into 1.1 stream Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 451 diff changeset	99 final int csetRevIndex = cset.getRevisionIndex();
445 d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	100 return getPhase(csetRevIndex, csetRev);
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	101 }
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	102
628 6526d8adbc0f Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 501 diff changeset	103 /**
663 46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	104 * @param csetRevIndex
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	105 * revision index to query
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	106 * @param csetRev
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	107 * revision nodeid, optional
628 6526d8adbc0f Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 501 diff changeset	108 * @return phase of the changeset, never <code>null</code>
663 46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	109 * @throws HgInvalidControlFileException
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	110 * if failed to access revlog index/data entry. <em>Runtime exception</em>
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	111 * @throws HgRuntimeException
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	112 * subclass thereof to indicate other issues with the library. <em>Runtime exception</em>
628 6526d8adbc0f Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 501 diff changeset	113 */
6526d8adbc0f Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 501 diff changeset	114 public HgPhase getPhase(final int csetRevIndex, Nodeid csetRev) throws HgRuntimeException {
445 d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	115 if (!isCapableOfPhases()) {
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	116 return HgPhase.Undefined;
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	117 }
449 5787e912f60e Speed up changeset phase detection when no parent cache is avalable Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 448 diff changeset	118 // csetRev is only used when parentHelper is available
5787e912f60e Speed up changeset phase detection when no parent cache is avalable Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 448 diff changeset	119 if (parentHelper != null && (csetRev == null \|\| csetRev.isNull())) {
493 ba36f66c32b4 Refactor to keep knowledge about repository control files and their location in respect to .hg/ in a single place (facilitate future adoption of shared repositories) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	120 csetRev = getRepo().getChangelog().getRevision(csetRevIndex);
445 d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	121 }
663 46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	122
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	123 for (HgPhase phase : new HgPhase[] { HgPhase.Secret, HgPhase.Draft }) {
445 d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	124 List<Nodeid> roots = getPhaseRoots(phase);
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	125 if (roots.isEmpty()) {
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	126 continue;
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	127 }
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	128 if (parentHelper != null) {
449 5787e912f60e Speed up changeset phase detection when no parent cache is avalable Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 448 diff changeset	129 if (roots.contains(csetRev)) {
5787e912f60e Speed up changeset phase detection when no parent cache is avalable Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 448 diff changeset	130 return phase;
5787e912f60e Speed up changeset phase detection when no parent cache is avalable Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 448 diff changeset	131 }
445 d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	132 if (parentHelper.childrenOf(roots).contains(csetRev)) {
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	133 return phase;
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	134 }
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	135 } else {
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	136 // no parent helper
449 5787e912f60e Speed up changeset phase detection when no parent cache is avalable Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 448 diff changeset	137 // search all descendants.RevisuionDescendats includes root as well.
5787e912f60e Speed up changeset phase detection when no parent cache is avalable Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 448 diff changeset	138 for (RevisionDescendants rd : getPhaseDescendants(phase)) {
5787e912f60e Speed up changeset phase detection when no parent cache is avalable Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 448 diff changeset	139 // isCandidate is to go straight to another root if changeset was added later that the current root
5787e912f60e Speed up changeset phase detection when no parent cache is avalable Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 448 diff changeset	140 if (rd.isCandidate(csetRevIndex) && rd.isDescendant(csetRevIndex)) {
5787e912f60e Speed up changeset phase detection when no parent cache is avalable Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 448 diff changeset	141 return phase;
445 d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	142 }
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	143 }
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	144 }
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	145 }
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	146 return HgPhase.Public;
648 690e71d29bf6 Introduced RevisionSet to ease update of phase roots on push Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 647 diff changeset	147 }
445 d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	148
648 690e71d29bf6 Introduced RevisionSet to ease update of phase roots on push Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 647 diff changeset	149 /**
690e71d29bf6 Introduced RevisionSet to ease update of phase roots on push Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 647 diff changeset	150 * @return all revisions with secret phase
690e71d29bf6 Introduced RevisionSet to ease update of phase roots on push Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 647 diff changeset	151 */
690e71d29bf6 Introduced RevisionSet to ease update of phase roots on push Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 647 diff changeset	152 public RevisionSet allSecret() {
690e71d29bf6 Introduced RevisionSet to ease update of phase roots on push Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 647 diff changeset	153 return allOf(HgPhase.Secret);
690e71d29bf6 Introduced RevisionSet to ease update of phase roots on push Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 647 diff changeset	154 }
663 46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	155
649 e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 648 diff changeset	156 /**
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 648 diff changeset	157 * @return all revisions with draft phase
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 648 diff changeset	158 */
648 690e71d29bf6 Introduced RevisionSet to ease update of phase roots on push Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 647 diff changeset	159 public RevisionSet allDraft() {
690e71d29bf6 Introduced RevisionSet to ease update of phase roots on push Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 647 diff changeset	160 return allOf(HgPhase.Draft).subtract(allOf(HgPhase.Secret));
690e71d29bf6 Introduced RevisionSet to ease update of phase roots on push Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 647 diff changeset	161 }
663 46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	162
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	163 // XXX throw HgIOException instead?
649 e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 648 diff changeset	164 public void updateRoots(Collection<Nodeid> draftRoots, Collection<Nodeid> secretRoots) throws HgInvalidControlFileException {
663 46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	165 draftPhaseRoots = draftRoots.isEmpty() ? Collections.<Nodeid> emptyList() : new ArrayList<Nodeid>(draftRoots);
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	166 secretPhaseRoots = secretRoots.isEmpty() ? Collections.<Nodeid> emptyList() : new ArrayList<Nodeid>(secretRoots);
649 e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 648 diff changeset	167 String fmt = "%d %s\n";
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 648 diff changeset	168 File phaseroots = repo.getRepositoryFile(Phaseroots);
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 648 diff changeset	169 FileWriter fw = null;
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 648 diff changeset	170 try {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 648 diff changeset	171 fw = new FileWriter(phaseroots);
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 648 diff changeset	172 for (Nodeid n : secretPhaseRoots) {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 648 diff changeset	173 fw.write(String.format(fmt, HgPhase.Secret.mercurialOrdinal(), n.toString()));
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 648 diff changeset	174 }
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 648 diff changeset	175 for (Nodeid n : draftPhaseRoots) {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 648 diff changeset	176 fw.write(String.format(fmt, HgPhase.Draft.mercurialOrdinal(), n.toString()));
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 648 diff changeset	177 }
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 648 diff changeset	178 fw.flush();
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 648 diff changeset	179 } catch (IOException ex) {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 648 diff changeset	180 throw new HgInvalidControlFileException(ex.getMessage(), ex, phaseroots);
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 648 diff changeset	181 } finally {
654 12a4f60ea972 1) Console push tool. 2) Pass class to blame into FileUtils Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 652 diff changeset	182 new FileUtils(repo.getLog(), this).closeQuietly(fw);
649 e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 648 diff changeset	183 }
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 648 diff changeset	184 }
648 690e71d29bf6 Introduced RevisionSet to ease update of phase roots on push Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 647 diff changeset	185
652 cd77bf51b562 Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 650 diff changeset	186 public void newCommitNode(Nodeid newChangeset, HgPhase newCommitPhase) throws HgRuntimeException {
cd77bf51b562 Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 650 diff changeset	187 final int riCset = repo.getRepo().getChangelog().getRevisionIndex(newChangeset);
cd77bf51b562 Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 650 diff changeset	188 HgPhase ph = getPhase(riCset, newChangeset);
cd77bf51b562 Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 650 diff changeset	189 if (ph.compareTo(newCommitPhase) >= 0) {
cd77bf51b562 Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 650 diff changeset	190 // present phase is more secret than the desired one
cd77bf51b562 Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 650 diff changeset	191 return;
cd77bf51b562 Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 650 diff changeset	192 }
cd77bf51b562 Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 650 diff changeset	193 // newCommitPhase can't be public here, condition above would be satisfied
cd77bf51b562 Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 650 diff changeset	194 assert newCommitPhase != HgPhase.Public;
cd77bf51b562 Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 650 diff changeset	195 // ph is e.g public when newCommitPhase is draft
cd77bf51b562 Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 650 diff changeset	196 // or is draft when desired phase is secret
cd77bf51b562 Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 650 diff changeset	197 final RevisionSet rs = allOf(newCommitPhase).union(new RevisionSet(Collections.singleton(newChangeset)));
cd77bf51b562 Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 650 diff changeset	198 final RevisionSet newRoots;
cd77bf51b562 Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 650 diff changeset	199 if (parentHelper != null) {
cd77bf51b562 Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 650 diff changeset	200 newRoots = rs.roots(parentHelper);
cd77bf51b562 Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 650 diff changeset	201 } else {
cd77bf51b562 Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 650 diff changeset	202 newRoots = rs.roots(repo.getRepo());
cd77bf51b562 Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 650 diff changeset	203 }
cd77bf51b562 Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 650 diff changeset	204 if (newCommitPhase == HgPhase.Draft) {
cd77bf51b562 Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 650 diff changeset	205 updateRoots(newRoots.asList(), secretPhaseRoots);
cd77bf51b562 Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 650 diff changeset	206 } else if (newCommitPhase == HgPhase.Secret) {
cd77bf51b562 Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 650 diff changeset	207 updateRoots(draftPhaseRoots, newRoots.asList());
cd77bf51b562 Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 650 diff changeset	208 } else {
cd77bf51b562 Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 650 diff changeset	209 throw new HgInvalidStateException(String.format("Unexpected phase %s for new commits", newCommitPhase));
cd77bf51b562 Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 650 diff changeset	210 }
cd77bf51b562 Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 650 diff changeset	211 }
cd77bf51b562 Push: tests. Commit respects phases.new-commit setting. Fix outgoing when changes are not children of common (Issue 47) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 650 diff changeset	212
648 690e71d29bf6 Introduced RevisionSet to ease update of phase roots on push Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 647 diff changeset	213 /**
663 46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	214 * @return set of revisions that are public locally, but draft on remote.
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	215 */
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	216 public RevisionSet synchronizeWithRemote(HgRemoteRepository.Phases remotePhases, RevisionSet sharedWithRemote) throws HgInvalidControlFileException {
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	217 assert parentHelper != null;
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	218 RevisionSet presentSecret = allSecret();
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	219 RevisionSet presentDraft = allDraft();
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	220 RevisionSet secretLeft, draftLeft;
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	221 RevisionSet remoteDrafts = knownRemoteDrafts(remotePhases, sharedWithRemote, presentSecret);
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	222 if (remotePhases.isPublishingServer()) {
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	223 // although it's unlikely shared revisions would affect secret changesets,
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	224 // it doesn't hurt to check secret roots along with draft ones
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	225 //
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	226 // local drafts that are known to be public now
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	227 RevisionSet draftsBecomePublic = presentDraft.intersect(sharedWithRemote);
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	228 RevisionSet secretsBecomePublic = presentSecret.intersect(sharedWithRemote);
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	229 // any ancestor of the public revision is public, too
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	230 RevisionSet draftsGone = presentDraft.ancestors(draftsBecomePublic, parentHelper);
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	231 RevisionSet secretsGone = presentSecret.ancestors(secretsBecomePublic, parentHelper);
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	232 // remove public and their ancestors from drafts
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	233 draftLeft = presentDraft.subtract(draftsGone).subtract(draftsBecomePublic);
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	234 secretLeft = presentSecret.subtract(secretsGone).subtract(secretsBecomePublic);
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	235 } else {
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	236 // shall merge local and remote phase states
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	237 // revisions that cease to be secret (gonna become Public), e.g. someone else pushed them
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	238 RevisionSet secretGone = presentSecret.intersect(remoteDrafts);
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	239 // parents of those remote drafts are public, mark them as public locally, too
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	240 RevisionSet remotePublic = presentSecret.ancestors(secretGone, parentHelper);
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	241 secretLeft = presentSecret.subtract(secretGone).subtract(remotePublic);
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	242 /*
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	243 * Revisions grow from left to right (parents to the left, children to the right)
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	244 *
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	245 * I: Set of local is subset of remote
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	246 *
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	247 * local draft
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	248 * --o---r---o---l---o--
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	249 * remote draft
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	250 *
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	251 * Remote draft roots shall be updated
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	252 *
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	253 *
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	254 * II: Set of local is superset of remote
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	255 *
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	256 * local draft
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	257 * --o---l---o---r---o--
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	258 * remote draft
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	259 *
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	260 * Local draft roots shall be updated
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	261 */
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	262 RevisionSet sharedDraft = presentDraft.intersect(remoteDrafts); // (I: ~presentDraft; II: ~remoteDraft
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	263 // XXX do I really need sharedDrafts here? why not ancestors(remoteDrafts)?
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	264 RevisionSet localDraftRemotePublic = presentDraft.ancestors(sharedDraft, parentHelper); // I: 0; II: those treated public on remote
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	265 // remoteDrafts are local revisions known as draft@remote
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	266 // remoteDraftsLocalPublic - revisions that would cease to be listed as draft on remote
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	267 RevisionSet remoteDraftsLocalPublic = remoteDrafts.ancestors(sharedDraft, parentHelper);
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	268 RevisionSet remoteDraftsLeft = remoteDrafts.subtract(remoteDraftsLocalPublic);
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	269 // forget those deemed public by remote (drafts shared by both remote and local are ok to stay)
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	270 RevisionSet combinedDraft = presentDraft.union(remoteDraftsLeft);
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	271 draftLeft = combinedDraft.subtract(localDraftRemotePublic);
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	272 }
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	273 final RevisionSet newDraftRoots = draftLeft.roots(parentHelper);
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	274 final RevisionSet newSecretRoots = secretLeft.roots(parentHelper);
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	275 updateRoots(newDraftRoots.asList(), newSecretRoots.asList());
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	276 //
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	277 // if there's a remote draft root that points to revision we know is public
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	278 RevisionSet remoteDraftsLocalPublic = remoteDrafts.subtract(draftLeft).subtract(secretLeft);
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	279 return remoteDraftsLocalPublic;
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	280 }
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	281
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	282 // shared - set of revisions we've shared with remote
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	283 private RevisionSet knownRemoteDrafts(HgRemoteRepository.Phases remotePhases, RevisionSet shared, RevisionSet localSecret) {
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	284 ArrayList<Nodeid> knownRemoteDraftRoots = new ArrayList<Nodeid>();
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	285 for (Nodeid rdr : remotePhases.draftRoots()) {
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	286 if (parentHelper.knownNode(rdr)) {
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	287 knownRemoteDraftRoots.add(rdr);
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	288 }
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	289 }
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	290 // knownRemoteDraftRoots + childrenOf(knownRemoteDraftRoots) is everything remote may treat as Draft
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	291 RevisionSet remoteDrafts = new RevisionSet(knownRemoteDraftRoots);
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	292 RevisionSet localChildren = remoteDrafts.children(parentHelper);
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	293 // we didn't send any local secret revision
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	294 localChildren = localChildren.subtract(localSecret);
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	295 // draft roots are among remote drafts
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	296 remoteDrafts = remoteDrafts.union(localChildren);
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	297 // remoteDrafts is set of local revisions remote may see as Draft. However,
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	298 // need to remove from this set revisions we didn't share with remote:
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	299 // 1) shared.children gives all local revisions accessible from shared.
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	300 // 2) shared.roots.children is equivalent with smaller intermediate set, the way we build
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	301 // childrenOf doesn't really benefits from that.
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	302 RevisionSet localChildrenNotSent = shared.children(parentHelper).subtract(shared);
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	303 // remote shall know only what we've sent, subtract revisions we didn't actually sent
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	304 remoteDrafts = remoteDrafts.subtract(localChildrenNotSent);
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	305 return remoteDrafts;
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	306 }
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	307
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	308 /**
648 690e71d29bf6 Introduced RevisionSet to ease update of phase roots on push Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 647 diff changeset	309 * For a given phase, collect all revisions with phase that is the same or more private (i.e. for Draft, returns Draft+Secret)
663 46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	310 * The reason is not a nice API intention (which is awful, indeed), but an ease of implementation
648 690e71d29bf6 Introduced RevisionSet to ease update of phase roots on push Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 647 diff changeset	311 */
690e71d29bf6 Introduced RevisionSet to ease update of phase roots on push Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 647 diff changeset	312 private RevisionSet allOf(HgPhase phase) {
690e71d29bf6 Introduced RevisionSet to ease update of phase roots on push Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 647 diff changeset	313 assert phase != HgPhase.Public;
690e71d29bf6 Introduced RevisionSet to ease update of phase roots on push Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 647 diff changeset	314 if (!isCapableOfPhases()) {
663 46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	315 return new RevisionSet(Collections.<Nodeid> emptyList());
648 690e71d29bf6 Introduced RevisionSet to ease update of phase roots on push Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 647 diff changeset	316 }
690e71d29bf6 Introduced RevisionSet to ease update of phase roots on push Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 647 diff changeset	317 final List<Nodeid> roots = getPhaseRoots(phase);
690e71d29bf6 Introduced RevisionSet to ease update of phase roots on push Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 647 diff changeset	318 if (parentHelper != null) {
690e71d29bf6 Introduced RevisionSet to ease update of phase roots on push Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 647 diff changeset	319 return new RevisionSet(roots).union(new RevisionSet(parentHelper.childrenOf(roots)));
690e71d29bf6 Introduced RevisionSet to ease update of phase roots on push Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 647 diff changeset	320 } else {
663 46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	321 RevisionSet rv = new RevisionSet(Collections.<Nodeid> emptyList());
648 690e71d29bf6 Introduced RevisionSet to ease update of phase roots on push Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 647 diff changeset	322 for (RevisionDescendants rd : getPhaseDescendants(phase)) {
690e71d29bf6 Introduced RevisionSet to ease update of phase roots on push Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 647 diff changeset	323 rv = rv.union(rd.asRevisionSet());
690e71d29bf6 Introduced RevisionSet to ease update of phase roots on push Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 647 diff changeset	324 }
690e71d29bf6 Introduced RevisionSet to ease update of phase roots on push Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 647 diff changeset	325 return rv;
690e71d29bf6 Introduced RevisionSet to ease update of phase roots on push Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 647 diff changeset	326 }
445 d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	327 }
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	328
628 6526d8adbc0f Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 501 diff changeset	329 private Boolean readRoots() throws HgRuntimeException {
647 c75297c17867 Location of repository files as enumeration, use file constants instead of plain names Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 628 diff changeset	330 File phaseroots = repo.getRepositoryFile(Phaseroots);
445 d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	331 try {
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	332 if (!phaseroots.exists()) {
663 46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	333 if (repo.shallCreatePhaseroots()) {
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	334 draftPhaseRoots = Collections.<Nodeid>emptyList();
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	335 secretPhaseRoots = Collections.<Nodeid>emptyList();
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	336 return Boolean.TRUE;
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	337 }
445 d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	338 return Boolean.FALSE;
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	339 }
649 e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 648 diff changeset	340 LineReader lr = new LineReader(phaseroots, repo.getLog());
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 648 diff changeset	341 final Collection<String> lines = lr.read(new LineReader.SimpleLineCollector(), new LinkedList<String>());
445 d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	342 HashMap<HgPhase, List<Nodeid>> phase2roots = new HashMap<HgPhase, List<Nodeid>>();
649 e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 648 diff changeset	343 for (String line : lines) {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 648 diff changeset	344 String[] lc = line.split("\\s+");
445 d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	345 if (lc.length == 0) {
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	346 continue;
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	347 }
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	348 if (lc.length != 2) {
501 d2f6ab541330 Change the way extensions are accessed (with ExtensionsManager now), add preliminary Rebase extension support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 493 diff changeset	349 repo.getSessionContext().getLog().dump(getClass(), Warn, "Bad line in phaseroots:%s", line);
445 d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	350 continue;
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	351 }
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	352 int phaseIndex = Integer.parseInt(lc[0]);
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	353 Nodeid rootRev = Nodeid.fromAscii(lc[1]);
493 ba36f66c32b4 Refactor to keep knowledge about repository control files and their location in respect to .hg/ in a single place (facilitate future adoption of shared repositories) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	354 if (!getRepo().getChangelog().isKnown(rootRev)) {
501 d2f6ab541330 Change the way extensions are accessed (with ExtensionsManager now), add preliminary Rebase extension support Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 493 diff changeset	355 repo.getSessionContext().getLog().dump(getClass(), Warn, "Phase(%d) root node %s doesn't exist in the repository, ignored.", phaseIndex, rootRev);
451 39fe00407937 HgBadStateException in ParentWalker.assertSortedIndex when phaseroots lists non-existent revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 449 diff changeset	356 continue;
39fe00407937 HgBadStateException in ParentWalker.assertSortedIndex when phaseroots lists non-existent revision Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 449 diff changeset	357 }
445 d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	358 HgPhase phase = HgPhase.parse(phaseIndex);
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	359 List<Nodeid> roots = phase2roots.get(phase);
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	360 if (roots == null) {
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	361 phase2roots.put(phase, roots = new LinkedList<Nodeid>());
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	362 }
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	363 roots.add(rootRev);
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	364 }
663 46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	365 draftPhaseRoots = phase2roots.containsKey(Draft) ? phase2roots.get(Draft) : Collections.<Nodeid> emptyList();
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	366 secretPhaseRoots = phase2roots.containsKey(Secret) ? phase2roots.get(Secret) : Collections.<Nodeid> emptyList();
649 e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 648 diff changeset	367 } catch (HgIOException ex) {
e79cf9a8130b Push: phase4 - update local and remote phase information Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 648 diff changeset	368 throw new HgInvalidControlFileException(ex, true);
445 d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	369 }
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	370 return Boolean.TRUE;
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	371 }
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	372
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	373 private List<Nodeid> getPhaseRoots(HgPhase phase) {
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	374 switch (phase) {
663 46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	375 case Draft:
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	376 return draftPhaseRoots;
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	377 case Secret:
46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	378 return secretPhaseRoots;
445 d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	379 }
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	380 return Collections.emptyList();
d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	381 }
449 5787e912f60e Speed up changeset phase detection when no parent cache is avalable Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 448 diff changeset	382
628 6526d8adbc0f Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 501 diff changeset	383 private RevisionDescendants[] getPhaseDescendants(HgPhase phase) throws HgRuntimeException {
447 056f724bdc21 Cache earliest phase root revision not to evaluate all the time Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 446 diff changeset	384 int ordinal = phase.ordinal();
449 5787e912f60e Speed up changeset phase detection when no parent cache is avalable Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 448 diff changeset	385 if (phaseDescendants[ordinal] == null) {
5787e912f60e Speed up changeset phase detection when no parent cache is avalable Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 448 diff changeset	386 phaseDescendants[ordinal] = buildPhaseDescendants(phase);
447 056f724bdc21 Cache earliest phase root revision not to evaluate all the time Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 446 diff changeset	387 }
449 5787e912f60e Speed up changeset phase detection when no parent cache is avalable Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 448 diff changeset	388 return phaseDescendants[ordinal];
5787e912f60e Speed up changeset phase detection when no parent cache is avalable Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 448 diff changeset	389 }
5787e912f60e Speed up changeset phase detection when no parent cache is avalable Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 448 diff changeset	390
628 6526d8adbc0f Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 501 diff changeset	391 private RevisionDescendants[] buildPhaseDescendants(HgPhase phase) throws HgRuntimeException {
449 5787e912f60e Speed up changeset phase detection when no parent cache is avalable Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 448 diff changeset	392 int[] roots = toIndexes(getPhaseRoots(phase));
5787e912f60e Speed up changeset phase detection when no parent cache is avalable Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 448 diff changeset	393 RevisionDescendants[] rv = new RevisionDescendants[roots.length];
5787e912f60e Speed up changeset phase detection when no parent cache is avalable Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 448 diff changeset	394 for (int i = 0; i < roots.length; i++) {
493 ba36f66c32b4 Refactor to keep knowledge about repository control files and their location in respect to .hg/ in a single place (facilitate future adoption of shared repositories) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	395 rv[i] = new RevisionDescendants(getRepo(), roots[i]);
449 5787e912f60e Speed up changeset phase detection when no parent cache is avalable Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 448 diff changeset	396 rv[i].build();
5787e912f60e Speed up changeset phase detection when no parent cache is avalable Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 448 diff changeset	397 }
5787e912f60e Speed up changeset phase detection when no parent cache is avalable Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 448 diff changeset	398 return rv;
5787e912f60e Speed up changeset phase detection when no parent cache is avalable Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 448 diff changeset	399 }
663 46b56864b483 Pull: phase2 - update phases from remote, fncache with added files. Tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 654 diff changeset	400
628 6526d8adbc0f Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 501 diff changeset	401 private int[] toIndexes(List<Nodeid> roots) throws HgRuntimeException {
449 5787e912f60e Speed up changeset phase detection when no parent cache is avalable Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 448 diff changeset	402 int[] rv = new int[roots.size()];
5787e912f60e Speed up changeset phase detection when no parent cache is avalable Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 448 diff changeset	403 for (int i = 0; i < rv.length; i++) {
493 ba36f66c32b4 Refactor to keep knowledge about repository control files and their location in respect to .hg/ in a single place (facilitate future adoption of shared repositories) Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	404 rv[i] = getRepo().getChangelog().getRevisionIndex(roots.get(i));
449 5787e912f60e Speed up changeset phase detection when no parent cache is avalable Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 448 diff changeset	405 }
5787e912f60e Speed up changeset phase detection when no parent cache is avalable Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 448 diff changeset	406 return rv;
447 056f724bdc21 Cache earliest phase root revision not to evaluate all the time Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 446 diff changeset	407 }
445 d0e5dc3cae6e Support for phases functionality from Mercurial 2.1 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	408 }

Mercurial > jhg

annotate src/org/tmatesoft/hg/internal/PhasesHelper.java @ 709:497e697636fc