Fixes regexes to accept multipart git repository address. #1655
Conversation
This file contains 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
Pull Request Test Coverage Report for Build 5530
💛 - Coveralls |
zhiltsov-max
reviewed
Jun 5, 2020
cvat/apps/git/git.py
Outdated
| http_pattern = r"(?:http[s]?://)?" + host_pattern + r"((?:/[a-zA-Z0-9._-]+){2})" | ||
| ssh_pattern = r"([a-zA-Z0-9._-]+)@" + host_pattern + r":([a-zA-Z0-9._-]+)/([a-zA-Z0-9._-]+)" | ||
| http_pattern = r"(?:http[s]?://)?" + host_pattern + r"((?:/[a-zA-Z0-9._-]+){2,})" | ||
| ssh_pattern = r"([a-zA-Z0-9._-]+)@" + host_pattern + r":([a-zA-Z0-9._-]+)((?:/(?:[a-zA-Z0-9._-]+))*)/([a-zA-Z0-9._-]+)" |
There was a problem hiding this comment.
I think, in the added fragment, the most internal braces can be omitted: /(?:[a-zA-Z0-9._-]+) -> /[a-zA-Z0-9._-]+
Why introduce a new group? Do you have an idea how can this can be used in future?
Thanks for the contribution!
There was a problem hiding this comment.
You are right those braces can be omitted.
Also I reduced complexity of this regex and dropped the additional group. I do not have justification for introduction a new group.
|
@nmanovic, LGTM. |
zhiltsov-max
reviewed
Jun 8, 2020
cvat/apps/git/git.py
Outdated
| http_pattern = r"(?:http[s]?://)?" + host_pattern + r"((?:/[a-zA-Z0-9._-]+){2})" | ||
| ssh_pattern = r"([a-zA-Z0-9._-]+)@" + host_pattern + r":([a-zA-Z0-9._-]+)/([a-zA-Z0-9._-]+)" | ||
| http_pattern = r"(?:http[s]?://)?" + host_pattern + r"((?:/[a-zA-Z0-9._-]+){2,})" | ||
| ssh_pattern = r"([a-zA-Z0-9._-]+)@" + host_pattern + r":([a-zA-Z0-9._-]+)((?:/[a-zA-Z0-9._-]+)*)" |
There was a problem hiding this comment.
Looks like the last * should be +, as with * user@domain.zone:repo is valid.
There was a problem hiding this comment.
Thanks, good observation.
added 2 commits
June 8, 2020 11:27
frndmg
pushed a commit
to signatrix/cvat
that referenced
this pull request
Aug 5, 2020
* Fixes regexes to accept multipart git repository address. * Added test case for multi level path. * Reduced complexity of SSH regex. * Fixing unit tests. * Fix SSH formatting. Co-authored-by: kpawelczyk <kpawelczyk@future-processing.com>
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.
#1651
Adjusted regexes to cover multipart repositories.
Motivation and context
#1651
How has this been tested?
Using reproduction steps from the issue description.
Used single part and multipart addresses in SSH form and HTTPS.
Checklist
developbranch- [ ] I have added description of my changes into CHANGELOG file- [ ] I have updated the documentation accordingly- [ ] I have increased versions of npm packages if it is necessary (cvat-canvas,cvat-core, cvat-data and cvat-ui)
License
Feel free to contact the maintainers if that's a concern.
- [ ] I have updated the license header for each file (see an example below)