Skip to content

Updates to 1. zsh autocomplete script and 2. slow link type warning message #2003

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 13 commits into from
May 24, 2019
Merged

Updates to 1. zsh autocomplete script and 2. slow link type warning message #2003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
cbfa2c8
Document dvc.scm.git::Git::_get_diff_trees and shorten commit hashes …
jorgeorpinel Apr 19, 2019
ddbb2ba
diff: Changes to dvc.scm.git so `dvc diff` outputs short SHAs
jorgeorpinel Apr 25, 2019
ff92857
Undoes "Renames self.git for self.repo throughout module" introduced …
jorgeorpinel May 8, 2019
eb51503
autocomplete: Brings scripts/completion/dvc.zsh up-to-date
jorgeorpinel May 14, 2019
fe5e7d3
Update scripts/completion/dvc.zsh
jorgeorpinel May 15, 2019
b3dcb1f
Update scripts/completion/dvc.zsh
jorgeorpinel May 15, 2019
1dbdd13
Update scripts/completion/dvc.zsh
jorgeorpinel May 15, 2019
3cda819
Update scripts/completion/dvc.zsh
jorgeorpinel May 15, 2019
50d8afe
autocomplete: Adds missing commands to Zsh script
jorgeorpinel May 15, 2019
4a7b74c
cache: updates slow link type warning message (and test)
jorgeorpinel May 15, 2019
e2cbca1
Fixes accidental docstring rewrap
jorgeorpinel May 23, 2019
16656f0
Actually fixes accidental docstring rewrap...
jorgeorpinel May 24, 2019
880686b
Really fixes accidental docstring rewrap this time...
jorgeorpinel May 24, 2019
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
11 changes: 5 additions & 6 deletions dvc/remote/local/slow_link_detection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,12 @@ def __call__(self, *args, **kwargs):
and self.should_display()
):
msg = (
"You can cut execution time considerably. Check:\n"
"You can cut execution time considerably by using a different"
" `cache.type` configuration.\nSee "
"{blue}https://dvc.org/doc/commands-reference/config#cache{"
"reset}"
"\nfor "
"more information.\nTo disable this message, run:\n'dvc "
"config "
"cache.slow_link_warning False'".format(
"reset} for more information.\n"
"To disable this message, run:\n"
"'dvc config cache.slow_link_warning false'".format(
blue=colorama.Fore.BLUE, reset=colorama.Fore.RESET
)
)
Expand Down
16 changes: 8 additions & 8 deletions dvc/scm/git/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,15 +260,14 @@ def get_tree(self, rev):

def _get_diff_trees(self, a_ref, b_ref):
"""Private method for getting the trees and commit hashes of 2 git
references.
Requires `gitdb` module (from gitpython package).
references. Requires `gitdb` module (from gitpython package).

Args:
a_ref(str) - git reference
b_ref(str) - second git reference. If None, uses HEAD
a_ref (str): git reference
b_ref (str): second git reference. If None, uses HEAD

Returns:
tuple - tuple with elements: (trees, commits)
tuple: tuple with elements: (trees, commits)
"""
from gitdb.exc import BadObject, BadName

Expand All @@ -294,11 +293,12 @@ def get_diff_trees(self, a_ref, b_ref=None):
Returns the dvc hash names of changed file/directory

Args:
a_ref(str) - git reference
b_ref(str) - optional second git reference, default None
a_ref (str): git reference
b_ref (str): optional second git reference, default None

Returns:
dict - dictionary with keys: (a_tree, b_tree, a_ref, b_ref, equal)
dict: dictionary with keys: (a_tree, b_tree, a_ref, b_ref,
equal)
"""
diff_dct = {DIFF_EQUAL: False}
trees, commits = self._get_diff_trees(a_ref, b_ref)
Expand Down
Loading