fix(scp,rsync): fix misc bugs and refactor #1371
Draft
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was because the filtering by a modified `cur` is performed after prefixing "-F". Since we generate the filenames starting with "$cur", we do not need to further filter the results with `cur`. We disable the filtering by specifying the `-R` flag to `_comp_compgen`.
In sed, /[^\/]/ does not mean "a character that is not a slash". It means "a character that is not a backslash or a slash". In the bracket expressions [...], slashes do not need to be escaped by a backslash, and also, a backslash is treated literally. We should instead use /[^/]/.
The type-classifier characters for named pipes (|) and sockets (=) were not properly removed. These are escaped by a backslash before removing, so the backslashes are left. In this patch, we remove the type-classifier characters before performing the backslash escaping.
These shellcheck directives were added in commit c906aeb (2020-04-10), but the latest version of shellcheck-0.10.0 does not seem to warn about SC2089 and SC2090 on these lines for the current version of bash_completion. These warnings seem to be issued when unquoted $_comp_cmd_scp__path_esc is used, such as echo $_comp_cmd_scp__path_esc We have already resolved those unquoted variable expansions, so the warning should no longer happen. In this patch, we remove those outdated shellcheck directives.
pytest.skip cancels the execution of the current test, so "return" and subsequent codes arex unreachable. We do not need to explicitly call "return" in this context. scop#1357 (comment)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I separated small changes out of #1357. There are still eight commits, but I think they are mostly trivial fixes. If this is still too large as a PR, I'll further split the PR.
For these small changes, there are no ongoing discussions in #1357.
I'm thinking of separating the other non-trivial changes into PRs with smaller numbers of commits. I'll submit them after merging this PR.