mirror of
https://github.com/fish-shell/fish-shell
synced 2024-11-10 15:14:44 +00:00
dundargoc
GitHub
parent
0127b237e7
commit
9b3783d54a
1 changed files with 74 additions and 74 deletions
|
|
@ -323,25 +323,25 @@ end
|
|||
### global options -- can be used before any command
|
||||
#########################################################
|
||||
|
||||
complete -c p4 -n __fish_p4_not_in_command -s b -x -d 'Specifies a batch size (number of arguments) to use when processing a command from a file with the -x argfile option'
|
||||
complete -c p4 -n __fish_p4_not_in_command -s c -x -d 'Overrides any P4CLIENT setting with the specified client name'
|
||||
complete -c p4 -n __fish_p4_not_in_command -s d -r -d 'Overrides any PWD setting (current working directory) and replaces it with the specified directory'
|
||||
complete -c p4 -n __fish_p4_not_in_command -s I -d 'Specify that progress indicators, if available, are desired. This option is not compatible with the -s and -G options'
|
||||
complete -c p4 -n __fish_p4_not_in_command -s G -d 'Causes all output (and batch input for form commands with -i) to be formatted as marshalled Python dictionary objects'
|
||||
complete -c p4 -n __fish_p4_not_in_command -s H -x -a '(__fish_print_hostnames)' -d 'Overrides any P4HOST setting and replaces it with the specified hostname'
|
||||
complete -c p4 -n __fish_p4_not_in_command -s p -x -d 'Overrides any P4PORT setting with the specified protocol:host:port'
|
||||
complete -c p4 -n __fish_p4_not_in_command -s P -x -d 'Overrides any P4PASSWD setting with the specified password.'
|
||||
complete -c p4 -n __fish_p4_not_in_command -s r -x -d 'Specifies the number of times to retry a command (notably, p4 sync) if the network times out.'
|
||||
complete -c p4 -n __fish_p4_not_in_command -s s -d 'Prepends a descriptive field (for example, text:, info:, error:, exit:) to each line of output produced by a Perforce command. This is most often used when scripting.'
|
||||
complete -c p4 -n __fish_p4_not_in_command -s u -x -a '(__fish_print_p4_users)' -d 'Overrides any P4USER, USER, or USERNAME setting with the specified user name.'
|
||||
complete -c p4 -n __fish_p4_not_in_command -s x -r -d 'Instructs Perforce to read arguments, one per line, from the specified file. If file is a single hyphen (-), then standard input is read.'
|
||||
complete -c p4 -n __fish_p4_not_in_command -s C -x -a '(__fish_print_encodings)' -d 'Overrides any P4CHARSET setting with the specified character set.'
|
||||
complete -c p4 -n __fish_p4_not_in_command -s Q -x -a '(__fish_print_encodings)' -d 'Overrides any P4COMMANDCHARSET setting with the specified character set.'
|
||||
complete -c p4 -n __fish_p4_not_in_command -s L -x -d 'This feature is reserved for system integrators.'
|
||||
complete -c p4 -n __fish_p4_not_in_command -s z -x -d 'Causes output of many reporting commands to be in the same tagged format as that generated by p4 fstat.'
|
||||
complete -c p4 -n __fish_p4_not_in_command -s q -d 'Quiet mode; suppress all informational message and report only warnings or errors.'
|
||||
complete -c p4 -n __fish_p4_not_in_command -s V -d 'Displays the version of the p4 application and exits.'
|
||||
complete -c p4 -n __fish_p4_not_in_command -s h -d 'Displays basic usage information and exits.'
|
||||
complete -c p4 -n __fish_p4_not_in_command -s b -x -d 'Number of arguments when using -x flag'
|
||||
complete -c p4 -n __fish_p4_not_in_command -s c -x -d 'Overrides P4CLIENT settings'
|
||||
complete -c p4 -n __fish_p4_not_in_command -s d -r -d 'Overrides PWD settings'
|
||||
complete -c p4 -n __fish_p4_not_in_command -s I -d 'Show process indicators'
|
||||
complete -c p4 -n __fish_p4_not_in_command -s G -d 'python dict in/output'
|
||||
complete -c p4 -n __fish_p4_not_in_command -s H -x -a '(__fish_print_hostnames)' -d 'Overrides P4HOST settings'
|
||||
complete -c p4 -n __fish_p4_not_in_command -s p -x -d 'Overrides P4PORT settings'
|
||||
complete -c p4 -n __fish_p4_not_in_command -s P -x -d 'Overrides P4PASSWD settings'
|
||||
complete -c p4 -n __fish_p4_not_in_command -s r -x -d 'Number of retry attempts'
|
||||
complete -c p4 -n __fish_p4_not_in_command -s s -d 'Prefix for each line'
|
||||
complete -c p4 -n __fish_p4_not_in_command -s u -x -a '(__fish_print_p4_users)' -d 'Overrides P4USER/USER/USERNAME settings'
|
||||
complete -c p4 -n __fish_p4_not_in_command -s x -r -d 'Read arguments from file'
|
||||
complete -c p4 -n __fish_p4_not_in_command -s C -x -a '(__fish_print_encodings)' -d 'Overrides P4CHARSET settings'
|
||||
complete -c p4 -n __fish_p4_not_in_command -s Q -x -a '(__fish_print_encodings)' -d 'Overrides P4COMMANDCHARSET settings'
|
||||
complete -c p4 -n __fish_p4_not_in_command -s L -x -d 'Feature reserved for system integrators'
|
||||
complete -c p4 -n __fish_p4_not_in_command -s z -x -d 'fstat output'
|
||||
complete -c p4 -n __fish_p4_not_in_command -s q -d 'Quiet mode'
|
||||
complete -c p4 -n __fish_p4_not_in_command -s V -d 'Display version'
|
||||
complete -c p4 -n __fish_p4_not_in_command -s h -d 'Display help'
|
||||
|
||||
#########################################################
|
||||
### sub-commands
|
||||
|
|
@ -457,23 +457,23 @@ __fish_p4_register_command_option info -s s -d "Short output (removes informatio
|
|||
|
||||
# clean
|
||||
__fish_p4_register_command_option clean -a '(__fish_print_p4_opened_files)'
|
||||
__fish_p4_register_command_option clean -s a -d "Added files: Find files in the workspace that have no corresponding files in the depot and delete them"
|
||||
__fish_p4_register_command_option clean -s d -d "Deleted files: Find those files in the depot that do not exist in your workspace and add them to the workspace"
|
||||
__fish_p4_register_command_option clean -s e -d "Edited files: Find files in the workspace that have been modified and restore them to the last file version that has synced from the depot"
|
||||
__fish_p4_register_command_option clean -s I -d "Do not perform any ignore checking; ignore any settings specified by P4IGNORE for added files"
|
||||
__fish_p4_register_command_option clean -s l -d "Display output in local file syntax with relative paths, similar to the workspace-centric view of p4 status"
|
||||
__fish_p4_register_command_option clean -s n -d "Preview the results of the operation without performing any action"
|
||||
__fish_p4_register_command_option clean -s a -d "Delete files not in depot"
|
||||
__fish_p4_register_command_option clean -s d -d "Restore deleted files"
|
||||
__fish_p4_register_command_option clean -s e -d "Restore edited files"
|
||||
__fish_p4_register_command_option clean -s I -d "Ignore P4IGNORE settings for added files"
|
||||
__fish_p4_register_command_option clean -s l -d "Display output in local file syntax with relative paths"
|
||||
__fish_p4_register_command_option clean -s n -d "Preview what would be done"
|
||||
|
||||
# client, workspace @TODO: -Fs (only in -f), -c (only in -S stream)
|
||||
for a in client workspace
|
||||
__fish_p4_register_command_option $a -x -a '(__fish_print_p4_workspaces)'
|
||||
__fish_p4_register_command_option $a -s f -d "Allows the last modification date, which is normally read-only, to be set"
|
||||
__fish_p4_register_command_option $a -s d -f -a '(__fish_print_p4_workspaces)' -d "Delete the specified client workspace whether or not the workspace is owned by the user"
|
||||
__fish_p4_register_command_option $a -s f -d "Allows the last modification date to be set"
|
||||
__fish_p4_register_command_option $a -s d -f -a '(__fish_print_p4_workspaces)' -d "Delete client workspace even if not owned by user"
|
||||
# __fish_p4_register_command_option $a -a '-Fs' -d 'Deletes client with shelves (must follow -f)'
|
||||
__fish_p4_register_command_option $a -s F -a s -d 'Deletes client with shelves (must follow -f)'
|
||||
__fish_p4_register_command_option $a -s o -d "Write the client workspace spec to standard output"
|
||||
__fish_p4_register_command_option $a -s i -d "Read the client workspace spec from standard input"
|
||||
__fish_p4_register_command_option $a -s c -x -a '(__fish_print_p4_workspace_changelists)' -d "When used with -S stream, displays the workspace spec that would have been created for a stream at the moment the change was submitted"
|
||||
__fish_p4_register_command_option $a -s c -x -a '(__fish_print_p4_workspace_changelists)' -d "When used with -S stream, preview the workspace spec"
|
||||
__fish_p4_register_command_option $a -s s -d "Switch workspace view"
|
||||
__fish_p4_register_command_option $a -s t -x -d "Specify a client workspace Template"
|
||||
__fish_p4_register_command_option $a -l serverid -x -d "Forcefully delete workspace that is bound to another server"
|
||||
|
|
@ -482,13 +482,13 @@ end
|
|||
|
||||
# clients, workspaces @TODO -U and others are mutually exclusive
|
||||
for a in clients workspaces
|
||||
__fish_p4_register_command_option $a -s a -d "List all client workspaces, not just workspaces bound to this server"
|
||||
__fish_p4_register_command_option $a -s e -x -d "List only client workspaces matching filter (case-sensitive)"
|
||||
__fish_p4_register_command_option $a -s E -x -d "List only client workspaces matching filter (case-insensitive)"
|
||||
__fish_p4_register_command_option $a -s m -x -d "List only the first max client workspaces"
|
||||
__fish_p4_register_command_option $a -s s -x -d "List only client workspaces bound to the specified serverID. On an edge server, the -s option defaults to the edge server’s serverID"
|
||||
__fish_p4_register_command_option $a -s a -d "List all client workspaces"
|
||||
__fish_p4_register_command_option $a -s e -x -d "List client workspaces matching filter (case-sensitive)"
|
||||
__fish_p4_register_command_option $a -s E -x -d "List client workspaces matching filter (case-insensitive)"
|
||||
__fish_p4_register_command_option $a -s m -x -d "List the first max client workspaces"
|
||||
__fish_p4_register_command_option $a -s s -x -d "List client workspaces bound to the specified serverID"
|
||||
__fish_p4_register_command_option $a -s S -x -a '(__fish_print_p4_streams)' -d "List client workspaces associated with the specified stream"
|
||||
__fish_p4_register_command_option $a -s t -d "Display the time as well as the date of the last update to the workspace"
|
||||
__fish_p4_register_command_option $a -s t -d "Display time and date last update to the workspace"
|
||||
__fish_p4_register_command_option $a -s u -x -a '(__fish_print_p4_users)' -d "List only client workspaces owned by user"
|
||||
__fish_p4_register_command_option $a -s U -d "List only client workspaces unloaded with p4 unload"
|
||||
end
|
||||
|
|
@ -500,15 +500,15 @@ end
|
|||
# sync @TODO --parallel has unique key-value pair syntax: --parallel=optq1=n,opt2=n,opt3=n,opt4=n
|
||||
__fish_p4_register_command_option sync -s f -d "Force sync, overwrite all unopened files"
|
||||
__fish_p4_register_command_option sync -s k -d "Keep existing workspace files, alias for p4 flush"
|
||||
__fish_p4_register_command_option sync -s L -d "perform the sync on a list of valid file arguments in full depot syntax with a valid revision number"
|
||||
__fish_p4_register_command_option sync -s L -d "Perform sync on a list of valid file arguments"
|
||||
__fish_p4_register_command_option sync -s m -x -d "Sync only the first max files specified"
|
||||
__fish_p4_register_command_option sync -s n -d "Preview mode: Display the results of the sync without actually syncing"
|
||||
__fish_p4_register_command_option sync -s N -d "Preview mode: Display network traffic estimates, don't actually sync"
|
||||
__fish_p4_register_command_option sync -s p -d "Populate a client workspace, but do not update the have list"
|
||||
__fish_p4_register_command_option sync -s n -d "Display sync results without actually syncing"
|
||||
__fish_p4_register_command_option sync -s N -d "Display network traffic estimates without actually syncing"
|
||||
__fish_p4_register_command_option sync -s p -d "Populate a client workspace, but don't update the have list"
|
||||
__fish_p4_register_command_option sync -l parallel -x -a '(__fish_print_p4_parallel_options)' -d "Specify options for parallel file transfer"
|
||||
__fish_p4_register_command_option sync -s q -d "Quiet operation: suppress normal output messages"
|
||||
__fish_p4_register_command_option sync -s r -d "Reopen files that are mapped to new locations in the depot, in the new location"
|
||||
__fish_p4_register_command_option sync -s s -d "Safe sync: Compare the content in your client workspace against what was last synced"
|
||||
__fish_p4_register_command_option sync -s r -d "Reopen files mapped to new locations, in the new location"
|
||||
__fish_p4_register_command_option sync -s s -d "Compare client workspace against what was last synced"
|
||||
|
||||
# update @TODO
|
||||
# where @TODO
|
||||
|
|
@ -534,7 +534,7 @@ __fish_p4_register_command_option add -s t -x -a '(__fish_print_p4_file_types)'
|
|||
|
||||
# edit
|
||||
__fish_p4_register_command_option edit -s c -x -a '(__fish_print_p4_pending_changelists default)' -d "Changelist number"
|
||||
__fish_p4_register_command_option edit -s k -d "Keep existing workspace files; mark the file as open for edit even if the file is not in the client view"
|
||||
__fish_p4_register_command_option edit -s k -d "Keep existing workspace files; mark file as open for edit"
|
||||
__fish_p4_register_command_option edit -s n -d "Preview operation, don't change files"
|
||||
__fish_p4_register_command_option edit -s t -x -a '(__fish_print_p4_file_types)' -d "File type"
|
||||
|
||||
|
|
@ -558,9 +558,9 @@ __fish_p4_register_command_option edit -s t -x -a '(__fish_print_p4_file_types)'
|
|||
# change, changelist
|
||||
for a in change changelist
|
||||
__fish_p4_register_command_option $a -x -a '(__fish_print_p4_pending_changelists)'
|
||||
__fish_p4_register_command_option $a -s s -d "Allows jobs to be assigned arbitrary status values on submission of the changelist, rather than the default status of closed"
|
||||
__fish_p4_register_command_option $a -s f -d "Force operation (The -u and the -f options are mutually exclusive)"
|
||||
__fish_p4_register_command_option $a -s u -d "Update a submitted changelist (The -u and the -f options are mutually exclusive)"
|
||||
__fish_p4_register_command_option $a -s s -d "Allows jobs to be assigned any status values on submission"
|
||||
__fish_p4_register_command_option $a -s f -d "Force operation"
|
||||
__fish_p4_register_command_option $a -s u -d "Update a submitted changelist"
|
||||
__fish_p4_register_command_option $a -s O -x -a '(__fish_print_p4_pending_changelists)' -d "Changelist number"
|
||||
__fish_p4_register_command_option $a -s d -x -a '(__fish_print_p4_pending_changelists)' -d "Delete a changelist"
|
||||
__fish_p4_register_command_option $a -s o -d "Writes the changelist spec to standard output"
|
||||
|
|
@ -571,10 +571,10 @@ end
|
|||
|
||||
# changes, changelists
|
||||
for a in changes changelists
|
||||
__fish_p4_register_command_option $a -s i -d "Include changelists that affected files that were integrated with the specified files"
|
||||
__fish_p4_register_command_option $a -s i -d "Include changelists of integrated, affected files"
|
||||
__fish_p4_register_command_option $a -s t -d "Display the time as well as the date of each change"
|
||||
__fish_p4_register_command_option $a -s l -d "List long output, with the full text of each changelist description"
|
||||
__fish_p4_register_command_option $a -s L -d "List long output, with the full text of each changelist description truncated at 250 characters"
|
||||
__fish_p4_register_command_option $a -s l -d "List long output, with full changelist"
|
||||
__fish_p4_register_command_option $a -s L -d "List long output, with full changelist (truncated)"
|
||||
__fish_p4_register_command_option $a -s f -d "View restricted changes (requires admin permission)"
|
||||
__fish_p4_register_command_option $a -c c -x -a '(__fish_print_p4_workspace_changelists)' -d "List only changes made from the named client workspace"
|
||||
__fish_p4_register_command_option $a -c m -x -d "List only the highest numbered max changes"
|
||||
|
|
@ -585,7 +585,7 @@ end
|
|||
|
||||
# describe @TODO: -dc<n>, -du<n>
|
||||
__fish_p4_register_command_option describe -x -a '(__fish_print_p4_workspace_changelists)'
|
||||
__fish_p4_register_command_option describe -s f -d 'Force the display of descriptions for restricted changelists'
|
||||
__fish_p4_register_command_option describe -s f -d 'Force display of descriptions for restricted changelists'
|
||||
__fish_p4_register_command_option describe -s O -d 'Specify the original changelist number'
|
||||
__fish_p4_register_command_option describe -s s -d 'Short output without diffs'
|
||||
__fish_p4_register_command_option describe -s S -d 'Display shelved files with diffs'
|
||||
|
|
@ -596,9 +596,9 @@ __fish_p4_register_command_option describe -s d -x -a '(__fish_print_p4_diff_opt
|
|||
# opened
|
||||
__fish_p4_register_command_option opened -s a -d "List opened files in all client workspaces"
|
||||
__fish_p4_register_command_option opened -s c -x -a '(__fish_print_p4_pending_changelists default)' -d "List the files in a pending changelist"
|
||||
__fish_p4_register_command_option opened -s C -x -a '(__fish_print_p4_workspaces)' -d "List only files that are open in the specified client workspace"
|
||||
__fish_p4_register_command_option opened -s C -x -a '(__fish_print_p4_workspaces)' -d "List files that are open in the specified client workspace"
|
||||
__fish_p4_register_command_option opened -s m -x -d "List only the first max open files"
|
||||
__fish_p4_register_command_option opened -s s -d "Short output; do not output the revision number or file type"
|
||||
__fish_p4_register_command_option opened -s s -d "Short output; don't output the revision number or file type"
|
||||
__fish_p4_register_command_option opened -s u -x -a '(__fish_print_p4_users)' -d "List only those files that were opened by user"
|
||||
__fish_p4_register_command_option opened -s x -d "List all files that have the +l filetype over all servers"
|
||||
|
||||
|
|
@ -611,31 +611,31 @@ __fish_p4_register_command_option reopen -s t -x -a '(__fish_print_p4_file_types
|
|||
|
||||
# shelve
|
||||
__fish_p4_register_command_option shelve -a '(__fish_print_p4_opened_files)'
|
||||
__fish_p4_register_command_option shelve -s a -x -a 'submitunchanged leaveunchanged' -d "Options: 'submitunchanged' shelves all files, 'leaveunchanged' shelves only changed files"
|
||||
__fish_p4_register_command_option shelve -s a -x -a 'submitunchanged leaveunchanged' -d "Choose which files to shelve"
|
||||
__fish_p4_register_command_option shelve -s c -x -a '(__fish_print_p4_pending_changelists)' -d "Changelist number"
|
||||
__fish_p4_register_command_option shelve -s d -d 'Discard the shelved files'
|
||||
__fish_p4_register_command_option shelve -s f -d 'Force overwrite of shelved files'
|
||||
__fish_p4_register_command_option shelve -s i -d 'Read a changelist description from standard input'
|
||||
__fish_p4_register_command_option shelve -s p -d "Promote a shelved change from an Edge server to a Commit server"
|
||||
__fish_p4_register_command_option shelve -s r -d 'Replace all shelved files in the changelist with the files that are opened in your workspace'
|
||||
__fish_p4_register_command_option shelve -s p -d "Promote shelved change from Edge server to Commit server"
|
||||
__fish_p4_register_command_option shelve -s r -d 'Replace shelved files in changelist with opened files'
|
||||
|
||||
# submit @TODO: parallel syntax
|
||||
__fish_p4_register_command_option submit -a '(__fish_print_p4_opened_files)'
|
||||
__fish_p4_register_command_option submit -s c -x -a '(__fish_print_p4_pending_changelists)' -d "Submit specific changelist"
|
||||
__fish_p4_register_command_option submit -s d -x -d "Immediately submit the changelist with supplied description and bypass the interactive form"
|
||||
__fish_p4_register_command_option submit -s d -x -d "Submit changelist and bypass interactive form"
|
||||
__fish_p4_register_command_option submit -s e -x -a '(__fish_print_p4_shelved_changelists)' -d "Submit specific shelved changelist"
|
||||
__fish_p4_register_command_option submit -s f -x -a '(__fish_print_p4_submit_options)' -d "Override the SubmitOptions setting in the p4 client form"
|
||||
__fish_p4_register_command_option submit -s i -d "Read a changelist specification from standard input"
|
||||
__fish_p4_register_command_option submit -l noretransfer -x -a '(__fish_print_p4_noretransfer_options)'
|
||||
__fish_p4_register_command_option submit -l parallel -x -a '(__fish_print_p4_parallel_options "submit")' -d "Specify options for parallel file transfer"
|
||||
__fish_p4_register_command_option submit -s r -d "Reopen files for edit in the default changelist after submission"
|
||||
__fish_p4_register_command_option submit -s s -d "Allows jobs to be assigned arbitrary status values on submission of the changelist"
|
||||
__fish_p4_register_command_option submit -s r -d "Reopen files for edit in default changelist"
|
||||
__fish_p4_register_command_option submit -s s -d "Allow jobs to be assigned arbitrary status values"
|
||||
|
||||
# unshelve @TODO: Streams
|
||||
__fish_p4_register_command_option unshelve -s b -x -a '(__fish_print_p4_branches)' -d "Specifies a branch spec for unshelving from"
|
||||
__fish_p4_register_command_option unshelve -s c -x -a '(__fish_print_p4_pending_changelists)' -d "Changelist number into which to unshelve"
|
||||
__fish_p4_register_command_option unshelve -s f -d 'Force the overwriting of writable (but unopened) files'
|
||||
__fish_p4_register_command_option unshelve -s n -d "Preview result of unshelve operation without restoring files to workspace"
|
||||
__fish_p4_register_command_option unshelve -s n -d "Preview result of unshelve operation"
|
||||
__fish_p4_register_command_option unshelve -s P -x -a '(__fish_print_p4_streams)' -d "Unshelve to the specified parent stream"
|
||||
__fish_p4_register_command_option unshelve -s s -x -a '(__fish_print_p4_shelved_changelists)' -d "Specify the source shelved pending changelist number"
|
||||
__fish_p4_register_command_option unshelve -s S -x -a '(__fish_print_p4_streams)' -d "Specifies a stream spec for unshelving from"
|
||||
|
|
@ -661,19 +661,19 @@ __fish_p4_register_command_option unshelve -s S -x -a '(__fish_print_p4_streams)
|
|||
|
||||
# integ, integrate @TODO -s fromFile is based on -b branchname, try resolving
|
||||
for a in integ integrate
|
||||
__fish_p4_register_command_option $a -s b -x -a '(__fish_print_p4_branches)' -d "Integrate the files using the sourceFile/targetFile mappings included in the branch view of branchname. If the toFiles argument is included, include only those target files in the branch view that match the pattern specified by toFiles"
|
||||
__fish_p4_register_command_option $a -s n -d "Display the integrations this command would perform without actually performing them"
|
||||
__fish_p4_register_command_option $a -s v -d "Open files for branching without copying toFiles into the client workspace"
|
||||
__fish_p4_register_command_option $a -s c -x -a '(__fish_print_p4_pending_changelists)' -d "Open the toFiles for branch, integrate, or delete in the specified pending changelist"
|
||||
__fish_p4_register_command_option $a -s b -x -a '(__fish_print_p4_branches)' -d "Integrate files using sourceFile/targetFile mappings"
|
||||
__fish_p4_register_command_option $a -s n -d "Preview the integrations"
|
||||
__fish_p4_register_command_option $a -s v -d "Open files for branching without copying toFiles"
|
||||
__fish_p4_register_command_option $a -s c -x -a '(__fish_print_p4_pending_changelists)' -d "Open the toFiles in the specified pending changelist"
|
||||
__fish_p4_register_command_option $a -s q -d "Quiet mode"
|
||||
__fish_p4_register_command_option $a -a -Di -d "f the source file has been deleted and re-added, revisions that precede the deletion will be considered to be part of the same source file"
|
||||
__fish_p4_register_command_option $a -s f -d "Force the integration on all revisions of fromFile and toFile, even if some revisions have been integrated in the past"
|
||||
__fish_p4_register_command_option $a -a -Di -d "If file is deleted and re-added, consider it the same file"
|
||||
__fish_p4_register_command_option $a -s f -d "Force integration on all revisions of fromFile and toFile"
|
||||
__fish_p4_register_command_option $a -s h -d "Use the have revision"
|
||||
__fish_p4_register_command_option $a -s O -x -a '(__fish_print_p4_integrate_output_options)' -d "Specify output options"
|
||||
__fish_p4_register_command_option $a -s m -x -d "Limit the command to integrating only the first N files"
|
||||
__fish_p4_register_command_option $a -s R -x -a '(__fish_print_p4_integrate_resolve_options)' -d "Specify resolve options"
|
||||
__fish_p4_register_command_option $a -s s -r -d "Source file and revision"
|
||||
__fish_p4_register_command_option $a -s r -r -d "Reverse the mappings in the branch view, integrating from the target files to the source files"
|
||||
__fish_p4_register_command_option $a -s r -r -d "Reverse the mappings in the branch view"
|
||||
__fish_p4_register_command_option $a -s S -x -a '(__fish_print_p4_streams)' -d "Source stream"
|
||||
__fish_p4_register_command_option $a -s P -x -a '(__fish_print_p4_streams)' -d "Custom parent stream"
|
||||
end
|
||||
|
|
@ -691,15 +691,15 @@ end
|
|||
|
||||
# resolve
|
||||
__fish_p4_register_command_option resolve -s a -x -a '(__fish_print_p4_resolve_options a)' -d "Resolve automatically"
|
||||
__fish_p4_register_command_option resolve -s A -x -a '(__fish_print_p4_resolve_options A)' -d "Constrain the type of resolve to branching, deletion, file type change, or move/rename"
|
||||
__fish_p4_register_command_option resolve -s d -x -a '(__fish_print_p4_resolve_options d)' -d "Ignore specified differences in whitespace or line-ending convention"
|
||||
__fish_p4_register_command_option resolve -s f -d "Allow already resolved, but not yet submitted, files to be resolved again"
|
||||
__fish_p4_register_command_option resolve -s n -d "List the files that need resolving without actually performing the resolve"
|
||||
__fish_p4_register_command_option resolve -s N -d "Preview the operation with additional information about any non-content resolve actions that are scheduled"
|
||||
__fish_p4_register_command_option resolve -s o -d "Output the base file name and revision to be used during the resolve"
|
||||
__fish_p4_register_command_option resolve -s A -x -a '(__fish_print_p4_resolve_options A)' -d "Constrain the type of resolve"
|
||||
__fish_p4_register_command_option resolve -s d -x -a '(__fish_print_p4_resolve_options d)' -d "Ignore whitespace/line-ending convention"
|
||||
__fish_p4_register_command_option resolve -s f -d "Re-resolve already resolved files if they're not submitted"
|
||||
__fish_p4_register_command_option resolve -s n -d "List files that need resolving"
|
||||
__fish_p4_register_command_option resolve -s N -d "Preview based on scheduled non-content resolve actions"
|
||||
__fish_p4_register_command_option resolve -s o -d "Show base file name and revision on resolve"
|
||||
__fish_p4_register_command_option resolve -s t -d "Force a three-way merge, even on binary (non-text) files"
|
||||
__fish_p4_register_command_option resolve -s v -d "Include conflict markers in the file for all changes between yours and base, and between theirs and base"
|
||||
__fish_p4_register_command_option resolve -s c -x -a '(__fish_print_p4_workspace_changelists)' -d "Limit the scope of the resolve operation to the files opened in the specified changelist number"
|
||||
__fish_p4_register_command_option resolve -s v -d "Include conflict markers in the file"
|
||||
__fish_p4_register_command_option resolve -s c -x -a '(__fish_print_p4_workspace_changelists)' -d "Limit scope of resolve based on specified changelist number"
|
||||
|
||||
# resolved @TODO
|
||||
# stream @TODO
|
||||
|
|
@ -774,5 +774,5 @@ __fish_p4_register_command_option resolve -s c -x -a '(__fish_print_p4_workspace
|
|||
# set
|
||||
__fish_p4_register_command_option set -x -a '(__fish_print_p4_env_vars)'
|
||||
__fish_p4_register_command_option set -s q -d "Reduce the output"
|
||||
__fish_p4_register_command_option set -s s -d "Set the value of the registry variable for the local machine"
|
||||
__fish_p4_register_command_option set -s S -x -d "Set the value of the registry variables as used by the service"
|
||||
__fish_p4_register_command_option set -s s -d "Set value of the registry variable for the local machine"
|
||||
__fish_p4_register_command_option set -s S -x -d "Set value of the registry variables as used by the service"
|
||||
|
|
|
|||
Loading…
Reference in a new issue