Mercurial > hg > mercurial
view mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/MergeBaseWithRevsets.java @ 399:45f25ca68312 Faradi-7.0.x
Support local mirrors for subrepos
author | Dmitry Neverov <dmitry.neverov@jetbrains.com> |
---|---|
date | Fri, 02 Mar 2012 14:24:58 +0400 |
parents | mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MergeBaseWithRevsets.java@e0464f11206c |
children | 31a1aca3305c |
line wrap: on
line source
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; } } }