| Classes in this File | Line Coverage | Branch Coverage | Complexity | ||||
| MergeCommand |
|
| 1.25;1.25 |
| 1 | /* | |
| 2 | * #%L | |
| 3 | * JavaHg | |
| 4 | * %% | |
| 5 | * Copyright (C) 2011 aragost Trifork ag | |
| 6 | * %% | |
| 7 | * Permission is hereby granted, free of charge, to any person obtaining a copy | |
| 8 | * of this software and associated documentation files (the "Software"), to deal | |
| 9 | * in the Software without restriction, including without limitation the rights | |
| 10 | * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | |
| 11 | * copies of the Software, and to permit persons to whom the Software is | |
| 12 | * furnished to do so, subject to the following conditions: | |
| 13 | * | |
| 14 | * The above copyright notice and this permission notice shall be included in | |
| 15 | * all copies or substantial portions of the Software. | |
| 16 | * | |
| 17 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | |
| 18 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | |
| 19 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | |
| 20 | * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | |
| 21 | * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | |
| 22 | * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | |
| 23 | * THE SOFTWARE. | |
| 24 | * #L% | |
| 25 | */ | |
| 26 | package com.aragost.javahg.commands; | |
| 27 | ||
| 28 | import java.io.IOException; | |
| 29 | ||
| 30 | import com.aragost.javahg.Repository; | |
| 31 | import com.aragost.javahg.commands.flags.MergeCommandFlags; | |
| 32 | import com.aragost.javahg.internals.UpdateMergeHelper; | |
| 33 | import com.aragost.javahg.merge.MergeContext; | |
| 34 | ||
| 35 | /** | |
| 36 | * Command class for executing <tt>hg merge</tt>. Set flags from | |
| 37 | * {@link MergeCommandFlags} and call the {@link #execute} method. | |
| 38 | */ | |
| 39 | public class MergeCommand extends MergeCommandFlags { | |
| 40 | ||
| 41 | /** | |
| 42 | * @param repository | |
| 43 | * the repository associated with this command. | |
| 44 | */ | |
| 45 | public MergeCommand(Repository repository) { | |
| 46 | 10 | super(repository); |
| 47 | 10 | } |
| 48 | ||
| 49 | /** | |
| 50 | * Perform the merge. Since a merge is an interactive command, a | |
| 51 | * "merge oracle" must be supplied to answer any questions from | |
| 52 | * Mercurial. | |
| 53 | * <p> | |
| 54 | * Feedback about this API will be greatly appreciated. | |
| 55 | * | |
| 56 | * @param oracle | |
| 57 | * @return if no conflicts return true otherwise false | |
| 58 | * @throws IOException | |
| 59 | */ | |
| 60 | public boolean execute(ManifestMergeOracle oracle) throws IOException { | |
| 61 | 5 | new UpdateMergeHelper(launchStream(), oracle, this).merge(); |
| 62 | 5 | return getReturnCode() == 0; |
| 63 | } | |
| 64 | ||
| 65 | public MergeContext execute() throws IOException { | |
| 66 | 5 | MergeContext result = new MergeContext(this); |
| 67 | 5 | result.processStream(launchStream("-y", "--tool", "internal:fail"), false); |
| 68 | 5 | return result; |
| 69 | } | |
| 70 | ||
| 71 | @Override | |
| 72 | public boolean isSuccessful() { | |
| 73 | 10 | return super.isSuccessful() || getReturnCode() == 1; |
| 74 | } | |
| 75 | } |