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

annotate src/org/tmatesoft/hg/internal/DirstateBuilder.java @ 694:7efabe0cddcf

Speed up (a) file rename history to minimize file reads; (b) file.isCopy(int) to read metadata for few revisions at once (use pattern assumes earlier revisions are likely to be queried, too); (c) HgIgnore.isIgnored by caching matched initial fragments (to substitute more expensive Matcher.matches with cheaper HashMap.contains)

author	Artem Tikhomirov <tikhomirov.artem@gmail.com>
date	Mon, 05 Aug 2013 17:42:10 +0200
parents	6526d8adbc0f
children	b4242b7e7dfe

rev	line source
525 0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	1 /*
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	2 * Copyright (c) 2012-2013 TMate Software Ltd
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	3 *
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	4 * This program is free software; you can redistribute it and/or modify
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	5 * it under the terms of the GNU General Public License as published by
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	6 * the Free Software Foundation; version 2 of the License.
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	7 *
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	8 * This program is distributed in the hope that it will be useful,
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	11 * GNU General Public License for more details.
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	12 *
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	13 * For information on how to redistribute this software under
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	14 * the terms of a license other than GNU General Public License
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	15 * contact TMate Software at support@hg4j.com
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	16 */
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	17 package org.tmatesoft.hg.internal;
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	18
617 65c01508f002 Rollback support for commands that modify repository. Strategy to keep complete copy of a file being changed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	19 import static org.tmatesoft.hg.repo.HgRepositoryFiles.Dirstate;
65c01508f002 Rollback support for commands that modify repository. Strategy to keep complete copy of a file being changed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	20 import static org.tmatesoft.hg.repo.HgRepositoryFiles.UndoDirstate;
65c01508f002 Rollback support for commands that modify repository. Strategy to keep complete copy of a file being changed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	21
526 2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	22 import java.io.File;
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	23 import java.io.FileOutputStream;
525 0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	24 import java.io.IOException;
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	25 import java.nio.ByteBuffer;
526 2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	26 import java.nio.channels.FileChannel;
525 0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	27 import java.nio.channels.WritableByteChannel;
526 2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	28 import java.util.Map;
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	29 import java.util.TreeMap;
525 0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	30
526 2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	31 import org.tmatesoft.hg.core.HgIOException;
525 0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	32 import org.tmatesoft.hg.core.Nodeid;
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	33 import org.tmatesoft.hg.repo.HgDirstate;
526 2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	34 import org.tmatesoft.hg.repo.HgDirstate.EntryKind;
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	35 import org.tmatesoft.hg.repo.HgDirstate.Record;
628 6526d8adbc0f Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 617 diff changeset	36 import org.tmatesoft.hg.repo.HgInvalidControlFileException;
526 2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	37 import org.tmatesoft.hg.repo.HgInvalidStateException;
525 0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	38 import org.tmatesoft.hg.repo.HgManifest.Flags;
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	39 import org.tmatesoft.hg.util.Path;
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	40
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	41 /**
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	42 * Facility to build a dirstate file as described in {@linkplain http://mercurial.selenic.com/wiki/DirState}
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	43 *
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	44 * @see http://mercurial.selenic.com/wiki/DirState
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	45 * @see HgDirstate
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	46 * @author Artem Tikhomirov
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	47 * @author TMate Software Ltd.
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	48 */
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	49 public class DirstateBuilder {
526 2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	50 private Map<Path, HgDirstate.Record> normal = new TreeMap<Path, HgDirstate.Record>();
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	51 private Map<Path, HgDirstate.Record> added = new TreeMap<Path, HgDirstate.Record>();
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	52 private Map<Path, HgDirstate.Record> removed = new TreeMap<Path, HgDirstate.Record>();
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	53 private Map<Path, HgDirstate.Record> merged = new TreeMap<Path, HgDirstate.Record>();
525 0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	54 private Nodeid parent1, parent2;
526 2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	55 private final Internals hgRepo;
525 0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	56 private final EncodingHelper encodingHelper;
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	57
526 2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	58 public DirstateBuilder(Internals internalRepo) {
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	59 hgRepo = internalRepo;
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	60 encodingHelper = internalRepo.buildFileNameEncodingHelper();
525 0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	61 }
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	62
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	63 public void parents(Nodeid p1, Nodeid p2) {
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	64 parent1 = p1 == null ? Nodeid.NULL : p1;
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	65 parent2 = p2 == null ? Nodeid.NULL : p2;
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	66 }
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	67
580 bd5926e24aa3 Respect unix flags for checkout/revert Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 529 diff changeset	68 public void recordNormal(Path fname, int fmode, int mtime, int bytesWritten) {
526 2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	69 forget(fname);
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	70 normal.put(fname, new HgDirstate.Record(fmode, bytesWritten, mtime, fname, null));
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	71 }
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	72
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	73 public void recordUncertain(Path fname) {
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	74 // `hg revert` puts "n 0 -1 unset" for the reverted file, so shall we
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	75 forget(fname);
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	76 normal.put(fname, new HgDirstate.Record(0, -1, -1, fname, null));
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	77 }
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	78
529 95bdcf75e71e Command to schedule addition/removal of repository files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	79 public void recordAdded(Path fname, Flags flags, int size) {
95bdcf75e71e Command to schedule addition/removal of repository files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	80 forget(fname);
95bdcf75e71e Command to schedule addition/removal of repository files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	81 added.put(fname, new HgDirstate.Record(0, -1, -1, fname, null));
95bdcf75e71e Command to schedule addition/removal of repository files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	82 }
95bdcf75e71e Command to schedule addition/removal of repository files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	83
95bdcf75e71e Command to schedule addition/removal of repository files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	84 public void recordRemoved(Path fname) {
95bdcf75e71e Command to schedule addition/removal of repository files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	85 HgDirstate.Record r = forget(fname);
95bdcf75e71e Command to schedule addition/removal of repository files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	86 HgDirstate.Record n;
95bdcf75e71e Command to schedule addition/removal of repository files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	87 if (r == null) {
95bdcf75e71e Command to schedule addition/removal of repository files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	88 n = new HgDirstate.Record(0, -1, -1, fname, null);
95bdcf75e71e Command to schedule addition/removal of repository files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	89 } else {
95bdcf75e71e Command to schedule addition/removal of repository files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	90 n = new HgDirstate.Record(r.mode(), r.size(), r.modificationTime(), fname, r.copySource());
95bdcf75e71e Command to schedule addition/removal of repository files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	91 }
95bdcf75e71e Command to schedule addition/removal of repository files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	92 removed.put(fname, n);
95bdcf75e71e Command to schedule addition/removal of repository files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	93 }
95bdcf75e71e Command to schedule addition/removal of repository files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	94
95bdcf75e71e Command to schedule addition/removal of repository files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	95 private HgDirstate.Record forget(Path fname) {
95bdcf75e71e Command to schedule addition/removal of repository files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	96 HgDirstate.Record r;
95bdcf75e71e Command to schedule addition/removal of repository files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	97 if ((r = normal.remove(fname)) != null) {
95bdcf75e71e Command to schedule addition/removal of repository files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	98 return r;
95bdcf75e71e Command to schedule addition/removal of repository files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	99 }
95bdcf75e71e Command to schedule addition/removal of repository files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	100 if ((r = added.remove(fname)) != null) {
95bdcf75e71e Command to schedule addition/removal of repository files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	101 return r;
95bdcf75e71e Command to schedule addition/removal of repository files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	102 }
95bdcf75e71e Command to schedule addition/removal of repository files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	103 if ((r = removed.remove(fname)) != null) {
95bdcf75e71e Command to schedule addition/removal of repository files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	104 return r;
95bdcf75e71e Command to schedule addition/removal of repository files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	105 }
95bdcf75e71e Command to schedule addition/removal of repository files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	106 return merged.remove(fname);
525 0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	107 }
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	108
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	109 public void serialize(WritableByteChannel dest) throws IOException {
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	110 assert parent1 != null : "Parent(s) of the working directory shall be set first";
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	111 ByteBuffer bb = ByteBuffer.allocate(256);
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	112 bb.put(parent1.toByteArray());
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	113 bb.put(parent2.toByteArray());
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	114 bb.flip();
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	115 // header
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	116 int written = dest.write(bb);
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	117 if (written != bb.limit()) {
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	118 throw new IOException("Incomplete write");
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	119 }
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	120 bb.clear();
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	121 // entries
526 2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	122 @SuppressWarnings("unchecked")
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	123 Map<Path, HgDirstate.Record>[] all = new Map[] {normal, added, removed, merged};
529 95bdcf75e71e Command to schedule addition/removal of repository files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	124 ByteBuffer recordTypes = ByteBuffer.allocate(4);
95bdcf75e71e Command to schedule addition/removal of repository files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	125 recordTypes.put((byte) 'n').put((byte) 'a').put((byte) 'r').put((byte) 'm').flip();
526 2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	126 for (Map<Path, HgDirstate.Record> m : all) {
529 95bdcf75e71e Command to schedule addition/removal of repository files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	127 final byte recordType = recordTypes.get();
526 2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	128 for (HgDirstate.Record r : m.values()) {
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	129 // regular entry is 1+4+4+4+4+fname.length bytes
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	130 // it might get extended with copy origin, prepended with 0 byte
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	131 byte[] fname = encodingHelper.toDirstate(r.name());
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	132 byte[] copyOrigin = r.copySource() == null ? null : encodingHelper.toDirstate(r.copySource());
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	133 int length = fname.length + (copyOrigin == null ? 0 : (1 + copyOrigin.length));
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	134 bb = ensureCapacity(bb, 17 + length);
529 95bdcf75e71e Command to schedule addition/removal of repository files Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 526 diff changeset	135 bb.put(recordType);
526 2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	136 bb.putInt(r.mode());
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	137 bb.putInt(r.size());
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	138 bb.putInt(r.modificationTime());
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	139 bb.putInt(length);
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	140 bb.put(fname);
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	141 if (copyOrigin != null) {
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	142 bb.put((byte) 0);
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	143 bb.put(copyOrigin);
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	144 }
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	145 bb.flip();
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	146 written = dest.write(bb);
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	147 if (written != bb.limit()) {
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	148 throw new IOException("Incomplete write");
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	149 }
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	150 bb.clear();
525 0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	151 }
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	152 }
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	153 }
526 2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	154
617 65c01508f002 Rollback support for commands that modify repository. Strategy to keep complete copy of a file being changed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	155 public void serialize(Transaction tr) throws HgIOException {
65c01508f002 Rollback support for commands that modify repository. Strategy to keep complete copy of a file being changed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	156 File dirstateFile = tr.prepare(hgRepo.getRepositoryFile(Dirstate), hgRepo.getRepositoryFile(UndoDirstate));
526 2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	157 try {
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	158 FileChannel dirstate = new FileOutputStream(dirstateFile).getChannel();
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	159 serialize(dirstate);
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	160 dirstate.close();
617 65c01508f002 Rollback support for commands that modify repository. Strategy to keep complete copy of a file being changed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	161 tr.done(dirstateFile);
526 2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	162 } catch (IOException ex) {
617 65c01508f002 Rollback support for commands that modify repository. Strategy to keep complete copy of a file being changed Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 580 diff changeset	163 tr.failure(dirstateFile, ex);
526 2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	164 throw new HgIOException("Can't write down new directory state", ex, dirstateFile);
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	165 }
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	166 }
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	167
628 6526d8adbc0f Explicit HgRuntimeException to facilitate easy switch from runtime to checked exceptions Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 617 diff changeset	168 public void fillFrom(DirstateReader dirstate) throws HgInvalidControlFileException {
526 2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	169 // TODO preserve order, if reasonable and possible
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	170 dirstate.readInto(new HgDirstate.Inspector() {
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	171
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	172 public boolean next(EntryKind kind, Record entry) {
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	173 switch (kind) {
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	174 case Normal: normal.put(entry.name(), entry); break;
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	175 case Added : added.put(entry.name(), entry); break;
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	176 case Removed : removed.put(entry.name(), entry); break;
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	177 case Merged : merged.put(entry.name(), entry); break;
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	178 default: throw new HgInvalidStateException(String.format("Unexpected entry in the dirstate: %s", kind));
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	179 }
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	180 return true;
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	181 }
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	182 });
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	183 parents(dirstate.parents().first(), dirstate.parents().second());
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	184 }
2f9ed6bcefa2 Initial support for Revert command with accompanying minor refactoring Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 525 diff changeset	185
525 0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	186
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	187 private static ByteBuffer ensureCapacity(ByteBuffer buf, int cap) {
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	188 if (buf.capacity() >= cap) {
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	189 return buf;
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	190 }
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	191 return ByteBuffer.allocate(cap);
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	192 }
0be5be8d57e9 Repository checkout support, first iteration Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff changeset	193 }

Mercurial > hg4j

annotate src/org/tmatesoft/hg/internal/DirstateBuilder.java @ 694:7efabe0cddcf