view mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CollectChangesWithRevsets.java @ 1124:a14a2f7e74d8 development/2024.03.x tip

2024.03.x branch is created
author Nadia Burnasheva <nadezhda.burnasheva@jetbrains.com>
date Thu, 15 Feb 2024 11:33:35 +0100
parents e3fd42482b1b
children
line wrap: on
line source
/*
 * Copyright 2000-2018 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 jetbrains.buildServer.buildTriggers.vcs.mercurial.command;

import jetbrains.buildServer.buildTriggers.vcs.mercurial.ServerHgRepo;
import jetbrains.buildServer.vcs.VcsException;
import org.jetbrains.annotations.NotNull;

import java.util.List;

/**
 * @author dmitry.neverov
 */
public class CollectChangesWithRevsets extends CollectChangesCommand {

  private final HgVcsRoot myRoot;
  private final ServerHgRepo myRepo;

  public CollectChangesWithRevsets(@NotNull HgVcsRoot root, @NotNull ServerHgRepo repo) {
    myRoot = root;
    myRepo = repo;
  }

  @Override
  public List<ChangeSet> call() throws VcsException {
    return call(myFromRevisions, myToRevision);
  }

  @NotNull
  public List<ChangeSet> call(@NotNull final List<String> fromCommits, @NotNull final String toCommit) throws VcsException {
    StringBuilder revsets = new StringBuilder();
    revsets.append("ancestors(").append(toCommit).append(")");
    for (String from : fromCommits) {
      revsets.append(" - ancestors(").append(from).append(")");
    }
    if (myIncludeFromRevision) {
      for (String from : fromCommits) {
        revsets.append(" + ").append(from);
      }
    }
    List<ChangeSet> result = myRepo.log(myRoot)
            .showCommitsFromAllBranches()
            .withRevsets(revsets.toString())
            .call();

    if (!myRepo.supportsChangedFilesForMerges()) {
      for (ChangeSet cs: result) {
        if (cs.getParents().size() > 1) {
          // new version of Mercurial does not include merge commit changed files into the log
          // let's fetch the files with a separate command (https://youtrack.jetbrains.com/issue/TW-79815)
          final List<FileStatus> files = myRepo.status().fromRevision(cs.getParents().get(0).getId()).toRevision(cs.getId()).call();
          cs.setModifiedFiles(files);
        }
      }
    }

    return result;
  }
}