blob: 29dd1530032df41135b5f2bbd1377af3642521b2 [file] [log] [blame]
/*
* Copyright 2000-2010 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.idea.svn.dialogs;
import com.intellij.openapi.vcs.VcsException;
import com.intellij.util.Consumer;
import org.jetbrains.idea.svn.SvnConfiguration;
import org.jetbrains.idea.svn.SvnVcs;
import org.jetbrains.idea.svn.integrate.IMerger;
import org.jetbrains.idea.svn.integrate.MergeClient;
import org.jetbrains.idea.svn.update.UpdateEventHandler;
import org.tmatesoft.svn.core.SVNDepth;
import org.tmatesoft.svn.core.SVNException;
import org.tmatesoft.svn.core.SVNURL;
import org.tmatesoft.svn.core.io.SVNRepository;
import org.tmatesoft.svn.core.wc.SVNDiffOptions;
import org.tmatesoft.svn.core.wc.SVNRevision;
import org.tmatesoft.svn.core.wc2.SvnTarget;
import java.io.File;
public class BranchMerger implements IMerger {
private final SvnVcs myVcs;
private final String myTargetPath;
private final SVNURL mySourceUrl;
private final SVNURL myTargetUrl;
private final UpdateEventHandler myHandler;
private final boolean myReintegrate;
private final String myBranchName;
private final long mySourceCopyRevision;
private boolean myAtStart;
private long mySourceLatestRevision;
public BranchMerger(final SvnVcs vcs,
final SVNURL sourceUrl,
final SVNURL targetUrl, final String targetPath,
final UpdateEventHandler handler,
final boolean isReintegrate, final String branchName, final long sourceCopyRevision) {
myVcs = vcs;
myTargetPath = targetPath;
mySourceUrl = sourceUrl;
myTargetUrl = targetUrl;
myHandler = handler;
myReintegrate = isReintegrate;
myBranchName = branchName;
mySourceCopyRevision = sourceCopyRevision;
myAtStart = true;
// TODO: Rewrite this SVNKit usage
SVNRepository repository = null;
try {
repository = myVcs.createRepository(mySourceUrl);
mySourceLatestRevision = repository.getLatestRevision();
}
catch (SVNException e) {
mySourceLatestRevision = SVNRevision.HEAD.getNumber();
} finally {
if (repository != null) {
repository.closeSession();
}
}
}
public String getComment() {
return "Merge all from " + myBranchName + " at " + mySourceLatestRevision +(myReintegrate ? " (reintegration)" : "");
}
public boolean hasNext() {
return myAtStart;
}
public void mergeNext() throws SVNException, VcsException {
myAtStart = false;
File destination = new File(myTargetPath);
MergeClient client = myVcs.getFactory(destination).createMergeClient();
if (myReintegrate) {
client.merge(SvnTarget.fromURL(mySourceUrl), destination, false, createDiffOptions(), myHandler);
} else {
client.merge(SvnTarget.fromURL(mySourceUrl, SVNRevision.create(mySourceCopyRevision)),
SvnTarget.fromURL(mySourceUrl, SVNRevision.create(mySourceLatestRevision)), destination, SVNDepth.INFINITY, false, false,
true, createDiffOptions(), myHandler);
}
}
private SVNDiffOptions createDiffOptions() {
return myVcs.getSvnConfiguration().getMergeOptions();
}
public void getInfo(Consumer<String> holder, boolean getLatest) {
}
public File getMergeInfoHolder() {
return new File(myTargetPath);
}
public void afterProcessing() {
}
public void getSkipped(Consumer<String> holder) {
}
}