datalad / datalad
Showing 1 of 1 files from the diff.

@@ -43,7 +43,6 @@
Loading
43 43
from six import add_metaclass
44 44
from six import iteritems
45 45
from six import PY2
46 -
from functools import wraps
47 46
import git as gitpy
48 47
from git import RemoteProgress
49 48
from gitdb.exc import BadName
@@ -67,7 +66,6 @@
Loading
67 66
from datalad.utils import optional_args
68 67
from datalad.utils import on_windows
69 68
from datalad.utils import getpwd
70 -
from datalad.utils import updated
71 69
from datalad.utils import posix_relpath
72 70
from datalad.utils import assure_dir
73 71
from datalad.utils import CMD_MAX_ARG
@@ -1205,7 +1203,6 @@
Loading
1205 1203
        Primarily to centralize handling in both indirect annex and direct
1206 1204
        modes when ran through proxy
1207 1205
        """
1208 -
        from datalad.utils import assure_unicode
1209 1206
        return [{u'file': f, u'success': True}
1210 1207
                for f in re.findall("'(.*)'[\n$]", assure_unicode(stdout))]
1211 1208
@@ -2697,7 +2694,6 @@
Loading
2697 2694
        """
2698 2695
        return self.get_gitattributes('.')['.']
2699 2696
2700 -
2701 2697
    def get_gitattributes(self, path, index_only=False):
2702 2698
        """Query gitattributes for one or more paths
2703 2699
@@ -2788,7 +2784,6 @@
Loading
2788 2784
                        attrline += ' {}={}'.format(a, val)
2789 2785
                f.write('\n{}'.format(attrline))
2790 2786
2791 -
2792 2787
    def get_content_info(self, paths=None, ref=None, untracked='all'):
2793 2788
        """Get identifier and type information from repository content.
2794 2789
@@ -2801,7 +2796,7 @@
Loading
2801 2796
2802 2797
        Parameters
2803 2798
        ----------
2804 -
        paths : list(patlib.PurePath)
2799 +
        paths : list(pathlib.PurePath)
2805 2800
          Specific paths, relative to the resolved repository root, to query
2806 2801
          info for. Paths must be normed to match the reporting done by Git,
2807 2802
          i.e. no parent dir components (ala "some/../this").
@@ -3037,7 +3032,7 @@
Loading
3037 3032
          into a subdataset, a report is made on the subdataset record
3038 3033
          within the queried dataset only (no recursion).
3039 3034
        untracked : {'no', 'normal', 'all'}
3040 -
          If and how untracked content is reported when no `ref` was given:
3035 +
          If and how untracked content is reported:
3041 3036
          'no': no untracked files are reported; 'normal': untracked files
3042 3037
          and entire untracked directories are reported as such; 'all': report
3043 3038
          individual files even in fully untracked directories.
@@ -3077,7 +3072,7 @@
Loading
3077 3072
3078 3073
        Parameters
3079 3074
        ----------
3080 -
        fr : str
3075 +
        fr : str or None
3081 3076
          Revision specification (anything that Git understands). Passing
3082 3077
          `None` considers anything in the target state as new.
3083 3078
        to : str or None
@@ -3087,7 +3082,7 @@
Loading
3087 3082
          If given, limits the query to the specified paths. To query all
3088 3083
          paths specify `None`, not an empty list.
3089 3084
        untracked : {'no', 'normal', 'all'}
3090 -
          If and how untracked content is reported when no `ref` was given:
3085 +
          If and how untracked content is reported when `to` is None:
3091 3086
          'no': no untracked files are reported; 'normal': untracked files
3092 3087
          and entire untracked directories are reported as such; 'all': report
3093 3088
          individual files even in fully untracked directories.
@@ -3122,7 +3117,7 @@
Loading
3122 3117
                   eval_submodule_state='full', _cache=None):
3123 3118
        """Like diff(), but reports the status of 'clean' content too"""
3124 3119
        return self._diffstatus(
3125 -
            fr,to, paths, untracked, eval_submodule_state, _cache)
3120 +
            fr, to, paths, untracked, eval_submodule_state, _cache)
3126 3121
3127 3122
    def _diffstatus(self, fr, to, paths, untracked, eval_state, _cache):
3128 3123
        """Just like diffstatus(), but supports an additional evaluation
Files Coverage
datalad 91.15%
tools/coverage-bin 100.00%
Project Totals (263 files) 91.15%
7371.8
TRAVIS_PYTHON_VERSION=3.5
TRAVIS_OS_NAME=linux
7371.9
TRAVIS_PYTHON_VERSION=3.5
TRAVIS_OS_NAME=linux
7371.18
TRAVIS_PYTHON_VERSION=3.5
TRAVIS_OS_NAME=linux
7371.17
TRAVIS_PYTHON_VERSION=3.5
TRAVIS_OS_NAME=linux
7366.2
TRAVIS_PYTHON_VERSION=3.5
TRAVIS_OS_NAME=linux
0n5aa06eqy4v0977
7366.3
TRAVIS_PYTHON_VERSION=3.7-dev
TRAVIS_OS_NAME=linux
7366.1
TRAVIS_PYTHON_VERSION=2.7
TRAVIS_OS_NAME=linux
7366.4
TRAVIS_PYTHON_VERSION=3.6
TRAVIS_OS_NAME=linux
7366.5
TRAVIS_PYTHON_VERSION=3.5
TRAVIS_OS_NAME=linux
7366.7
TRAVIS_PYTHON_VERSION=3.5
TRAVIS_OS_NAME=linux
7366.6
TRAVIS_PYTHON_VERSION=3.5
TRAVIS_OS_NAME=linux
7366.17
TRAVIS_PYTHON_VERSION=3.5
TRAVIS_OS_NAME=linux
7366.18
TRAVIS_PYTHON_VERSION=3.5
TRAVIS_OS_NAME=linux
7366.8
TRAVIS_PYTHON_VERSION=3.5
TRAVIS_OS_NAME=linux
7366.10
TRAVIS_PYTHON_VERSION=3.5
TRAVIS_OS_NAME=linux
7371.2
TRAVIS_PYTHON_VERSION=3.5
TRAVIS_OS_NAME=linux
7366.9
TRAVIS_PYTHON_VERSION=3.5
TRAVIS_OS_NAME=linux
7371.5
TRAVIS_PYTHON_VERSION=3.5
TRAVIS_OS_NAME=linux
7371.1
TRAVIS_PYTHON_VERSION=2.7
TRAVIS_OS_NAME=linux
7371.6
TRAVIS_PYTHON_VERSION=3.5
TRAVIS_OS_NAME=linux