Mercurial > hg > mercurial
view mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/MergeCommand.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 | 771ae1b2f0b1 |
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.command.exception.MergeConflictException; import jetbrains.buildServer.vcs.VcsException; import org.jetbrains.annotations.NotNull; import java.io.File; public class MergeCommand extends BaseCommand { private String myMergeTool; private String myRevision; public MergeCommand(@NotNull CommandSettings commandSettings, @NotNull String hgPath, @NotNull File workingDir) { super(commandSettings, hgPath, workingDir); } public MergeCommand revision(@NotNull String revision) { myRevision = revision; return this; } public MergeCommand withMergeTool(@NotNull String mergeTool) { myMergeTool = mergeTool; return this; } public void call() throws VcsException { MercurialCommandLine cmd = createCommandLine(); cmd.addParameter("merge"); if (myRevision != null) cmd.addParameters("-r", myRevision); if (myMergeTool != null) cmd.addParameters("--tool", myMergeTool); CommandResult result = runCommand(cmd); if (result.getExitCode() == 1) throw new MergeConflictException(); } @NotNull @Override protected String getDescription() { return "hg merge"; } }