def test_diff_recursive(path):
ds = Dataset(path).create()
sub = ds.create('sub')
# look at the last change, and confirm a dataset was added
res = ds._diff(revision='HEAD~1..HEAD')
assert_result_count(res, 1, action='diff', state='added', path=sub.path, type='dataset')
# now recursive
res = ds._diff(recursive=True, revision='HEAD~1..HEAD')
# we also get the entire diff of the subdataset from scratch
assert_status('ok', res)
ok_(len(res) > 3)
# one specific test
assert_result_count(res, 1, action='diff', state='added', path=opj(sub.path, '.datalad', 'config'))
# now we add a file to just the parent
create_tree(ds.path, {'onefile': 'tobeadded', 'sub': {'twofile': 'tobeadded'}})
res = ds._diff(recursive=True, report_untracked='all')
assert_result_count(res, 3)
assert_result_count(res, 1, action='diff', state='untracked', path=opj(ds.path, 'onefile'), type='file')
assert_result_count(res, 1, action='diff', state='modified', path=sub.path, type='dataset')
assert_result_count(res, 1, action='diff', state='untracked', path=opj(sub.path, 'twofile'), type='file')
# save sub
sub.save()
# save sub in parent
ds.save(sub.path)
# save addition in parent
ds.save()
assert_repo_status(ds.path)
# look at the last change, only one file was added
res = ds._diff(revision='HEAD~1..HEAD')
assert_result_count(res, 1)
assert_result_count(res, 1, action='diff', state='added', path=opj(ds.path, 'onefile'), type='file')
# now the exact same thing with recursion, must not be different from the call
# above
res = ds._diff(recursive=True, revision='HEAD~1..HEAD')
assert_result_count(res, 1)
# last change in parent
assert_result_count(res, 1, action='diff', state='added', path=opj(ds.path, 'onefile'), type='file')
# one further back brings in the modified subdataset, and the added file within it
res = ds._diff(recursive=True, revision='HEAD~2..HEAD')
assert_result_count(res, 3)
assert_result_count(res, 1, action='diff', state='added', path=opj(ds.path, 'onefile'), type='file')
assert_result_count(res, 1, action='diff', state='added', path=opj(sub.path, 'twofile'), type='file')
assert_result_count(res, 1, action='diff', state='modified', path=sub.path, type='dataset')
def test_diff(path, norepo):
ds = Dataset(path).create()
assert_repo_status(ds.path)
# reports stupid revision input
assert_result_count(
ds._diff(revision='WTF', on_failure='ignore'),
1,
status='impossible',
message="fatal: bad revision 'WTF'")
assert_result_count(ds._diff(), 0)
# no diff
assert_result_count(ds._diff(), 0)
assert_result_count(ds._diff(revision='HEAD'), 0)
# bogus path makes no difference
assert_result_count(ds._diff(path='THIS', revision='HEAD'), 0)
# let's introduce a known change
create_tree(ds.path, {'new': 'empty'})
ds.save(to_git=True)
assert_repo_status(ds.path)
res = ds._diff(revision='HEAD~1')
assert_result_count(res, 1)
assert_result_count(
res, 1, action='diff', path=opj(ds.path, 'new'), state='added')
# no diff against HEAD
assert_result_count(ds._diff(), 0)
# modify known file
create_tree(ds.path, {'new': 'notempty'})
for diffy in (None, 'HEAD'):
res = ds._diff(revision=diffy)
assert_result_count(res, 1)
assert_result_count(
res, 1, action='diff', path=opj(ds.path, 'new'), state='modified')
# but if we give another path, it doesn't show up
assert_result_count(ds._diff('otherpath'), 0)
# giving the right path must work though
assert_result_count(
ds._diff('new'), 1,
action='diff', path=opj(ds.path, 'new'), state='modified')
# stage changes
ds.repo.add('.', git=True)
# no diff, because we staged the modification
assert_result_count(ds._diff(), 0)
# but we can get at it
assert_result_count(
ds._diff(staged=True), 1,
action='diff', path=opj(ds.path, 'new'), state='modified')
# OR
assert_result_count(
ds._diff(revision='HEAD'), 1,
action='diff', path=opj(ds.path, 'new'), state='modified')
ds.save()
assert_repo_status(ds.path)
# untracked stuff
create_tree(ds.path, {'deep': {'down': 'untracked', 'down2': 'tobeadded'}})
# a plain diff should report the untracked file
# but not directly, because the parent dir is already unknown
res = ds._diff()
assert_result_count(res, 1)
assert_result_count(
res, 1, state='untracked', type='directory', path=opj(ds.path, 'deep'))
# report of individual files is also possible
assert_result_count(
ds._diff(report_untracked='all'), 2, state='untracked', type='file')
# an unmatching path will hide this result
assert_result_count(ds._diff(path='somewhere'), 0)
# perfect match and anything underneath will do
assert_result_count(
ds._diff(path='deep'), 1, state='untracked', path=opj(ds.path, 'deep'),
type='directory')
assert_result_count(
ds._diff(path='deep'), 1,
state='untracked', path=opj(ds.path, 'deep'))
# now we stage on of the two files in deep
ds.repo.add(opj('deep', 'down2'), git=True)
# without any reference it will ignore the staged stuff and report the remaining
# untracked file
assert_result_count(
ds._diff(), 1, state='untracked', path=opj(ds.path, 'deep', 'down'),
type='file')
res = ds._diff(staged=True)
assert_result_count(
res, 1, state='untracked', path=opj(ds.path, 'deep', 'down'), type='file')
assert_result_count(
res, 1, state='added', path=opj(ds.path, 'deep', 'down2'), type='file')
