tikhomirov@704: /*
tikhomirov@704:  * Copyright (c) 2013 TMate Software Ltd
tikhomirov@704:  *  
tikhomirov@704:  * This program is free software; you can redistribute it and/or modify
tikhomirov@704:  * it under the terms of the GNU General Public License as published by
tikhomirov@704:  * the Free Software Foundation; version 2 of the License.
tikhomirov@704:  *
tikhomirov@704:  * This program is distributed in the hope that it will be useful,
tikhomirov@704:  * but WITHOUT ANY WARRANTY; without even the implied warranty of
tikhomirov@704:  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
tikhomirov@704:  * GNU General Public License for more details.
tikhomirov@704:  *
tikhomirov@704:  * For information on how to redistribute this software under
tikhomirov@704:  * the terms of a license other than GNU General Public License
tikhomirov@704:  * contact TMate Software at support@hg4j.com
tikhomirov@704:  */
tikhomirov@704: package org.tmatesoft.hg.core;
tikhomirov@704: 
tikhomirov@704: import static org.tmatesoft.hg.repo.HgRepository.BAD_REVISION;
tikhomirov@704: 
tikhomirov@704: import java.io.InputStream;
tikhomirov@704: 
tikhomirov@704: import org.tmatesoft.hg.internal.Callback;
tikhomirov@704: import org.tmatesoft.hg.internal.CsetParamKeeper;
tikhomirov@704: import org.tmatesoft.hg.internal.Experimental;
tikhomirov@704: import org.tmatesoft.hg.internal.ManifestRevision;
tikhomirov@704: import org.tmatesoft.hg.internal.Pool;
tikhomirov@704: import org.tmatesoft.hg.repo.HgChangelog;
tikhomirov@704: import org.tmatesoft.hg.repo.HgParentChildMap;
tikhomirov@704: import org.tmatesoft.hg.repo.HgRepository;
tikhomirov@704: import org.tmatesoft.hg.repo.HgRepositoryLock;
tikhomirov@704: import org.tmatesoft.hg.repo.HgRevisionMap;
tikhomirov@704: import org.tmatesoft.hg.repo.HgRuntimeException;
tikhomirov@704: import org.tmatesoft.hg.util.CancelledException;
tikhomirov@704: import org.tmatesoft.hg.util.Path;
tikhomirov@704: 
tikhomirov@704: /**
tikhomirov@704:  * Merge two revisions, 'hg merge REV' counterpart
tikhomirov@704:  * 
tikhomirov@704:  * @author Artem Tikhomirov
tikhomirov@704:  * @author TMate Software Ltd.
tikhomirov@704:  * @since 1.2
tikhomirov@704:  */
tikhomirov@704: @Experimental(reason="Provisional API. Work in progress")
tikhomirov@704: public class HgMergeCommand extends HgAbstractCommand<HgMergeCommand> {
tikhomirov@704: 
tikhomirov@704: 	private final HgRepository repo;
tikhomirov@704: 	private int firstCset, secondCset, ancestorCset;
tikhomirov@704: 
tikhomirov@704: 	public HgMergeCommand(HgRepository hgRepo) {
tikhomirov@704: 		repo = hgRepo;
tikhomirov@704: 		firstCset = secondCset = ancestorCset = BAD_REVISION;
tikhomirov@704: 	}
tikhomirov@704: 	
tikhomirov@704: 	public HgMergeCommand changeset(Nodeid changeset) throws HgBadArgumentException {
tikhomirov@704: 		initHeadsAndAncestor(new CsetParamKeeper(repo).set(changeset).get());
tikhomirov@704: 		return this;
tikhomirov@704: 	}
tikhomirov@704: 	
tikhomirov@704: 	public HgMergeCommand changeset(int revisionIndex) throws HgBadArgumentException {
tikhomirov@704: 		initHeadsAndAncestor(new CsetParamKeeper(repo).set(revisionIndex).get());
tikhomirov@704: 		return this;
tikhomirov@704: 	}
tikhomirov@704: 
tikhomirov@704: 	public void execute(Mediator mediator) throws HgCallbackTargetException, HgRepositoryLockException, HgLibraryFailureException, CancelledException {
tikhomirov@704: 		if (firstCset == BAD_REVISION || secondCset == BAD_REVISION || ancestorCset == BAD_REVISION) {
tikhomirov@704: 			throw new IllegalArgumentException("Merge heads and their ancestors are not initialized");
tikhomirov@704: 		}
tikhomirov@704: 		final HgRepositoryLock wdLock = repo.getWorkingDirLock();
tikhomirov@704: 		wdLock.acquire();
tikhomirov@704: 		try {
tikhomirov@704: 			Pool<Nodeid> cacheRevs = new Pool<Nodeid>();
tikhomirov@704: 			Pool<Path> cacheFiles = new Pool<Path>();
tikhomirov@704: 			ManifestRevision m1, m2, ma;
tikhomirov@704: 			m1 = new ManifestRevision(cacheRevs, cacheFiles).init(repo, firstCset);
tikhomirov@704: 			m2 = new ManifestRevision(cacheRevs, cacheFiles).init(repo, secondCset);
tikhomirov@704: 			ma = new ManifestRevision(cacheRevs, cacheFiles).init(repo, ancestorCset);
tikhomirov@704: 			ResolverImpl resolver = new ResolverImpl();
tikhomirov@704: 			for (Path f : m1.files()) {
tikhomirov@704: 				Nodeid fileRevBase, fileRevA, fileRevB;
tikhomirov@704: 				if (m2.contains(f)) {
tikhomirov@704: 					fileRevA = m1.nodeid(f);
tikhomirov@704: 					fileRevB = m2.nodeid(f);
tikhomirov@704: 					fileRevBase = ma.contains(f) ? ma.nodeid(f) : null;
tikhomirov@704: 					if (fileRevA.equals(fileRevB)) {
tikhomirov@704: 						HgFileRevision fr = new HgFileRevision(repo, fileRevA, m1.flags(f), f);
tikhomirov@704: 						mediator.same(fr, fr, resolver);
tikhomirov@704: 					} else if (fileRevBase == fileRevA) {
tikhomirov@704: 						assert fileRevBase != null;
tikhomirov@704: 						HgFileRevision frBase = new HgFileRevision(repo, fileRevBase, ma.flags(f), f);
tikhomirov@704: 						HgFileRevision frSecond= new HgFileRevision(repo, fileRevB, m2.flags(f), f);
tikhomirov@704: 						mediator.fastForwardB(frBase, frSecond, resolver);
tikhomirov@704: 					} else if (fileRevBase == fileRevB) {
tikhomirov@704: 						assert fileRevBase != null;
tikhomirov@704: 						HgFileRevision frBase = new HgFileRevision(repo, fileRevBase, ma.flags(f), f);
tikhomirov@704: 						HgFileRevision frFirst = new HgFileRevision(repo, fileRevA, m1.flags(f), f);
tikhomirov@704: 						mediator.fastForwardA(frBase, frFirst, resolver);
tikhomirov@704: 					} else {
tikhomirov@704: 						HgFileRevision frBase = fileRevBase == null ? null : new HgFileRevision(repo, fileRevBase, ma.flags(f), f);
tikhomirov@704: 						HgFileRevision frFirst = new HgFileRevision(repo, fileRevA, m1.flags(f), f);
tikhomirov@704: 						HgFileRevision frSecond= new HgFileRevision(repo, fileRevB, m2.flags(f), f);
tikhomirov@704: 						mediator.resolve(frBase, frFirst, frSecond, resolver);
tikhomirov@704: 					}
tikhomirov@704: 				} else {
tikhomirov@704: 					// m2 doesn't contain the file, either new in m1, or deleted in m2
tikhomirov@704: 					HgFileRevision frFirst = new HgFileRevision(repo, m1.nodeid(f), m1.flags(f), f);
tikhomirov@704: 					if (ma.contains(f)) {
tikhomirov@704: 						// deleted in m2
tikhomirov@704: 						HgFileRevision frBase = new HgFileRevision(repo, ma.nodeid(f), ma.flags(f), f);
tikhomirov@704: 						mediator.onlyA(frBase, frFirst, resolver);
tikhomirov@704: 					} else {
tikhomirov@704: 						// new in m1
tikhomirov@704: 						mediator.newInA(frFirst, resolver);
tikhomirov@704: 					}
tikhomirov@704: 				}
tikhomirov@704: 				resolver.apply();
tikhomirov@704: 			} // for m1 files
tikhomirov@704: 			for (Path f : m2.files()) {
tikhomirov@704: 				if (m1.contains(f)) {
tikhomirov@704: 					continue;
tikhomirov@704: 				}
tikhomirov@704: 				HgFileRevision frSecond= new HgFileRevision(repo, m2.nodeid(f), m2.flags(f), f);
tikhomirov@704: 				// file in m2 is either new or deleted in m1
tikhomirov@704: 				if (ma.contains(f)) {
tikhomirov@704: 					// deleted in m1
tikhomirov@704: 					HgFileRevision frBase = new HgFileRevision(repo, ma.nodeid(f), ma.flags(f), f);
tikhomirov@704: 					mediator.onlyB(frBase, frSecond, resolver);
tikhomirov@704: 				} else {
tikhomirov@704: 					// new in m2
tikhomirov@704: 					mediator.newInB(frSecond, resolver);
tikhomirov@704: 				}
tikhomirov@704: 				resolver.apply();
tikhomirov@704: 			}
tikhomirov@704: 		} catch (HgRuntimeException ex) {
tikhomirov@704: 			throw new HgLibraryFailureException(ex);
tikhomirov@704: 		} finally {
tikhomirov@704: 			wdLock.release();
tikhomirov@704: 		}
tikhomirov@704: 	}
tikhomirov@704: 
tikhomirov@704: 	private void initHeadsAndAncestor(int csetIndexB) throws HgBadArgumentException {
tikhomirov@704: 		firstCset = secondCset = ancestorCset = BAD_REVISION;
tikhomirov@704: 		if (csetIndexB == HgRepository.BAD_REVISION) {
tikhomirov@704: 			throw new HgBadArgumentException("Need valid second head for merge", null);
tikhomirov@704: 		}
tikhomirov@704: 		// TODO cache/share parent-child map, e.g. right in HgChangelog?! #getOrCreate
tikhomirov@704: 		HgParentChildMap<HgChangelog> pmap = new HgParentChildMap<HgChangelog>(repo.getChangelog());
tikhomirov@704: 		pmap.init();
tikhomirov@704: 		final HgRevisionMap<HgChangelog> rmap = pmap.getRevisionMap();
tikhomirov@704: 		final Nodeid csetA = repo.getWorkingCopyParents().first();
tikhomirov@704: 		final Nodeid csetB = rmap.revision(csetIndexB);
tikhomirov@704: 		final Nodeid ancestor = pmap.ancestor(csetA, csetB);
tikhomirov@704: 		assert !ancestor.isNull();
tikhomirov@704: 		if (ancestor.equals(csetA) || ancestor.equals(csetB)) {
tikhomirov@704: 			throw new HgBadArgumentException(String.format("Revisions %s and %s are on the same line of descent, use update instead of merge", csetA.shortNotation(), csetB.shortNotation()), null);
tikhomirov@704: 		}
tikhomirov@704: 		firstCset = rmap.revisionIndex(csetA);
tikhomirov@704: 		secondCset = csetIndexB;
tikhomirov@704: 		ancestorCset = rmap.revisionIndex(ancestor);
tikhomirov@704: 	}
tikhomirov@704: 
tikhomirov@704: 	/**
tikhomirov@704: 	 * This is the way client code takes part in the merge process
tikhomirov@704: 	 */
tikhomirov@704: 	@Experimental(reason="Provisional API. Work in progress")
tikhomirov@704: 	@Callback
tikhomirov@704: 	public interface Mediator {
tikhomirov@704: 		public void same(HgFileRevision first, HgFileRevision second, Resolver resolver) throws HgCallbackTargetException;
tikhomirov@704: 		public void onlyA(HgFileRevision base, HgFileRevision rev, Resolver resolver) throws HgCallbackTargetException;
tikhomirov@704: 		public void onlyB(HgFileRevision base, HgFileRevision rev, Resolver resolver) throws HgCallbackTargetException;
tikhomirov@704: 		public void newInA(HgFileRevision rev, Resolver resolver) throws HgCallbackTargetException;
tikhomirov@704: 		public void newInB(HgFileRevision rev, Resolver resolver) throws HgCallbackTargetException;
tikhomirov@704: 		public void fastForwardA(HgFileRevision base, HgFileRevision first, Resolver resolver) throws HgCallbackTargetException;
tikhomirov@704: 		public void fastForwardB(HgFileRevision base, HgFileRevision second, Resolver resolver) throws HgCallbackTargetException;
tikhomirov@704: 		public void resolve(HgFileRevision base, HgFileRevision first, HgFileRevision second, Resolver resolver) throws HgCallbackTargetException;
tikhomirov@704: 	}
tikhomirov@704: 
tikhomirov@704: 	/**
tikhomirov@704: 	 * Clients shall not implement this interface.
tikhomirov@704: 	 * They use this API from inside {@link Mediator#resolve(HgFileRevision, HgFileRevision, HgFileRevision, Resolver)}
tikhomirov@704: 	 */
tikhomirov@704: 	@Experimental(reason="Provisional API. Work in progress")
tikhomirov@704: 	public interface Resolver {
tikhomirov@704: 		public void use(HgFileRevision rev);
tikhomirov@704: 		public void use(InputStream content);
tikhomirov@704: 		public void unresolved(); // record the file for later processing by 'hg resolve'
tikhomirov@704: 	}
tikhomirov@704: 
tikhomirov@704: 	private static class ResolverImpl implements Resolver {
tikhomirov@704: 		void apply() {
tikhomirov@704: 		}
tikhomirov@704: 
tikhomirov@704: 		public void use(HgFileRevision rev) {
tikhomirov@704: 			// TODO Auto-generated method stub
tikhomirov@704: 		}
tikhomirov@704: 
tikhomirov@704: 		public void use(InputStream content) {
tikhomirov@704: 			// TODO Auto-generated method stub
tikhomirov@704: 		}
tikhomirov@704: 
tikhomirov@704: 		public void unresolved() {
tikhomirov@704: 			// TODO Auto-generated method stub
tikhomirov@704: 		}
tikhomirov@704: 	}
tikhomirov@704: }