com.aragost.javahg.commands
Class ResolveCommand

java.lang.Object
  extended by com.aragost.javahg.internals.AbstractCommand
      extended by com.aragost.javahg.commands.flags.ResolveCommandFlags
          extended by com.aragost.javahg.commands.ResolveCommand

public class ResolveCommand
extends ResolveCommandFlags

Command class for executing hg resolve. The resolve command is actually a front-end for several sub-commands:


Nested Class Summary
 
Nested classes/interfaces inherited from class com.aragost.javahg.internals.AbstractCommand
AbstractCommand.State
 
Constructor Summary
ResolveCommand(Repository repository)
           
 
Method Summary
 String execute(String... files)
           
 boolean isSuccessful()
          Check if the command ended with a zero return code.
 List<ResolveStatusLine> list()
          This correspond to the --list option for resolve.
 void mark(String... files)
           
 void unmark(String... files)
           
 
Methods inherited from class com.aragost.javahg.commands.flags.ResolveCommandFlags
all, exclude, getCommandName, include, on, tool
 
Methods inherited from class com.aragost.javahg.internals.AbstractCommand
cancel, clear, cmdAppend, cmdAppend, cmdAppend, cmdAppend, cmdAppend, doneHook, getErrorString, getRepository, getReturnCode, launchIterator, launchStream, launchString, needsInputLine, reopenOutputChannelStream, sendLine, toString, withDebugAndChangesetStyle, withDebugFlag
 
Methods inherited from class java.lang.Object
clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
 

Constructor Detail

ResolveCommand

public ResolveCommand(Repository repository)
Parameters:
repository - the repository associated with this command.
Method Detail

execute

public String execute(String... files)
Parameters:
files - the files to re-merge
Returns:
the command output

list

public List<ResolveStatusLine> list()
This correspond to the --list option for resolve.

Returns:
List we status of merge files

isSuccessful

public boolean isSuccessful()
Description copied from class: AbstractCommand
Check if the command ended with a zero return code. Subclasses can override this to accept other return codes as successful.

Overrides:
isSuccessful in class AbstractCommand
Returns:
true if the command ended successfully.

mark

public void mark(String... files)
Parameters:
files - the files to mark as resolved.

unmark

public void unmark(String... files)
Parameters:
files - the files to mark as unresolved.


Copyright © 2011-2013 aragost Trifork ag. All Rights Reserved.