view mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/MergeBaseWithRevsets.java @ 893:1558f8257474

gather progress only if command reports it
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Fri, 07 Nov 2014 16:05:09 +0100
parents 31a1aca3305c
children 7bf4d943d5bb
line wrap: on
line source
/*
 * Copyright 2000-2014 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.HgRepo;
import jetbrains.buildServer.vcs.VcsException;
import org.jetbrains.annotations.NotNull;

import java.util.List;

/**
 * Implementation of merge-base using hg revsets
 * @author dmitry.neverov
 */
public final class MergeBaseWithRevsets extends MergeBaseCommand {

  public MergeBaseWithRevsets(@NotNull HgRepo repo) {
    super(repo);
  }

  public String call() throws VcsException {
    try {
      List<ChangeSet> csets = myRepo.log()
              .withRevsets("ancestor(" + new ChangeSetRevision(myRevision1).getId() + ", " + new ChangeSetRevision(myRevision2).getId() + ")")
              .showCommitsFromAllBranches()
              .dontCalculateParents()
              .call();
      return csets.isEmpty() ? null : csets.get(0).getId();
    } catch (VcsException e) {
      return null;
    }
  }
}