Skip to content

fix(rsync): Try getting rsync arguments BSD style #1456

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
merged 1 commit into from
Oct 12, 2025
Merged

fix(rsync): Try getting rsync arguments BSD style #1456

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
12 changes: 8 additions & 4 deletions completions/rsync
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,15 @@ _comp_cmd_rsync()
# meaning before v3.2.0) contain the following unusual line in
# --help:
# "(-h) --help show this help (-h is --help only if used alone)"
_comp_compgen -Rv tmp help - <<<"$("$1" --help 2>&1 | command sed -e 's/^([^)]*)//')"
if _comp_compgen -Rv tmp help - <<<"$("$1" --help 2>&1 | command sed -e 's/^([^)]*)//')"; then

_comp_compgen -- -W '"${tmp[@]}"
--daemon --old-d{,irs}
--no-{blocking-io,detach,whole-file,inc-recursive,i-r}' -X '--no-OPTION'
_comp_compgen -- -W '"${tmp[@]}"
--daemon --old-d{,irs}
--no-{blocking-io,detach,whole-file,inc-recursive,i-r}' -X '--no-OPTION'
# We didn't find any options using _comp_compgen_help, try _usage for BSD style usage
else
_comp_compgen_usage
fi
[[ ${COMPREPLY-} == *= ]] || compopt +o nospace
;;
*:*)
Expand Down
5 changes: 3 additions & 2 deletions test/t/test_rsync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ def test_2(self, completion):
def test_3(self, completion):
assert completion == "rsh ssh".split()

@pytest.mark.complete("rsync --", require_cmd=True)
@pytest.mark.complete("rsync --", require_longopt=True)
def test_4(self, completion):
assert "--help" in completion
assert "--compress" in completion
assert "--timeout=" in completion

@pytest.mark.parametrize(
"ver1,ver2,result",
Expand Down