Skip to content

Update bash completions to be more consistent with the tools #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
twaugh merged 1 commit into from
Sep 26, 2025
Merged

Update bash completions to be more consistent with the tools #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ Patchutils news
Added manual pages for gitdiff, gitdiffview, svndiff, and svndiffview
commands. Addresses GitHub issue #112.

Updated bash completions.

0.4.3 (stable)

Added --in-place option to more tools for editing files in place.
Expand Down
18 changes: 11 additions & 7 deletions bash-completion-patchutils
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,12 @@ _patchutils_common_opts() {
echo "--help --version"
}

_patchutils_filter_opts() {
echo "--exclude -x --exclude-from-file -X --include -i --include-from-file -I --hunks -# --lines --files -F --annotate --as-numbered-lines --format --remove-timestamps --clean --in-place --decompress -z --strip-match -p --strip --addprefix --addoldprefix --addnewprefix --git-prefixes"
_patchutils_shared_filter_opts() {
echo "--exclude -x --exclude-from-file -X --include -i --include-from-file -I --hunks -# --lines --files -F --decompress -z --strip-match -p --strip --addprefix --addoldprefix --addnewprefix --git-prefixes"
}

_patchutils_filterdiff_only_opts() {
echo "--annotate --as-numbered-lines --format --remove-timestamps --clean --in-place"
}

_patchutils_list_opts() {
Expand Down Expand Up @@ -35,7 +39,7 @@ _filterdiff() {
cur="${COMP_WORDS[COMP_CWORD]}"
prev="${COMP_WORDS[COMP_CWORD-1]}"

opts="$(_patchutils_common_opts) $(_patchutils_filter_opts) $(_patchutils_list_opts) --verbose -v --filter --grep --list"
opts="$(_patchutils_common_opts) $(_patchutils_shared_filter_opts) $(_patchutils_filterdiff_only_opts) $(_patchutils_list_opts) --verbose -v --filter --grep --list"

case "${prev}" in
--exclude|-x|--include|-i)
Expand Down Expand Up @@ -95,7 +99,7 @@ _lsdiff() {
cur="${COMP_WORDS[COMP_CWORD]}"
prev="${COMP_WORDS[COMP_CWORD-1]}"

opts="$(_patchutils_common_opts) $(_patchutils_filter_opts) $(_patchutils_list_opts) --verbose -v --filter --grep"
opts="$(_patchutils_common_opts) $(_patchutils_shared_filter_opts) $(_patchutils_list_opts) --verbose -v --filter --grep"

case "${prev}" in
--exclude|-x|--include|-i)
Expand Down Expand Up @@ -135,7 +139,7 @@ _grepdiff() {
cur="${COMP_WORDS[COMP_CWORD]}"
prev="${COMP_WORDS[COMP_CWORD-1]}"

opts="$(_patchutils_common_opts) $(_patchutils_filter_opts) $(_patchutils_list_opts) $(_patchutils_grep_opts) --verbose -v --filter --list"
opts="$(_patchutils_common_opts) $(_patchutils_shared_filter_opts) $(_patchutils_list_opts) $(_patchutils_grep_opts) --verbose -v --filter --list"

case "${prev}" in
--exclude|-x|--include|-i)
Expand Down Expand Up @@ -367,7 +371,7 @@ _patchview() {
prev="${COMP_WORDS[COMP_CWORD-1]}"

# patchview is a wrapper around filterdiff, so use similar completion
opts="$(_patchutils_common_opts) $(_patchutils_filter_opts) --verbose -v --filter --grep"
opts="$(_patchutils_common_opts) $(_patchutils_shared_filter_opts) $(_patchutils_filterdiff_only_opts) --verbose -v --filter --grep"

case "${prev}" in
--exclude|-x|--include|-i)
Expand Down Expand Up @@ -406,7 +410,7 @@ _gitdiff() {
cur="${COMP_WORDS[COMP_CWORD]}"

# These are wrappers that pass arguments to filterdiff
opts="$(_patchutils_filter_opts)"
opts="$(_patchutils_shared_filter_opts) $(_patchutils_filterdiff_only_opts)"

if [[ ${cur} == -* ]]; then
COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
Expand Down