Skip to content
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

Merged
merged 13 commits into from
May 24, 2019
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Really fixes accidental docstring rewrap this time...
jorgeorpinel committed May 24, 2019
commit 880686b4ed4e996648078e19b27e3b07cb88ab89
14 changes: 8 additions & 6 deletions dvc/scm/git/__init__.py
Original file line number Diff line number Diff line change
@@ -263,10 +263,11 @@ def _get_diff_trees(self, a_ref, b_ref):
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)
Returns:
tuple: tuple with elements: (trees, commits)
"""
from gitdb.exc import BadObject, BadName

@@ -292,10 +293,11 @@ 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,
Returns:
dict: dictionary with keys: (a_tree, b_tree, a_ref, b_ref,
equal)
"""
diff_dct = {DIFF_EQUAL: False}