Mercurial > jhg
view src/org/tmatesoft/hg/repo/CommitFacility.java @ 549:83afa680555d
Annotate merge revision (combined diff against two parents without looking further)
author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
---|---|
date | Tue, 19 Feb 2013 21:17:39 +0100 |
parents | 67d4b0f73984 |
children | 6ca3d0c5b4bc |
line wrap: on
line source
/* * Copyright (c) 2013 TMate Software Ltd * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; version 2 of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * For information on how to redistribute this software under * the terms of a license other than GNU General Public License * contact TMate Software at support@hg4j.com */ package org.tmatesoft.hg.repo; import static org.tmatesoft.hg.repo.HgRepository.NO_REVISION; import java.io.IOException; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; import java.util.TreeMap; import org.tmatesoft.hg.core.HgRepositoryLockException; import org.tmatesoft.hg.core.Nodeid; import org.tmatesoft.hg.internal.ByteArrayChannel; import org.tmatesoft.hg.internal.ChangelogEntryBuilder; import org.tmatesoft.hg.internal.Experimental; import org.tmatesoft.hg.internal.FNCacheFile; import org.tmatesoft.hg.internal.ManifestEntryBuilder; import org.tmatesoft.hg.internal.ManifestRevision; import org.tmatesoft.hg.internal.RequiresFile; import org.tmatesoft.hg.internal.RevlogStream; import org.tmatesoft.hg.internal.RevlogStreamWriter; import org.tmatesoft.hg.util.Pair; import org.tmatesoft.hg.util.Path; import org.tmatesoft.hg.util.LogFacility.Severity; /** * WORK IN PROGRESS * * @author Artem Tikhomirov * @author TMate Software Ltd. */ @Experimental(reason="Work in progress") public class CommitFacility { private final HgRepository repo; private final int p1Commit, p2Commit; private Map<Path, Pair<HgDataFile, ByteDataSupplier>> files = new LinkedHashMap<Path, Pair<HgDataFile, ByteDataSupplier>>(); public CommitFacility(HgRepository hgRepo, int parentCommit) { this(hgRepo, parentCommit, NO_REVISION); } public CommitFacility(HgRepository hgRepo, int parent1Commit, int parent2Commit) { repo = hgRepo; p1Commit = parent1Commit; p2Commit = parent2Commit; if (parent1Commit != NO_REVISION && parent1Commit == parent2Commit) { throw new IllegalArgumentException("Merging same revision is dubious"); } } public boolean isMerge() { return p1Commit != NO_REVISION && p2Commit != NO_REVISION; } public void add(HgDataFile dataFile, ByteDataSupplier content) { files.put(dataFile.getPath(), new Pair<HgDataFile, ByteDataSupplier>(dataFile, content)); } public Nodeid commit(String message) throws HgRepositoryLockException { final HgChangelog clog = repo.getChangelog(); final int clogRevisionIndex = clog.getRevisionCount(); ManifestRevision c1Manifest = new ManifestRevision(null, null); ManifestRevision c2Manifest = new ManifestRevision(null, null); if (p1Commit != NO_REVISION) { repo.getManifest().walk(p1Commit, p1Commit, c1Manifest); } if (p2Commit != NO_REVISION) { repo.getManifest().walk(p2Commit, p2Commit, c2Manifest); } FNCacheFile fncache = null; if ((repo.getImplHelper().getRequiresFlags() & RequiresFile.FNCACHE) != 0) { fncache = new FNCacheFile(repo.getImplHelper()); try { fncache.read(new Path.SimpleSource()); } catch (IOException ex) { // fncache may be restored using native client, so do not treat failure to read it as severe enough to stop repo.getSessionContext().getLog().dump(getClass(), Severity.Error, ex, "Failed to read fncache, attempt commit nevertheless"); } } // Pair<Integer, Integer> manifestParents = getManifestParents(); Pair<Integer, Integer> manifestParents = new Pair<Integer, Integer>(c1Manifest.revisionIndex(), c2Manifest.revisionIndex()); TreeMap<Path, Nodeid> newManifestRevision = new TreeMap<Path, Nodeid>(); HashMap<Path, Pair<Integer, Integer>> fileParents = new HashMap<Path, Pair<Integer,Integer>>(); for (Path f : c1Manifest.files()) { HgDataFile df = repo.getFileNode(f); Nodeid fileKnownRev = c1Manifest.nodeid(f); final int fileRevIndex1 = df.getRevisionIndex(fileKnownRev); final int fileRevIndex2; if ((fileKnownRev = c2Manifest.nodeid(f)) != null) { // merged files fileRevIndex2 = df.getRevisionIndex(fileKnownRev); } else { fileRevIndex2 = NO_REVISION; } fileParents.put(f, new Pair<Integer, Integer>(fileRevIndex1, fileRevIndex2)); newManifestRevision.put(f, fileKnownRev); } // // Files ArrayList<Path> newlyAddedFiles = new ArrayList<Path>(); for (Pair<HgDataFile, ByteDataSupplier> e : files.values()) { HgDataFile df = e.first(); Pair<Integer, Integer> fp = fileParents.get(df.getPath()); if (fp == null) { // NEW FILE fp = new Pair<Integer, Integer>(NO_REVISION, NO_REVISION); } ByteDataSupplier bds = e.second(); // FIXME quickfix, instead, pass ByteDataSupplier directly to RevlogStreamWriter ByteBuffer bb = ByteBuffer.allocate(2048); ByteArrayChannel bac = new ByteArrayChannel(); while (bds.read(bb) != -1) { bb.flip(); bac.write(bb); bb.clear(); } RevlogStream contentStream; if (df.exists()) { contentStream = df.content; } else { contentStream = repo.createStoreFile(df.getPath()); newlyAddedFiles.add(df.getPath()); // FIXME df doesn't get df.content updated, and clients // that would attempt to access newly added file after commit would fail // (despite the fact the file is in there) } RevlogStreamWriter fileWriter = new RevlogStreamWriter(repo.getSessionContext(), contentStream); Nodeid fileRev = fileWriter.addRevision(bac.toArray(), clogRevisionIndex, fp.first(), fp.second()); newManifestRevision.put(df.getPath(), fileRev); } // // Manifest final ManifestEntryBuilder manifestBuilder = new ManifestEntryBuilder(); for (Map.Entry<Path, Nodeid> me : newManifestRevision.entrySet()) { manifestBuilder.add(me.getKey().toString(), me.getValue()); } RevlogStreamWriter manifestWriter = new RevlogStreamWriter(repo.getSessionContext(), repo.getManifest().content); Nodeid manifestRev = manifestWriter.addRevision(manifestBuilder.build(), clogRevisionIndex, manifestParents.first(), manifestParents.second()); // // Changelog final ChangelogEntryBuilder changelogBuilder = new ChangelogEntryBuilder(); changelogBuilder.setModified(files.keySet()); byte[] clogContent = changelogBuilder.build(manifestRev, message); RevlogStreamWriter changelogWriter = new RevlogStreamWriter(repo.getSessionContext(), clog.content); Nodeid changesetRev = changelogWriter.addRevision(clogContent, clogRevisionIndex, p1Commit, p2Commit); if (!newlyAddedFiles.isEmpty() && fncache != null) { for (Path p : newlyAddedFiles) { fncache.add(p); } try { fncache.write(); } catch (IOException ex) { // see comment above for fnchache.read() repo.getSessionContext().getLog().dump(getClass(), Severity.Error, ex, "Failed to write fncache, error ignored"); } } return changesetRev; } /* private Pair<Integer, Integer> getManifestParents() { return new Pair<Integer, Integer>(extractManifestRevisionIndex(p1Commit), extractManifestRevisionIndex(p2Commit)); } private int extractManifestRevisionIndex(int clogRevIndex) { if (clogRevIndex == NO_REVISION) { return NO_REVISION; } RawChangeset commitObject = repo.getChangelog().range(clogRevIndex, clogRevIndex).get(0); Nodeid manifestRev = commitObject.manifest(); if (manifestRev.isNull()) { return NO_REVISION; } return repo.getManifest().getRevisionIndex(manifestRev); } */ // unlike DataAccess (which provides structured access), this one // deals with a sequence of bytes, when there's no need in structure of the data public interface ByteDataSupplier { // TODO look if can resolve DataAccess in HgCloneCommand visibility issue int read(ByteBuffer buf); } public interface ByteDataConsumer { void write(ByteBuffer buf); } }