com.perforce.p4java.option.Options
com.perforce.p4java.option.client.ResolveFilesAutoOptions
|
||||||||||
| PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
| SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD | |||||||||
java.lang.Object
public class ResolveFilesAutoOptions
Options class for IClient.resolveFilesAuto.
Note that absolutely no sanity checking is performed in the current default implementation for clashing options, etc.
IClient.resolveFilesAuto(java.util.List, com.perforce.p4java.option.client.ResolveFilesAutoOptions)| Field Summary | |
|---|---|
protected boolean |
acceptTheirs
If true, automatically accept "their" changes, as documented for the p4 "-at" option. |
protected boolean |
acceptYours
If true, automatically accept "your" changes, as documented for the p4 "-ay" option. |
protected int |
changelistId
Limits 'p4 resolve' to the files in changelist#. |
protected boolean |
forceResolve
Forces auto-mode resolve to accept the merged file even if there are conflicts. |
protected boolean |
forceTextualMerge
If true, forces 'p4 resolve' to attempt a textual merge, even for files with non-text (binary) types. |
protected boolean |
ignoreLineEndings
If true, ignores differences in line-ending convention. |
protected boolean |
ignoreWhitespace
If true, ignores whitespace altogether (for instance, deletion of tabs or other whitespace). |
protected boolean |
ignoreWhitespaceChanges
If true, ignores whitespace-only changes (for instance, a tab replaced by eight spaces). |
static String |
OPTIONS_SPECS
Options: -n, -s, -af, -at, -ay, -as, -Aa, -Ab, -Ac, -Ad, -Am, -At, -c[changelist], -t, -db, -dw, -dl, -o |
protected boolean |
resolveFileAttributeChanges
Resolve file attribute changes. |
protected boolean |
resolveFileBranching
Resolve file branching. |
protected boolean |
resolveFileContentChanges
Resolve file content changes. |
protected boolean |
resolveFileDeletions
Resolve file deletions. |
protected boolean |
resolveFiletypeChanges
Resolve filetype changes. |
protected boolean |
resolveMovedFiles
Resolve moved and renamed files. |
protected boolean |
safeMerge
If true, only do "safe" resolves, as documented for the p4 "-as" option. |
protected boolean |
showActionsOnly
If true, don't do the actual resolve, just return the actions that would have been performed for the resolve. |
protected boolean |
showBase
If true, show the base file name and revision to be used during the merge. |
protected boolean |
skipFile
If true, skip this file. |
| Fields inherited from class com.perforce.p4java.option.Options |
|---|
immutable, optionList, OPTPFX |
| Constructor Summary | |
|---|---|
ResolveFilesAutoOptions()
Default constructor. |
|
ResolveFilesAutoOptions(boolean showActionsOnly,
boolean safeMerge,
boolean acceptTheirs,
boolean acceptYours,
boolean forceResolve)
Explicit-value constructor. |
|
ResolveFilesAutoOptions(boolean showActionsOnly,
boolean safeMerge,
boolean acceptTheirs,
boolean acceptYours,
boolean forceResolve,
boolean resolveFileBranching,
boolean resolveFileContentChanges,
boolean resolveFileDeletions,
boolean resolveMovedFiles,
boolean resolveFiletypeChanges,
int changelistId)
Explicit-value constructor. |
|
ResolveFilesAutoOptions(boolean showActionsOnly,
boolean safeMerge,
boolean acceptTheirs,
boolean acceptYours,
boolean forceResolve,
boolean resolveFileBranching,
boolean resolveFileContentChanges,
boolean resolveFileDeletions,
boolean resolveMovedFiles,
boolean resolveFiletypeChanges,
int changelistId,
boolean forceTextualMerge,
boolean ignoreWhitespaceChanges,
boolean ignoreWhitespace,
boolean ignoreLineEndings)
Explicit-value constructor. |
|
ResolveFilesAutoOptions(String... options)
Strings-based constructor; see 'p4 help [command]' for possible options. |
|
| Methods inherited from class com.perforce.p4java.option.Options |
|---|
applyRule, applyRule, applyRule, applyRule, getOptions, isImmutable, processFields, setImmutable, setOptions |
| Methods inherited from class java.lang.Object |
|---|
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait |
| Field Detail |
|---|
public static final String OPTIONS_SPECS
protected boolean safeMerge
protected boolean acceptTheirs
protected boolean acceptYours
protected boolean showActionsOnly
protected boolean skipFile
protected boolean forceResolve
protected boolean resolveFileAttributeChanges
protected boolean resolveFileBranching
protected boolean resolveFileContentChanges
protected boolean resolveFileDeletions
protected boolean resolveMovedFiles
protected boolean resolveFiletypeChanges
protected int changelistId
protected boolean forceTextualMerge
protected boolean ignoreWhitespaceChanges
protected boolean ignoreWhitespace
protected boolean ignoreLineEndings
protected boolean showBase
| Constructor Detail |
|---|
public ResolveFilesAutoOptions()
public ResolveFilesAutoOptions(String... options)
WARNING: you should not pass more than one option or argument in each string parameter. Each option or argument should be passed-in as its own separate string parameter, without any spaces between the option and the option value (if any).
NOTE: setting options this way always bypasses the internal options values, and getter methods against the individual values corresponding to the strings passed in to this constructor will not normally reflect the string's setting. Do not use this constructor unless you know what you're doing and / or you do not also use the field getters and setters.
Options.Options(java.lang.String...)
public ResolveFilesAutoOptions(boolean showActionsOnly,
boolean safeMerge,
boolean acceptTheirs,
boolean acceptYours,
boolean forceResolve)
public ResolveFilesAutoOptions(boolean showActionsOnly,
boolean safeMerge,
boolean acceptTheirs,
boolean acceptYours,
boolean forceResolve,
boolean resolveFileBranching,
boolean resolveFileContentChanges,
boolean resolveFileDeletions,
boolean resolveMovedFiles,
boolean resolveFiletypeChanges,
int changelistId)
public ResolveFilesAutoOptions(boolean showActionsOnly,
boolean safeMerge,
boolean acceptTheirs,
boolean acceptYours,
boolean forceResolve,
boolean resolveFileBranching,
boolean resolveFileContentChanges,
boolean resolveFileDeletions,
boolean resolveMovedFiles,
boolean resolveFiletypeChanges,
int changelistId,
boolean forceTextualMerge,
boolean ignoreWhitespaceChanges,
boolean ignoreWhitespace,
boolean ignoreLineEndings)
| Method Detail |
|---|
public List<String> processOptions(IServer server)
throws OptionsException
OptionsThe method is used by the server object to generate the string-based arguments expected by the Perforce server corresponding to the state of this method-specific options object. Will return an empty list if there are no "interesting" options set or available. May simply return the superclass options string list if is non-null, but that behaviour is neither guaranteed nor required.
Note that this method is not intended to be called directly by users but by the underlying P4Java plumbing; odd results may occur if this method is called in other contexts.
processOptions in class Optionsserver - possibly-null IServer representing the Perforce server
the options are to be used against. If this parameter is
null, it is acceptable to throw an OptionsException, but
it is also possible to ignore it and do the best you can
with what you've got...
OptionsException - if an error occurs in options processing that is
not some species of ConnectionException, RequestException,
AccessException, etc.Options.processOptions(com.perforce.p4java.server.IServer)public boolean isSafeMerge()
public ResolveFilesAutoOptions setSafeMerge(boolean safeMerge)
public boolean isAcceptTheirs()
public ResolveFilesAutoOptions setAcceptTheirs(boolean acceptTheirs)
public boolean isAcceptYours()
public ResolveFilesAutoOptions setAcceptYours(boolean acceptYours)
public boolean isShowActionsOnly()
public ResolveFilesAutoOptions setShowActionsOnly(boolean showActionsOnly)
public boolean isSkipFile()
public ResolveFilesAutoOptions setSkipFile(boolean skipFile)
public boolean isForceResolve()
public ResolveFilesAutoOptions setForceResolve(boolean forceResolve)
public boolean isResolveFileBranching()
public ResolveFilesAutoOptions setResolveFileBranching(boolean resolveFileBranching)
public boolean isResolveFileContentChanges()
public ResolveFilesAutoOptions setResolveFileContentChanges(boolean resolveFileContentChanges)
public boolean isResolveFileDeletions()
public ResolveFilesAutoOptions setResolveFileDeletions(boolean resolveFileDeletions)
public boolean isResolveMovedFiles()
public ResolveFilesAutoOptions setResolveMovedFiles(boolean resolveMovedFiles)
public boolean isResolveFiletypeChanges()
public ResolveFilesAutoOptions setResolveFiletypeChanges(boolean resolveFiletypeChanges)
public boolean isResolveFileAttributeChanges()
public ResolveFilesAutoOptions setResolveFileAttributeChanges(boolean resolveFileAttributeChanges)
public ResolveFilesAutoOptions setResolveResolveType(String type,
boolean enable)
public int getChangelistId()
public ResolveFilesAutoOptions setChangelistId(int changelistId)
public boolean isForceTextualMerge()
public ResolveFilesAutoOptions setForceTextualMerge(boolean forceTextualMerge)
public boolean isIgnoreWhitespaceChanges()
public ResolveFilesAutoOptions setIgnoreWhitespaceChanges(boolean ignoreWhitespaceChanges)
public boolean isIgnoreWhitespace()
public ResolveFilesAutoOptions setIgnoreWhitespace(boolean ignoreWhitespace)
public boolean isIgnoreLineEndings()
public ResolveFilesAutoOptions setIgnoreLineEndings(boolean ignoreLineEndings)
public boolean isShowBase()
public ResolveFilesAutoOptions setShowBase(boolean showBase)
|
||||||||||
| PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
| SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD | |||||||||