Search in sources :

Example 1 with SvnCommittedChangesProvider

use of org.jetbrains.idea.svn.history.SvnCommittedChangesProvider in project intellij-community by JetBrains.

the class MergeCalculatorTask method getChangeLists.

@NotNull
private static <T> List<T> getChangeLists(@NotNull MergeContext mergeContext, @NotNull ChangeBrowserSettings settings, long revisionToExclude, int size, @NotNull PairFunction<SvnChangeList, LogHierarchyNode, T> resultProvider) throws VcsException {
    List<T> result = newArrayList();
    ((SvnCommittedChangesProvider) mergeContext.getVcs().getCommittedChangesProvider()).getCommittedChangesWithMergedRevisons(settings, new SvnRepositoryLocation(mergeContext.getSourceUrl()), size > 0 ? size + (revisionToExclude > 0 ? 2 : 1) : 0, (changeList, tree) -> {
        if (revisionToExclude != changeList.getNumber()) {
            result.add(resultProvider.fun(changeList, tree));
        }
    });
    return result;
}
Also used : SvnRepositoryLocation(org.jetbrains.idea.svn.history.SvnRepositoryLocation) SvnCommittedChangesProvider(org.jetbrains.idea.svn.history.SvnCommittedChangesProvider) NotNull(org.jetbrains.annotations.NotNull)

Aggregations

NotNull (org.jetbrains.annotations.NotNull)1 SvnCommittedChangesProvider (org.jetbrains.idea.svn.history.SvnCommittedChangesProvider)1 SvnRepositoryLocation (org.jetbrains.idea.svn.history.SvnRepositoryLocation)1