blob: eac55c666ed26c5ef986bf0000186929f24d0913 [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.actions;
import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList;
import org.jetbrains.idea.svn.SvnVcs;
import org.jetbrains.idea.svn.integrate.IMerger;
import org.jetbrains.idea.svn.integrate.Merger;
import org.jetbrains.idea.svn.integrate.MergerFactory;
import org.jetbrains.idea.svn.update.UpdateEventHandler;
import org.tmatesoft.svn.core.SVNURL;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
public class ChangeListsMergerFactory implements MergerFactory {
protected final List<CommittedChangeList> myChangeListsList;
public ChangeListsMergerFactory(final List<CommittedChangeList> changeListsList) {
myChangeListsList = new ArrayList<CommittedChangeList>(changeListsList);
}
public IMerger createMerger(final SvnVcs vcs,
final File target,
final UpdateEventHandler handler,
final SVNURL currentBranchUrl,
String branchName) {
return new Merger(vcs, myChangeListsList, target, handler, currentBranchUrl, branchName);
}
}