Package com.perforce.p4java.option.client

Class ResolveFilesAutoOptions

    • Field Detail

      • OPTIONS_SPECS

        public static final java.lang.String OPTIONS_SPECS
        Options: -n, -s, -af, -at, -ay, -as, -Aa, -Ab, -Ac, -Ad, -Am, -At, -c[changelist], -t, -db, -dw, -dl, -o, -So
        See Also:
        Constant Field Values

      • safeMerge

        protected boolean safeMerge
        If true, only do "safe" resolves, as documented for the p4 "-as" option.

      • acceptTheirs

        protected boolean acceptTheirs
        If true, automatically accept "their" changes, as documented for the p4 "-at" option.

      • acceptYours

        protected boolean acceptYours
        If true, automatically accept "your" changes, as documented for the p4 "-ay" option.

      • showActionsOnly

        protected boolean showActionsOnly
        If true, don't do the actual resolve, just return the actions that would have been performed for the resolve. Corresponds to the '-n' option.

      • skipFile

        protected boolean skipFile
        If true, skip this file. Corresponds to the '-s' option.

      • forceResolve

        protected boolean forceResolve
        Forces auto-mode resolve to accept the merged file even if there are conflicts. Corresponds to the -af option.

      • resolveFileAttributeChanges

        protected boolean resolveFileAttributeChanges
        Resolve file attribute changes. Corresponds to the '-Aa' option.

      • resolveFileBranching

        protected boolean resolveFileBranching
        Resolve file branching. Corresponds to the '-Ab' option.

      • resolveFileContentChanges

        protected boolean resolveFileContentChanges
        Resolve file content changes. Corresponds to the '-Ac' option.

      • resolveFileDeletions

        protected boolean resolveFileDeletions
        Resolve file deletions. Corresponds to the '-Ad' option.

      • resolveMovedFiles

        protected boolean resolveMovedFiles
        Resolve moved and renamed files. Corresponds to the '-Am' option.

      • resolveFiletypeChanges

        protected boolean resolveFiletypeChanges
        Resolve filetype changes. Corresponds to the '-At' option.

      • changelistId

        protected int changelistId
        Limits 'p4 resolve' to the files in changelist#. Corresponds to '-c changelist#'.

      • forceTextualMerge

        protected boolean forceTextualMerge
        If true, forces 'p4 resolve' to attempt a textual merge, even for files with non-text (binary) types. Corresponds to the '-t' option.

      • ignoreWhitespaceChanges

        protected boolean ignoreWhitespaceChanges
        If true, ignores whitespace-only changes (for instance, a tab replaced by eight spaces). Corresponds to the '-db' option.

      • ignoreWhitespace

        protected boolean ignoreWhitespace
        If true, ignores whitespace altogether (for instance, deletion of tabs or other whitespace). Corresponds to the '-dw' option.

      • ignoreLineEndings

        protected boolean ignoreLineEndings
        If true, ignores differences in line-ending convention. Corresponds to the '-dl' option.

      • showBase

        protected boolean showBase
        If true, show the base file name and revision to be used during the merge. Corresponds to the '-o' option.

      • resolveStreamSpec

        protected boolean resolveStreamSpec
        If true, resolves changes that have been submitted to the stream spec since you opened it. You may not submit changes to the stream spec until newer changes have been resolved.

    • Constructor Detail

      • ResolveFilesAutoOptions

        public ResolveFilesAutoOptions()
        Default constructor.

      • ResolveFilesAutoOptions

        public ResolveFilesAutoOptions​(java.lang.String... options)
        Strings-based constructor; see 'p4 help [command]' for possible 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.

        Parameters:
        options - options
        See Also:
        Options(java.lang.String...)

      • ResolveFilesAutoOptions

        public ResolveFilesAutoOptions​(boolean showActionsOnly,
                               boolean safeMerge,
                               boolean acceptTheirs,
                               boolean acceptYours,
                               boolean forceResolve)
        Explicit-value constructor.
        Parameters:
        showActionsOnly - showActionsOnly
        safeMerge - safeMerge
        acceptTheirs - acceptTheirs
        acceptYours - acceptYours
        forceResolve - forceResolve

      • ResolveFilesAutoOptions

        public 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.
        Parameters:
        showActionsOnly - showActionsOnly
        safeMerge - safeMerge
        acceptTheirs - acceptTheirs
        acceptYours - acceptYours
        forceResolve - forceResolve
        resolveFileBranching - resolveFileBranching
        resolveFileContentChanges - resolveFileContentChanges
        resolveFileDeletions - resolveFileDeletions
        resolveMovedFiles - resolveMovedFiles
        resolveFiletypeChanges - resolveFiletypeChanges
        changelistId - changelistId

      • ResolveFilesAutoOptions

        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)
        Explicit-value constructor.
        Parameters:
        showActionsOnly - showActionsOnly
        safeMerge - safeMerge
        acceptTheirs - acceptTheirs
        acceptYours - acceptYours
        forceResolve - forceResolve
        resolveFileBranching - resolveFileBranching
        resolveFileContentChanges - resolveFileContentChanges
        resolveFileDeletions - resolveFileDeletions
        resolveMovedFiles - resolveMovedFiles
        resolveFiletypeChanges - resolveFiletypeChanges
        changelistId - changelistId
        forceTextualMerge - forceTextualMerge
        ignoreWhitespaceChanges - ignoreWhitespaceChanges
        ignoreWhitespace - ignoreWhitespace
        ignoreLineEndings - ignoreLineEndings

    • Method Detail

      • processOptions

        public java.util.List<java.lang.String> processOptions​(IServer server)
                                                throws OptionsException
        Description copied from class: Options
        Turn this (specific) options object into a list of strings to be sent to the Perforce server as options for a specific command. As a side effect, set the option list associated with this Option to the result.

        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.

        Specified by:
        processOptions in class Options
        Parameters:
        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...
        Returns:
        non-null (but possibly empty) string list representing the normalized Perforce server arguments corresponding to the state of this specific options object.
        Throws:
        OptionsException - if an error occurs in options processing that is not some species of ConnectionException, RequestException, AccessException, etc.
        See Also:
        Options.processOptions(com.perforce.p4java.server.IServer)

      • isSafeMerge

        public boolean isSafeMerge()

      • isAcceptTheirs

        public boolean isAcceptTheirs()

      • isAcceptYours

        public boolean isAcceptYours()

      • isShowActionsOnly

        public boolean isShowActionsOnly()

      • isSkipFile

        public boolean isSkipFile()

      • isForceResolve

        public boolean isForceResolve()

      • isResolveStreamSpec

        public boolean isResolveStreamSpec()

      • isResolveFileBranching

        public boolean isResolveFileBranching()

      • setResolveFileBranching

        public ResolveFilesAutoOptions setResolveFileBranching​(boolean resolveFileBranching)

      • isResolveFileContentChanges

        public boolean isResolveFileContentChanges()

      • setResolveFileContentChanges

        public ResolveFilesAutoOptions setResolveFileContentChanges​(boolean resolveFileContentChanges)

      • isResolveFileDeletions

        public boolean isResolveFileDeletions()

      • setResolveFileDeletions

        public ResolveFilesAutoOptions setResolveFileDeletions​(boolean resolveFileDeletions)

      • isResolveMovedFiles

        public boolean isResolveMovedFiles()

      • isResolveFiletypeChanges

        public boolean isResolveFiletypeChanges()

      • setResolveFiletypeChanges

        public ResolveFilesAutoOptions setResolveFiletypeChanges​(boolean resolveFiletypeChanges)

      • isResolveFileAttributeChanges

        public boolean isResolveFileAttributeChanges()

      • setResolveFileAttributeChanges

        public ResolveFilesAutoOptions setResolveFileAttributeChanges​(boolean resolveFileAttributeChanges)

      • setResolveResolveType

        public ResolveFilesAutoOptions setResolveResolveType​(java.lang.String type,
                                                     boolean enable)

      • getChangelistId

        public int getChangelistId()

      • isForceTextualMerge

        public boolean isForceTextualMerge()

      • isIgnoreWhitespaceChanges

        public boolean isIgnoreWhitespaceChanges()

      • setIgnoreWhitespaceChanges

        public ResolveFilesAutoOptions setIgnoreWhitespaceChanges​(boolean ignoreWhitespaceChanges)

      • isIgnoreWhitespace

        public boolean isIgnoreWhitespace()

      • isIgnoreLineEndings

        public boolean isIgnoreLineEndings()

      • isShowBase

        public boolean isShowBase()