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

annotate src/org/tmatesoft/hg/core/HgCloneCommand.java @ 532:688c1ab113bb

Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents

author	Artem Tikhomirov <tikhomirov.artem@gmail.com>
date	Wed, 23 Jan 2013 19:14:15 +0100
parents	95c2f43008bd
children	243202f1bda5

rev	line source
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	1 /*
530 0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	2 * Copyright (c) 2011-2013 TMate Software Ltd
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	3 *
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	4 * This program is free software; you can redistribute it and/or modify
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	5 * it under the terms of the GNU General Public License as published by
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	6 * the Free Software Foundation; version 2 of the License.
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	7 *
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	8 * This program is distributed in the hope that it will be useful,
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	11 * GNU General Public License for more details.
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	12 *
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	13 * For information on how to redistribute this software under
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	14 * the terms of a license other than GNU General Public License
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	15 * contact TMate Software at support@hg4j.com
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	16 */
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	17 package org.tmatesoft.hg.core;
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	18
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	19 import static org.tmatesoft.hg.core.Nodeid.NULL;
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	20 import static org.tmatesoft.hg.internal.RequiresFile.*;
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	21
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	22 import java.io.File;
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	23 import java.io.FileOutputStream;
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	24 import java.io.IOException;
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	25 import java.util.ArrayList;
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	26 import java.util.Collections;
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	27 import java.util.LinkedList;
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	28 import java.util.TreeMap;
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	29
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	30 import org.tmatesoft.hg.internal.ByteArrayDataAccess;
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	31 import org.tmatesoft.hg.internal.DataAccess;
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	32 import org.tmatesoft.hg.internal.DigestHelper;
512 10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	33 import org.tmatesoft.hg.internal.Lifecycle;
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: 431 diff changeset	34 import org.tmatesoft.hg.internal.RepoInitializer;
530 0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	35 import org.tmatesoft.hg.internal.RevlogCompressor;
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	36 import org.tmatesoft.hg.internal.RevlogStreamWriter;
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	37 import org.tmatesoft.hg.repo.HgBundle;
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	38 import org.tmatesoft.hg.repo.HgBundle.GroupElement;
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: 418 diff changeset	39 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: 418 diff changeset	40 import org.tmatesoft.hg.repo.HgInvalidFileException;
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: 418 diff changeset	41 import org.tmatesoft.hg.repo.HgInvalidStateException;
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	42 import org.tmatesoft.hg.repo.HgLookup;
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	43 import org.tmatesoft.hg.repo.HgRemoteRepository;
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	44 import org.tmatesoft.hg.repo.HgRepository;
423 9c9c442b5f2e Major refactoring of exception handling. Low-level API uses RuntimeExceptions, while checked are left for higher level Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 418 diff changeset	45 import org.tmatesoft.hg.repo.HgRuntimeException;
512 10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	46 import org.tmatesoft.hg.util.CancelSupport;
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	47 import org.tmatesoft.hg.util.CancelledException;
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	48 import org.tmatesoft.hg.util.PathRewrite;
512 10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	49 import org.tmatesoft.hg.util.ProgressSupport;
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	50
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	51 /**
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	52 * WORK IN PROGRESS, DO NOT USE
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	53 *
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	54 * @author Artem Tikhomirov
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	55 * @author TMate Software Ltd.
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	56 */
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: 418 diff changeset	57 public class HgCloneCommand extends HgAbstractCommand<HgCloneCommand> {
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	58
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	59 private File destination;
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	60 private HgRemoteRepository srcRepo;
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	61
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	62 public HgCloneCommand() {
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	63 }
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	64
204 883f1efbcf27 Add clone,incoming and outging tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 202 diff changeset	65 /**
883f1efbcf27 Add clone,incoming and outging tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 202 diff changeset	66 * @param folder location to become root of the repository (i.e. where <em>.hg</em> folder would reside). Either
883f1efbcf27 Add clone,incoming and outging tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 202 diff changeset	67 * shall not exist or be empty otherwise.
883f1efbcf27 Add clone,incoming and outging tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 202 diff changeset	68 * @return <code>this</code> for convenience
883f1efbcf27 Add clone,incoming and outging tests Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 202 diff changeset	69 */
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	70 public HgCloneCommand destination(File folder) {
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	71 destination = folder;
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	72 return this;
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	73 }
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	74
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	75 public HgCloneCommand source(HgRemoteRepository hgRemote) {
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	76 srcRepo = hgRemote;
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	77 return this;
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	78 }
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	79
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: 418 diff changeset	80 /**
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: 418 diff changeset	81 *
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: 418 diff changeset	82 * @return
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: 418 diff changeset	83 * @throws HgBadArgumentException
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: 418 diff changeset	84 * @throws HgRemoteConnectionException
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: 418 diff changeset	85 * @throws HgRepositoryNotFoundException
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: 418 diff changeset	86 * @throws HgException
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: 418 diff changeset	87 * @throws CancelledException
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: 418 diff changeset	88 * @throws HgRuntimeException subclass thereof to indicate issues with the library. <em>Runtime exception</em>
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: 418 diff changeset	89 */
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: 418 diff changeset	90 public HgRepository execute() throws HgException, CancelledException {
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	91 if (destination == null) {
295 981f9f50bb6c Issue 11: Error log facility. SessionContext to share common facilities Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 292 diff changeset	92 throw new IllegalArgumentException("Destination not set", null);
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	93 }
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	94 if (srcRepo == null \|\| srcRepo.isInvalid()) {
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	95 throw new HgBadArgumentException("Bad source repository", null);
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	96 }
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	97 if (destination.exists()) {
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	98 if (!destination.isDirectory()) {
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	99 throw new HgBadArgumentException(String.format("%s is not a directory", destination), null);
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	100 } else if (destination.list().length > 0) {
530 0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	101 throw new HgBadArgumentException(String.format("%s shall be empty", destination), null);
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	102 }
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	103 } else {
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	104 destination.mkdirs();
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	105 }
512 10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	106 ProgressSupport progress = getProgressSupport(null);
10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	107 CancelSupport cancel = getCancelSupport(null, true);
10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	108 cancel.checkCancelled();
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	109 // if cloning remote repo, which can stream and no revision is specified -
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	110 // can use 'stream_out' wireproto
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	111 //
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	112 // pull all changes from the very beginning
512 10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	113 // XXX consult getContext() if by any chance has a bundle ready, if not, then read and register
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	114 HgBundle completeChanges = srcRepo.getChanges(Collections.singletonList(NULL));
512 10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	115 cancel.checkCancelled();
10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	116 WriteDownMate mate = new WriteDownMate(srcRepo.getSessionContext(), destination, progress, cancel);
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	117 try {
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	118 // instantiate new repo in the destdir
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	119 mate.initEmptyRepository();
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	120 // pull changes
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	121 completeChanges.inspectAll(mate);
512 10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	122 mate.checkFailure();
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	123 mate.complete();
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	124 } catch (IOException ex) {
295 981f9f50bb6c Issue 11: Error log facility. SessionContext to share common facilities Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 292 diff changeset	125 throw new HgInvalidFileException(getClass().getName(), ex);
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	126 } finally {
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	127 completeChanges.unlink();
512 10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	128 progress.done();
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	129 }
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	130 return new HgLookup().detect(destination);
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	131 }
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	132
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	133
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	134 // 1. process changelog, memorize nodeids to index
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	135 // 2. process manifest, using map from step 3, collect manifest nodeids
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	136 // 3. process every file, using map from 3, and consult set from step 4 to ensure repo is correct
512 10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	137 private static class WriteDownMate implements HgBundle.Inspector, Lifecycle {
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	138 private final File hgDir;
190 9b99d27aeddc More debug printouts Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 186 diff changeset	139 private final PathRewrite storagePathHelper;
512 10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	140 private final ProgressSupport progressSupport;
10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	141 private final CancelSupport cancelSupport;
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	142 private FileOutputStream indexFile;
190 9b99d27aeddc More debug printouts Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 186 diff changeset	143 private String filename; // human-readable name of the file being written, for log/exception purposes
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	144
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	145 private final TreeMap<Nodeid, Integer> changelogIndexes = new TreeMap<Nodeid, Integer>();
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	146 private boolean collectChangelogIndexes = false;
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	147
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	148 private DataAccess prevRevContent;
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	149 private final DigestHelper dh = new DigestHelper();
532 688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	150 // recently processed nodes last, so that index in the array may be used as a linkRevision or baseRevision
688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	151 private final ArrayList<Nodeid> revisionSequence = new ArrayList<Nodeid>();
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	152
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	153 private final LinkedList<String> fncacheFiles = new LinkedList<String>();
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: 431 diff changeset	154 private RepoInitializer repoInit;
512 10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	155 private Lifecycle.Callback lifecycleCallback;
10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	156 private CancelledException cancelException;
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	157
512 10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	158 public WriteDownMate(SessionContext ctx, File destDir, ProgressSupport progress, CancelSupport cancel) {
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	159 hgDir = new File(destDir, ".hg");
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: 431 diff changeset	160 repoInit = new RepoInitializer();
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: 431 diff changeset	161 repoInit.setRequires(STORE \| FNCACHE \| DOTENCODE);
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: 431 diff changeset	162 storagePathHelper = repoInit.buildDataFilesHelper(ctx);
512 10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	163 progressSupport = progress;
10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	164 cancelSupport = cancel;
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	165 }
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	166
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	167 public void initEmptyRepository() throws IOException {
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: 431 diff changeset	168 repoInit.initEmptyRepository(hgDir);
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	169 }
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	170
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	171 public void complete() throws IOException {
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	172 FileOutputStream fncacheFile = new FileOutputStream(new File(hgDir, "store/fncache"));
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	173 for (String s : fncacheFiles) {
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	174 fncacheFile.write(s.getBytes());
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	175 fncacheFile.write(0x0A); // http://mercurial.selenic.com/wiki/fncacheRepoFormat
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	176 }
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	177 fncacheFile.close();
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	178 }
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	179
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	180 public void changelogStart() {
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	181 try {
530 0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	182 revlogHeader.offset(0).baseRevision(-1);
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	183 revisionSequence.clear();
190 9b99d27aeddc More debug printouts Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 186 diff changeset	184 indexFile = new FileOutputStream(new File(hgDir, filename = "store/00changelog.i"));
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	185 collectChangelogIndexes = true;
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	186 } catch (IOException ex) {
532 688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	187 throw new HgInvalidControlFileException("Failed to write changelog", ex, new File(hgDir, filename));
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	188 }
513 a41d955dc360 Issue 39: HgCloneCommand doesn't use CancelSupport/ProgressSupport handlers Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 512 diff changeset	189 stopIfCancelled();
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	190 }
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	191
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	192 public void changelogEnd() {
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	193 try {
532 688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	194 clearPreviousContent();
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	195 collectChangelogIndexes = false;
532 688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	196 closeIndexFile();
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	197 } catch (IOException ex) {
532 688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	198 throw new HgInvalidControlFileException("Failed to write changelog", ex, new File(hgDir, filename));
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	199 }
513 a41d955dc360 Issue 39: HgCloneCommand doesn't use CancelSupport/ProgressSupport handlers Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 512 diff changeset	200 progressSupport.worked(1);
a41d955dc360 Issue 39: HgCloneCommand doesn't use CancelSupport/ProgressSupport handlers Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 512 diff changeset	201 stopIfCancelled();
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	202 }
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	203
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	204 public void manifestStart() {
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	205 try {
530 0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	206 revlogHeader.offset(0).baseRevision(-1);
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	207 revisionSequence.clear();
190 9b99d27aeddc More debug printouts Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 186 diff changeset	208 indexFile = new FileOutputStream(new File(hgDir, filename = "store/00manifest.i"));
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	209 } catch (IOException ex) {
532 688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	210 throw new HgInvalidControlFileException("Failed to write manifest", ex, new File(hgDir, filename));
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	211 }
513 a41d955dc360 Issue 39: HgCloneCommand doesn't use CancelSupport/ProgressSupport handlers Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 512 diff changeset	212 stopIfCancelled();
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	213 }
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	214
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	215 public void manifestEnd() {
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	216 try {
532 688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	217 clearPreviousContent();
688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	218 closeIndexFile();
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	219 } catch (IOException ex) {
532 688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	220 throw new HgInvalidControlFileException("Failed to write manifest", ex, new File(hgDir, filename));
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	221 }
513 a41d955dc360 Issue 39: HgCloneCommand doesn't use CancelSupport/ProgressSupport handlers Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 512 diff changeset	222 progressSupport.worked(1);
a41d955dc360 Issue 39: HgCloneCommand doesn't use CancelSupport/ProgressSupport handlers Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 512 diff changeset	223 stopIfCancelled();
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	224 }
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	225
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	226 public void fileStart(String name) {
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	227 try {
530 0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	228 revlogHeader.offset(0).baseRevision(-1);
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	229 revisionSequence.clear();
418 528b6780a8bd A bit of FIXME cleanup (mostly degraded to TODO post 1.0), comments and javadoc Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 390 diff changeset	230 fncacheFiles.add("data/" + name + ".i"); // TODO post-1.0 this is pure guess,
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	231 // need to investigate more how filenames are kept in fncache
292 a415fe296a50 Refactor PathRewrite to accept any char sequence, not only string Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 274 diff changeset	232 File file = new File(hgDir, filename = storagePathHelper.rewrite(name).toString());
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	233 file.getParentFile().mkdirs();
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	234 indexFile = new FileOutputStream(file);
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	235 } catch (IOException ex) {
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: 418 diff changeset	236 String m = String.format("Failed to write file %s", filename);
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: 418 diff changeset	237 throw new HgInvalidControlFileException(m, ex, new File(filename));
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	238 }
513 a41d955dc360 Issue 39: HgCloneCommand doesn't use CancelSupport/ProgressSupport handlers Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 512 diff changeset	239 stopIfCancelled();
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	240 }
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	241
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	242 public void fileEnd(String name) {
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	243 try {
532 688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	244 clearPreviousContent();
688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	245 closeIndexFile();
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	246 } catch (IOException ex) {
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: 418 diff changeset	247 String m = String.format("Failed to write file %s", filename);
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: 418 diff changeset	248 throw new HgInvalidControlFileException(m, ex, new File(filename));
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	249 }
513 a41d955dc360 Issue 39: HgCloneCommand doesn't use CancelSupport/ProgressSupport handlers Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 512 diff changeset	250 progressSupport.worked(1);
a41d955dc360 Issue 39: HgCloneCommand doesn't use CancelSupport/ProgressSupport handlers Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 512 diff changeset	251 stopIfCancelled();
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	252 }
532 688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	253
688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	254 private void clearPreviousContent() {
688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	255 if (prevRevContent != null) {
688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	256 prevRevContent.done();
688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	257 prevRevContent = null;
688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	258 }
688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	259 }
688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	260
688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	261 private void closeIndexFile() throws IOException {
688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	262 indexFile.close();
688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	263 indexFile = null;
688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	264 filename = null;
688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	265 }
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	266
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	267 private int knownRevision(Nodeid p) {
274 9fb50c04f03c Use Nodeid.isNull check instead of NULL.equals Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 204 diff changeset	268 if (p.isNull()) {
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	269 return -1;
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	270 } else {
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	271 for (int i = revisionSequence.size() - 1; i >= 0; i--) {
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	272 if (revisionSequence.get(i).equals(p)) {
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	273 return i;
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	274 }
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	275 }
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	276 }
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: 418 diff changeset	277 String m = String.format("Can't find index of %s for file %s", p.shortNotation(), filename);
532 688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	278 throw new HgInvalidControlFileException(m, null, new File(hgDir, filename)).setRevision(p);
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	279 }
530 0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	280
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	281 private RevlogStreamWriter.HeaderWriter revlogHeader = new RevlogStreamWriter.HeaderWriter(true);
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	282 private RevlogCompressor revlogDataZip = new RevlogCompressor();
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	283
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	284 public boolean element(GroupElement ge) {
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	285 try {
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	286 assert indexFile != null;
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	287 boolean writeComplete = false;
532 688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	288 Nodeid deltaBase = ge.patchBase();
688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	289 if (deltaBase.isNull()) {
688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	290 // NOTE, can't use both parents isNull == true to empty prevRevContent
688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	291 // see build.gradle sample below why.
688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	292 prevRevContent = new DataAccess(); // empty data
688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	293 writeComplete = true;
688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	294 // if (writeComplete) would set baseRevision correctly,
688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	295 } else {
688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	296 Nodeid prevRevision = revisionSequence.size() > 0 ? revisionSequence.get(revisionSequence.size()-1) : Nodeid.NULL;
688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	297 if (!prevRevision.equals(deltaBase)) {
688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	298 // presently, bundle group elements always patch previous, see
688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	299 // (a) changegroup.py#builddeltaheader(): # do nothing with basenode, it is implicitly the previous one in HG10
688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	300 // (b) revlog.py#group(): prev, curr = revs[r], revs[r + 1]
688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	301 // for c in bundler.revchunk(self, curr, prev):
688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	302 // so there's no reason to have code here to extract contents of deltaBase revision
688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	303 String m = String.format("Revision %s import failed: delta base %s is not the last node we've handled (and know content for) %s", ge.node(), deltaBase, prevRevision);
688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	304 throw new HgInvalidStateException(m);
688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	305 }
688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	306 }
688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	307 //
688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	308 byte[] content = ge.apply(prevRevContent.byteArray());
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	309 Nodeid p1 = ge.firstParent();
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	310 Nodeid p2 = ge.secondParent();
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	311 byte[] calculated = dh.sha1(p1, p2, content).asBinary();
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	312 final Nodeid node = ge.node();
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	313 if (!node.equalsTo(calculated)) {
531 95c2f43008bd Throw specific exception when checksum calculation fails Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 530 diff changeset	314 String m = String.format("Checksum failed: expected %s, calculated %s. File %s", node, calculated, filename);
95c2f43008bd Throw specific exception when checksum calculation fails Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 530 diff changeset	315 throw new HgRevisionIntegrityException(m, null, new File(hgDir, filename));
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	316 }
530 0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	317 revlogHeader.nodeid(node);
532 688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	318 //
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	319 if (collectChangelogIndexes) {
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	320 changelogIndexes.put(node, revisionSequence.size());
530 0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	321 revlogHeader.linkRevision(revisionSequence.size());
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	322 } else {
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	323 Integer csRev = changelogIndexes.get(ge.cset());
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	324 if (csRev == 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: 418 diff changeset	325 throw new HgInvalidStateException(String.format("Changelog doesn't contain revision %s of %s", ge.cset().shortNotation(), filename));
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	326 }
530 0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	327 revlogHeader.linkRevision(csRev.intValue());
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	328 }
532 688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	329 //
530 0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	330 revlogHeader.parents(knownRevision(p1), knownRevision(p2));
532 688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	331 //
358 fc8bc2f1edbe Clean internal classes from public API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 295 diff changeset	332 byte[] patchContent = ge.rawDataByteArray();
532 688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	333 // no reason to keep patch if it's close (here, >75%) in size to the complete contents,
688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	334 // save patching effort in this case
358 fc8bc2f1edbe Clean internal classes from public API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 295 diff changeset	335 writeComplete = writeComplete \|\| patchContent.length >= (/* 3/4 of actual */content.length - (content.length >>> 2));
532 688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	336
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	337 if (writeComplete) {
530 0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	338 revlogHeader.baseRevision(revisionSequence.size());
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	339 }
532 688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	340 assert revlogHeader.baseRevision() >= 0;
688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	341
358 fc8bc2f1edbe Clean internal classes from public API Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 295 diff changeset	342 final byte[] sourceData = writeComplete ? content : patchContent;
530 0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	343 revlogDataZip.reset(sourceData);
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	344 final int compressedLen;
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	345 final boolean useUncompressedData = revlogDataZip.getCompressedLengthEstimate() >= (sourceData.length - (sourceData.length >>> 2));
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	346 if (useUncompressedData) {
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	347 // compression wasn't too effective,
530 0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	348 compressedLen = sourceData.length + 1 /1 byte for 'u' - uncompressed prefix byte/;
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	349 } else {
530 0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	350 compressedLen= revlogDataZip.getCompressedLengthEstimate();
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	351 }
530 0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	352
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	353 revlogHeader.length(content.length, compressedLen);
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	354
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	355 revlogHeader.write(indexFile);
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	356
530 0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	357 if (useUncompressedData) {
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	358 indexFile.write((byte) 'u');
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	359 indexFile.write(sourceData);
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	360 } else {
530 0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	361 int actualCompressedLenWritten = revlogDataZip.writeCompressedData(indexFile);
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	362 if (actualCompressedLenWritten != compressedLen) {
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	363 throw new HgInvalidStateException(String.format("Expected %d bytes of compressed data, but actually wrote %d in %s", compressedLen, actualCompressedLenWritten, filename));
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	364 }
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	365 }
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	366 //
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	367 revisionSequence.add(node);
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	368 prevRevContent.done();
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	369 prevRevContent = new ByteArrayDataAccess(content);
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	370 } catch (IOException ex) {
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: 418 diff changeset	371 String m = String.format("Failed to write revision %s of file %s", ge.node().shortNotation(), filename);
531 95c2f43008bd Throw specific exception when checksum calculation fails Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 530 diff changeset	372 throw new HgInvalidControlFileException(m, ex, new File(hgDir, filename));
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	373 }
513 a41d955dc360 Issue 39: HgCloneCommand doesn't use CancelSupport/ProgressSupport handlers Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 512 diff changeset	374 return cancelException == null;
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	375 }
530 0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	376 /*
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	377 $ hg debugindex build.gradle
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	378 rev offset length base linkrev nodeid p1 p2
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	379 0 0 857 0 454 b2a1b20d1933 000000000000 000000000000
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	380 1 857 319 0 455 5324c8f2b550 b2a1b20d1933 000000000000
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	381 2 1176 533 0 460 4011d52141cd 5324c8f2b550 000000000000
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	382 3 1709 85 0 463 d0be58845306 4011d52141cd 000000000000
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	383 4 1794 105 0 464 3ddd456244a0 d0be58845306 000000000000
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	384 5 1899 160 0 466 a3f374fbf33a 3ddd456244a0 000000000000
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	385 6 2059 133 0 468 0227d28e0db6 a3f374fbf33a 000000000000
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	386
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	387 once we get a bundle for this repository and look into it for the same file:
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	388
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	389 $hg debugbundle -a /tmp/hg-bundle-4418325145435980614.tmp
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	390 format: id, p1, p2, cset, delta base, len(delta)
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	391
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	392 build.gradle
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	393 62a101b7994c6c5b0423ba6c802f8c64d24ef784 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 6ec4af642ba8024edd636af15e672c97cc3294e4 0000000000000000000000000000000000000000 1368
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	394 b2a1b20d1933d0605aab6780ee52fe5ab3073832 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 7dcc920e2d57d5850ee9f08ac863251460565bd3 62a101b7994c6c5b0423ba6c802f8c64d24ef784 2373
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	395 5324c8f2b5503a4d1ead3ac40a9851c27572166b b2a1b20d1933d0605aab6780ee52fe5ab3073832 0000000000000000000000000000000000000000 7b883bf03b14ccea8ee74db0a34f9f66ca644a3c b2a1b20d1933d0605aab6780ee52fe5ab3073832 579
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	396 4011d52141cd717c92cbf350a93522d2f3ee415e 5324c8f2b5503a4d1ead3ac40a9851c27572166b 0000000000000000000000000000000000000000 55e9588b84b83aa96fe76a06ee8bf067c5d3c90e 5324c8f2b5503a4d1ead3ac40a9851c27572166b 1147
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	397 d0be588453068787dcb3ee05f8edfe47fdd5ae78 4011d52141cd717c92cbf350a93522d2f3ee415e 0000000000000000000000000000000000000000 ad0322a4af204547c400e1846b2b83d446ab8da5 4011d52141cd717c92cbf350a93522d2f3ee415e 85
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	398 3ddd456244a08f81779163d9faf922a6dcd9e53e d0be588453068787dcb3ee05f8edfe47fdd5ae78 0000000000000000000000000000000000000000 3ace1fc95d0a1a941b6427c60b6e624f96dd71ad d0be588453068787dcb3ee05f8edfe47fdd5ae78 151
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	399 a3f374fbf33aba1cc3b4f472db022b5185880f5d 3ddd456244a08f81779163d9faf922a6dcd9e53e 0000000000000000000000000000000000000000 3ca4ae7bdd3890b8ed89bfea1b42af593e04b373 3ddd456244a08f81779163d9faf922a6dcd9e53e 195
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	400 0227d28e0db69afebee34cd5a4151889fb6271da a3f374fbf33aba1cc3b4f472db022b5185880f5d 0000000000000000000000000000000000000000 31bd09da0dcfe48e1fc662143f91ff402238aa84 a3f374fbf33aba1cc3b4f472db022b5185880f5d 145
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	401
532 688c1ab113bb Introduce explicit reference to base patch in bundle's group element, use it when cloning to fix defect when few revisions list null,null parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 531 diff changeset	402 but there's no delta base information in the bundle file, it's merely a hard-coded convention
530 0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	403
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	404 It's unclear where the first chunk (identified 62a101b7...) comes from (by the way, there's no such changeset as 6ec4af... as specified in the chunk, while 7dcc920e.. IS changeset 454)
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	405
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	406 EXPLANATION:
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	407 if cloned repository comes from svnkit repo (where's the gradle branch):
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	408 $hg debugindex build.gradle
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	409 rev offset length base linkrev nodeid p1 p2
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	410 0 0 590 0 213 62a101b7994c 000000000000 000000000000
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	411 1 590 872 0 452 b2a1b20d1933 000000000000 000000000000
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	412 2 1462 319 0 453 5324c8f2b550 b2a1b20d1933 000000000000
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	413 3 1781 533 0 459 4011d52141cd 5324c8f2b550 000000000000
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	414 4 2314 85 0 462 d0be58845306 4011d52141cd 000000000000
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	415 5 2399 105 0 466 3ddd456244a0 d0be58845306 000000000000
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	416 6 2504 160 0 468 a3f374fbf33a 3ddd456244a0 000000000000
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	417 7 2664 133 0 470 0227d28e0db6 a3f374fbf33a 000000000000
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	418
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	419 and the aforementioned bundle was result of hg incoming svnkit!!!
0f6fa88e2162 Towards commit command: refactor clone, extract pieces to reuse. Describe a defect discovered when bundle has few patches with 0,0 parents Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 513 diff changeset	420 */
512 10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	421
10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	422 public void start(int count, Callback callback, Object token) {
10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	423 progressSupport.start(count);
10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	424 lifecycleCallback = callback;
10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	425 }
10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	426
10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	427 public void finish(Object token) {
10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	428 progressSupport.done();
10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	429 lifecycleCallback = null;
10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	430 }
10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	431
10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	432 public void checkFailure() throws CancelledException {
10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	433 if (cancelException != null) {
10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	434 throw cancelException;
10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	435 }
10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	436 }
10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	437
10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	438 private void stopIfCancelled() {
10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	439 try {
10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	440 cancelSupport.checkCancelled();
10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	441 return;
10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	442 } catch (CancelledException ex) {
10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	443 cancelException = ex;
10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	444 lifecycleCallback.stop();
10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	445 }
10ca3ede8367 Issue 39: Progress and Cancel support for Clone command Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 490 diff changeset	446 }
186 44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	447 }
44a34baabea0 Clone refactored into a command. HgBundle needs means to control its lifecycle, to be deleted when no longer needed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	448 }

Mercurial > hg4j

annotate src/org/tmatesoft/hg/core/HgCloneCommand.java @ 532:688c1ab113bb