-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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.
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
Updates to 1. zsh autocomplete script and 2. slow link type warning message #2003
Conversation
@jorgeorpinel why does your commit history look strange? rebase? |
@shcheklein that is how merges look :) That is why I usually advise people to
when they are submitting PRs 🙂 |
it depends on your workflow with merge, right? :) If you always use a new feature-branch from master or if you don't squash commits it should not include commits that are already merged. |
@shcheklein Well, in general merge can result in stuff like that. You are lucky if you get "fast-forward"(which is effectively a no-conflict rebase), but with "rebase" you always get a nice-looking PRs only with your commits 🙂 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is hard to review sort + changes 😅
@jorgeorpinel , besides sorting and adding the new commands, did you change anything? |
@efiop thanks for letting me know about hidden commands, I'll remove those comments in a bit... @shcheklein its just merged from upstream/master. Should I be rebasing always? I'm not too used to rebasing but I'm happy to adopt @MrOutis yes I should have sorted in one commit and changed in another, will keep in mind in the future. The actual updates are just to the descriptions of the commands, to match the current help output of each one. |
@MrOutis @shcheklein the new completion script is done now and I tried it manually on my system, please review. |
Also, after rebasing upsteam/master this history includes my changes to |
I like the change, thought I think we should consider some changes when handling message strings in general, @jorgeorpinel, had to push another change updating the test warning message. As @Suor pointed in #1942 this is not desired workflow. Maybe we should create a task for creating separate file with warning and error messages? |
@pared Not sure it is worth a separate file. It is not like you are going to reuse those other than in the test. Defining it as a constant somewhere in the same file seems good enough. |
A constant in the appropriate class or file may be enough like Ruslan points out but it also sounds like a good practice to extract strings to its own file(s) if we're thinking about i18n in the future. M 2¢ UPDATE: Do we need an issue for this? |
@jorgeorpinel @pared already added #2026 , but forgot to reference 🙂 |
Sorry for not referencing it here |
All good. OK so what's missing for this PR? Can it be merged? 😃 |
@jorgeorpinel Let's wait for @MrOutis to review. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please, reformat the docstrings accordingly to https://github.com/google/styleguide/blob/gh-pages/pyguide.md#38-comments-and-docstrings
Done. That docstring Args wrapping was an accident 😅 |
…in dvc.scm.git::Git::get_diff_trees
- Docstring for Git class constructor - Renames self.git for self.repo throughout module (involves several test changes) - Better doc and logical refactor in Git._get_diff_trees - `dvc diff` now outputs short SHA strings (Git._get_diff_trees) - hard coded to 7 length str (involves some test changes in tests/func/test_diff.py) For #1902
- Reorganizes commands in alphabetical order; - Updates the command dscriptions according to their current usage (-h) output; - Adds comments for MISSING command entries
Co-Authored-By: Ruslan Kuprieiev <[email protected]>
Co-Authored-By: Ruslan Kuprieiev <[email protected]>
Co-Authored-By: Ruslan Kuprieiev <[email protected]>
Co-Authored-By: Ruslan Kuprieiev <[email protected]>
in accordance with iterative/dvc.org#331
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks! 🎉
Thank you! I noticed some of the p.s. see also #1924 |
Have you followed the guidelines in our
Contributing document?
N/A Does your PR affect documented changes or does it add new functionality
that should be documented? If yes, have you created a PR for
dvc.org documenting it or at
least opened an issue for it? If so, please add a link to it.