public class IntegrateFilesOptions extends Options
Note that this implementation extends the normal default options processing with its own method(s) due to the complexity of the various -D and -R flag options; note also the somewhat odd relationship with the previous IntegrationOptions class.
Note also that the current implementation makes no attempt to validate the sanity or otherwise of the various options and their combination.
Modifier and Type | Field and Description |
---|---|
protected boolean |
bidirectionalInteg
Cause the branch view to work bidirectionally, where the scope of
the command is limited to integrations whose 'from' files match
fromFile[revRange].
|
protected java.lang.String |
branch
If non-null, use a user-defined branch view.
|
protected boolean |
branchResolves
Schedules 'branch resolves' instead of branching new target files
automatically.
|
protected int |
changelistId
If positive, the integrated files are opened in the numbered
pending changelist instead of the default changelist.
|
protected boolean |
deleteResolves
Schedules 'delete resolves' instead of deleting target files
automatically.
|
protected boolean |
deleteTargetAfterDelete
If the source file has been deleted and the target
file has changed, will delete the target file.
|
protected boolean |
displayBaseDetails
Display the base file name and revision which will
be used in subsequent resolves if a resolve is needed.
|
protected boolean |
doBaselessMerge
Enables integration between files that have no
integration history.
|
protected boolean |
dontCopyToClient
Don't copy newly branched files to the client.
|
protected boolean |
forceIntegration
Forces integrate to act without regard for previous
integration history.
|
protected boolean |
integ2
-2 enable old version 2 integration engine
|
protected boolean |
integrateAllAfterReAdd
If the source file has been deleted and re-added,
will attempt to integrate all outstanding revisions
of the file, including those revisions prior to the
delete.
|
protected boolean |
integrateAroundDeletedRevs
If true, enable integrations around deleted revisions; equivalent
to -d (i.e.
|
protected int |
maxFiles
If positive, integrate only the first maxFiles files.
|
static java.lang.String |
OPTIONS_SPECS
Options: -c[changelist], -d, -D[flag], -R[flag], -f, -h, -i, -o, -n, -t, -q, -v, -m[max], -b[branch], -S[stream], -P[parentStream], -r, -s
|
protected java.lang.String |
parentStream
If non-null, specify a parent stream other than the stream's actual
parent.
|
protected boolean |
propagateType
Propagate the source file's filetype to the target file.
|
protected boolean |
quiet
If true, suppresses normal output messages.
|
protected boolean |
rebranchSourceAfterDelete
If the target file has been deleted and the source
file has changed, will re-branch the source file
on top of the target file.
|
protected boolean |
reverseMapping
Reverse the mappings in the branch view, with the
target files and source files exchanging place.
|
protected boolean |
showActionsOnly
Display what integrations would be necessary but don't
actually do them.
|
protected boolean |
showBaseRevision
-Ob Show the base revision for the merge (if any).
|
protected boolean |
showScheduledResolve
-Or Show the resolve(s) that are being scheduled.
|
protected boolean |
skipIntegratedRevs
Skips cherry-picked revisions already integrated.
|
protected java.lang.String |
stream
If not null, makes 'p4 integrate' use a stream's branch view.
|
protected boolean |
useHaveRev
Causes the target files to be left at the revision
currently on the client (the '#have' revision).
|
immutable, optionList
Constructor and Description |
---|
IntegrateFilesOptions()
Default constructor.
|
IntegrateFilesOptions(int changelistId,
boolean bidirectionalInteg,
boolean integrateAroundDeletedRevs,
boolean rebranchSourceAfterDelete,
boolean deleteTargetAfterDelete,
boolean integrateAllAfterReAdd,
boolean branchResolves,
boolean deleteResolves,
boolean skipIntegratedRevs,
boolean forceIntegration,
boolean useHaveRev,
boolean doBaselessMerge,
boolean displayBaseDetails,
boolean showActionsOnly,
boolean reverseMapping,
boolean propagateType,
boolean dontCopyToClient,
int maxFiles)
Explicit-value constructor.
|
IntegrateFilesOptions(int changelistId,
boolean integrateAroundDeletedRevs,
boolean rebranchSourceAfterDelete,
boolean deleteTargetAfterDelete,
boolean integrateAllAfterReAdd,
boolean branchResolves,
boolean deleteResolves,
boolean skipIntegratedRevs,
boolean forceIntegration,
boolean useHaveRev,
boolean doBaselessMerge,
boolean displayBaseDetails,
boolean showActionsOnly,
boolean propagateType,
boolean dontCopyToClient,
int maxFiles,
java.lang.String branch,
boolean reverseMapping,
boolean bidirectionalInteg)
Explicit-value constructor for use with a branch.
|
IntegrateFilesOptions(int changelistId,
boolean integrateAroundDeletedRevs,
boolean rebranchSourceAfterDelete,
boolean deleteTargetAfterDelete,
boolean integrateAllAfterReAdd,
boolean branchResolves,
boolean deleteResolves,
boolean skipIntegratedRevs,
boolean forceIntegration,
boolean useHaveRev,
boolean doBaselessMerge,
boolean displayBaseDetails,
boolean showActionsOnly,
boolean propagateType,
boolean dontCopyToClient,
int maxFiles,
java.lang.String stream,
java.lang.String parentStream,
boolean reverseMapping)
Explicit-value constructor for use with a stream.
|
IntegrateFilesOptions(int changelistId,
boolean bidirectionalInteg,
boolean integrateAroundDeletedRevs,
boolean rebranchSourceAfterDelete,
boolean deleteTargetAfterDelete,
boolean integrateAllAfterReAdd,
boolean forceIntegration,
boolean useHaveRev,
boolean doBaselessMerge,
boolean displayBaseDetails,
boolean showActionsOnly,
boolean reverseMapping,
boolean propagateType,
boolean dontCopyToClient,
int maxFiles)
Explicit-value constructor.
|
IntegrateFilesOptions(java.lang.String... options)
Strings-based constructor; see 'p4 help [command]' for possible options.
|
getOptions, isImmutable, processFields, setImmutable, setOptions
public static final java.lang.String OPTIONS_SPECS
protected int changelistId
protected boolean bidirectionalInteg
protected boolean integrateAroundDeletedRevs
protected boolean rebranchSourceAfterDelete
protected boolean deleteTargetAfterDelete
protected boolean integrateAllAfterReAdd
protected boolean branchResolves
protected boolean deleteResolves
protected boolean skipIntegratedRevs
protected boolean forceIntegration
protected boolean useHaveRev
protected boolean doBaselessMerge
protected boolean displayBaseDetails
protected boolean showActionsOnly
protected boolean reverseMapping
protected boolean propagateType
protected boolean quiet
protected boolean dontCopyToClient
protected int maxFiles
protected java.lang.String branch
protected java.lang.String stream
protected java.lang.String parentStream
protected boolean showBaseRevision
protected boolean showScheduledResolve
protected boolean integ2
public IntegrateFilesOptions()
public IntegrateFilesOptions(java.lang.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
- optionsOptions(java.lang.String...)
public IntegrateFilesOptions(int changelistId, boolean bidirectionalInteg, boolean integrateAroundDeletedRevs, boolean rebranchSourceAfterDelete, boolean deleteTargetAfterDelete, boolean integrateAllAfterReAdd, boolean forceIntegration, boolean useHaveRev, boolean doBaselessMerge, boolean displayBaseDetails, boolean showActionsOnly, boolean reverseMapping, boolean propagateType, boolean dontCopyToClient, int maxFiles)
changelistId
- changelistIdbidirectionalInteg
- bidirectionalIntegintegrateAroundDeletedRevs
- integrateAroundDeletedRevsrebranchSourceAfterDelete
- rebranchSourceAfterDeletedeleteTargetAfterDelete
- deleteTargetAfterDeleteintegrateAllAfterReAdd
- integrateAllAfterReAddforceIntegration
- forceIntegrationuseHaveRev
- useHaveRevdoBaselessMerge
- doBaselessMergedisplayBaseDetails
- displayBaseDetailsshowActionsOnly
- showActionsOnlyreverseMapping
- reverseMappingpropagateType
- propagateTypedontCopyToClient
- dontCopyToClientmaxFiles
- maxFilespublic IntegrateFilesOptions(int changelistId, boolean bidirectionalInteg, boolean integrateAroundDeletedRevs, boolean rebranchSourceAfterDelete, boolean deleteTargetAfterDelete, boolean integrateAllAfterReAdd, boolean branchResolves, boolean deleteResolves, boolean skipIntegratedRevs, boolean forceIntegration, boolean useHaveRev, boolean doBaselessMerge, boolean displayBaseDetails, boolean showActionsOnly, boolean reverseMapping, boolean propagateType, boolean dontCopyToClient, int maxFiles)
changelistId
- changelistIdbidirectionalInteg
- bidirectionalIntegintegrateAroundDeletedRevs
- integrateAroundDeletedRevsrebranchSourceAfterDelete
- rebranchSourceAfterDeletedeleteTargetAfterDelete
- deleteTargetAfterDeleteintegrateAllAfterReAdd
- integrateAllAfterReAddbranchResolves
- branchResolvesdeleteResolves
- deleteResolvesskipIntegratedRevs
- skipIntegratedRevsforceIntegration
- forceIntegrationuseHaveRev
- useHaveRevdoBaselessMerge
- doBaselessMergedisplayBaseDetails
- displayBaseDetailsshowActionsOnly
- showActionsOnlyreverseMapping
- reverseMappingpropagateType
- propagateTypedontCopyToClient
- dontCopyToClientmaxFiles
- maxFilespublic IntegrateFilesOptions(int changelistId, boolean integrateAroundDeletedRevs, boolean rebranchSourceAfterDelete, boolean deleteTargetAfterDelete, boolean integrateAllAfterReAdd, boolean branchResolves, boolean deleteResolves, boolean skipIntegratedRevs, boolean forceIntegration, boolean useHaveRev, boolean doBaselessMerge, boolean displayBaseDetails, boolean showActionsOnly, boolean propagateType, boolean dontCopyToClient, int maxFiles, java.lang.String branch, boolean reverseMapping, boolean bidirectionalInteg)
changelistId
- changelistIdintegrateAroundDeletedRevs
- integrateAroundDeletedRevsrebranchSourceAfterDelete
- rebranchSourceAfterDeletedeleteTargetAfterDelete
- deleteTargetAfterDeleteintegrateAllAfterReAdd
- integrateAllAfterReAddbranchResolves
- branchResolvesdeleteResolves
- deleteResolvesskipIntegratedRevs
- skipIntegratedRevsforceIntegration
- forceIntegrationuseHaveRev
- useHaveRevdoBaselessMerge
- doBaselessMergedisplayBaseDetails
- displayBaseDetailsshowActionsOnly
- showActionsOnlypropagateType
- propagateTypedontCopyToClient
- dontCopyToClientmaxFiles
- maxFilesbranch
- branchreverseMapping
- reverseMappingbidirectionalInteg
- bidirectionalIntegpublic IntegrateFilesOptions(int changelistId, boolean integrateAroundDeletedRevs, boolean rebranchSourceAfterDelete, boolean deleteTargetAfterDelete, boolean integrateAllAfterReAdd, boolean branchResolves, boolean deleteResolves, boolean skipIntegratedRevs, boolean forceIntegration, boolean useHaveRev, boolean doBaselessMerge, boolean displayBaseDetails, boolean showActionsOnly, boolean propagateType, boolean dontCopyToClient, int maxFiles, java.lang.String stream, java.lang.String parentStream, boolean reverseMapping)
changelistId
- changelistIdintegrateAroundDeletedRevs
- integrateAroundDeletedRevsrebranchSourceAfterDelete
- rebranchSourceAfterDeletedeleteTargetAfterDelete
- deleteTargetAfterDeleteintegrateAllAfterReAdd
- integrateAllAfterReAddbranchResolves
- branchResolvesdeleteResolves
- deleteResolvesskipIntegratedRevs
- skipIntegratedRevsforceIntegration
- forceIntegrationuseHaveRev
- useHaveRevdoBaselessMerge
- doBaselessMergedisplayBaseDetails
- displayBaseDetailsshowActionsOnly
- showActionsOnlypropagateType
- propagateTypedontCopyToClient
- dontCopyToClientmaxFiles
- maxFilesstream
- streamparentStream
- parentStreamreverseMapping
- reverseMappingpublic java.util.List<java.lang.String> processOptions(IServer server) throws OptionsException
Options
The 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 Options
server
- 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 int getChangelistId()
public IntegrateFilesOptions setChangelistId(int changelistId)
public boolean isIntegrateAroundDeletedRevs()
public IntegrateFilesOptions setIntegrateAroundDeletedRevs(boolean integrateAroundDeletedRevs)
public boolean isRebranchSourceAfterDelete()
public IntegrateFilesOptions setRebranchSourceAfterDelete(boolean rebranchSourceAfterDelete)
public boolean isDeleteTargetAfterDelete()
public IntegrateFilesOptions setDeleteTargetAfterDelete(boolean deleteTargetAfterDelete)
public boolean isIntegrateAllAfterReAdd()
public IntegrateFilesOptions setIntegrateAllAfterReAdd(boolean integrateAllAfterReAdd)
public boolean isBranchResolves()
public IntegrateFilesOptions setBranchResolves(boolean branchResolves)
public boolean isDeleteResolves()
public IntegrateFilesOptions setDeleteResolves(boolean deleteResolves)
public boolean isSkipIntegratedRevs()
public IntegrateFilesOptions setSkipIntegratedRevs(boolean skipIntegratedRevs)
public boolean isForceIntegration()
public IntegrateFilesOptions setForceIntegration(boolean forceIntegration)
public boolean isUseHaveRev()
public IntegrateFilesOptions setUseHaveRev(boolean useHaveRev)
public boolean isDoBaselessMerge()
public IntegrateFilesOptions setDoBaselessMerge(boolean doBaselessMerge)
public boolean isDisplayBaseDetails()
public IntegrateFilesOptions setDisplayBaseDetails(boolean displayBaseDetails)
public boolean isShowActionsOnly()
public IntegrateFilesOptions setShowActionsOnly(boolean showActionsOnly)
public boolean isReverseMapping()
public IntegrateFilesOptions setReverseMapping(boolean reverseMapping)
public boolean isPropagateType()
public IntegrateFilesOptions setPropagateType(boolean propagateType)
public boolean isDontCopyToClient()
public boolean isQuiet()
public IntegrateFilesOptions setQuiet(boolean quiet)
public IntegrateFilesOptions setDontCopyToClient(boolean dontCopyToClient)
public boolean isBidirectionalInteg()
public IntegrateFilesOptions setBidirectionalInteg(boolean bidirectionalInteg)
public int getMaxFiles()
public IntegrateFilesOptions setMaxFiles(int maxFiles)
public java.lang.String getBranch()
public IntegrateFilesOptions setBranch(java.lang.String branch)
public java.lang.String getStream()
public IntegrateFilesOptions setStream(java.lang.String stream)
public java.lang.String getParentStream()
public IntegrateFilesOptions setParentStream(java.lang.String parentStream)
public boolean isShowBaseRevision()
public IntegrateFilesOptions setShowBaseRevision(boolean showBaseRevision)
public boolean isShowScheduledResolve()
public IntegrateFilesOptions setShowScheduledResolve(boolean showScheduledResolve)
public boolean isInteg2()
public IntegrateFilesOptions setInteg2(boolean enable)