All Downloads are FREE. Search and download functionalities are using the official Maven repository.

com.aragost.javahg.commands.ResolveCommand Maven / Gradle / Ivy

/*
 * #%L
 * JavaHg
 * %%
 * Copyright (C) 2011 aragost Trifork ag
 * %%
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
 * in the Software without restriction, including without limitation the rights
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
 * 
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
 * 
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 * #L%
 */
package com.aragost.javahg.commands;

import java.io.IOException;
import java.util.List;

import com.aragost.javahg.Repository;
import com.aragost.javahg.commands.flags.ResolveCommandFlags;
import com.aragost.javahg.internals.HgInputStream;
import com.aragost.javahg.internals.Utils;
import com.google.common.collect.Lists;

/**
 * Command class for executing hg resolve. The resolve
 * command is actually a front-end for several sub-commands:
 * 
    *
  • with --list, it lists the current merge state. Use * {@link #list()} for this command.
  • *
  • with --mark and --unmark it manipulates the * current merge state. Use {@link #mark(String...)} and * {@link #unmark(String...)} for these commands.
  • *
  • without the above flags it re-merges files. Use * {@link #execute(String...)} for this command.
  • * *
*/ public class ResolveCommand extends ResolveCommandFlags { /** * @param repository * the repository associated with this command. */ public ResolveCommand(Repository repository) { super(repository); } /** * @param files * the files to re-merge * @return the command output * @throws IOException */ public String execute(String... files) throws IOException { return launchString(files); } /** * This correspond to the --list option for resolve. * * @return List we status of merge files * @throws IOException */ public List list() throws IOException { HgInputStream stream = launchStream("--list"); List result = Lists.newArrayList(); while (stream.peek() != -1) { result.add(ResolveStatusLine.fromStream(stream)); } return result; } /** * @param files * the files to mark as resolved. * @throws IOException */ public void mark(String... files) throws IOException { launchString(Utils.arrayUnshift("--mark", files)); } /** * @param files * the files to mark as unresolved. * @throws IOException */ public void unmark(String... files) throws IOException { launchString(Utils.arrayUnshift("--mark", files)); } }




© 2015 - 2025 Weber Informatics LLC | Privacy Policy