blob: c8a77f6d50d6b66e1ee2cd54476f878e8a9b31e6 [file] [log] [blame]
/*
* Copyright 2000-2009 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.update;
import com.intellij.openapi.options.Configurable;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.vcs.FilePath;
import com.intellij.openapi.vcs.VcsException;
import com.intellij.openapi.vcs.update.UpdatedFiles;
import org.jetbrains.idea.svn.SvnBundle;
import org.jetbrains.idea.svn.SvnConfiguration;
import org.jetbrains.idea.svn.SvnVcs;
import org.jetbrains.idea.svn.integrate.MergeClient;
import org.tmatesoft.svn.core.wc2.SvnTarget;
import java.io.File;
import java.util.ArrayList;
import java.util.Collection;
public class SvnIntegrateEnvironment extends AbstractSvnUpdateIntegrateEnvironment {
public SvnIntegrateEnvironment(final SvnVcs vcs) {
super(vcs);
}
protected AbstractUpdateIntegrateCrawler createCrawler(UpdateEventHandler eventHandler,
boolean totalUpdate,
ArrayList<VcsException> exceptions,
UpdatedFiles updatedFiles) {
return new IntegrateCrawler(myVcs, eventHandler, totalUpdate, exceptions, updatedFiles);
}
public Configurable createConfigurable(final Collection<FilePath> collection) {
if (collection.isEmpty()) return null;
return new SvnUpdateConfigurable(myVcs.getProject()){
protected AbstractSvnUpdatePanel createPanel() {
return new SvnIntegratePanel(myVcs, collection);
}
public String getDisplayName() {
return SvnBundle.message("integrate.display.name");
}
public String getHelpTopic() {
return "reference.dialogs.versionControl.integrate.project.subversion";
}
};
}
@Override
protected boolean isDryRun() {
return SvnConfiguration.getInstance(myVcs.getProject()).isMergeDryRun();
}
private static class IntegrateCrawler extends AbstractUpdateIntegrateCrawler {
public IntegrateCrawler(SvnVcs vcs,
UpdateEventHandler handler,
boolean totalUpdate,
Collection<VcsException> exceptions,
UpdatedFiles postUpdateFiles) {
super(totalUpdate,
postUpdateFiles,
exceptions,
handler, vcs);
}
protected void showProgressMessage(final ProgressIndicator progress, final File root) {
if (SvnConfiguration.getInstance(myVcs.getProject()).isMergeDryRun()) {
progress.setText(SvnBundle.message("progress.text.merging.dry.run.changes", root.getAbsolutePath()));
}
else {
progress.setText(SvnBundle.message("progress.text.merging.changes", root.getAbsolutePath()));
}
}
protected long doUpdate(final File root) throws VcsException {
final SvnConfiguration svnConfig = SvnConfiguration.getInstance(myVcs.getProject());
MergeRootInfo info = svnConfig.getMergeRootInfo(root, myVcs);
if (info.getUrlString1().equals(info.getUrlString2()) &&
info.getRevision1().equals(info.getRevision2())) {
return 0;
}
MergeClient client = myVcs.getFactory(root).createMergeClient();
SvnTarget source1 = SvnTarget.fromURL(info.getUrl1(), info.getRevision1());
SvnTarget source2 = SvnTarget.fromURL(info.getUrl2(), info.getRevision2());
client.merge(source1, source2, root, svnConfig.getUpdateDepth(), svnConfig.isMergeDiffUseAncestry(), svnConfig.isMergeDryRun(), false, false,
svnConfig.getMergeOptions(), myHandler);
return info.getResultRevision();
}
protected boolean isMerge() {
return true;
}
}
public boolean validateOptions(final Collection<FilePath> roots) {
return true;
}
}