diff --git a/dvc/command/diff.py b/dvc/command/diff.py index 149d85451..ac8be0be7 100644 --- a/dvc/command/diff.py +++ b/dvc/command/diff.py @@ -39,7 +39,7 @@ class CmdDiff(CmdBase): def _get_dir_changes(cls, dct): engine = inflect.engine() changes_msg = ( - "{} {} not changed, {} {} modified, {} {} added, " + "{} {} untouched, {} {} modified, {} {} added, " "{} {} deleted, size was {}" ) changes_msg = changes_msg.format( diff --git a/dvc/repo/diff.py b/dvc/repo/diff.py index 6297560ee..f2ee3dc33 100644 --- a/dvc/repo/diff.py +++ b/dvc/repo/diff.py @@ -77,7 +77,7 @@ def _modified_files(self, a_entries, b_entries): modified_count = 0 for key in keys: if a_entries[key] != b_entries[key]: - modified_count + modified_count += 1 diff_size += os.path.getsize( self.cache.local.get(b_entries[key]) ) - os.path.getsize(self.cache.local.get(a_entries[key])) diff --git a/tests/func/test_diff.py b/tests/func/test_diff.py index 92910a3d0..c40e37252 100644 --- a/tests/func/test_diff.py +++ b/tests/func/test_diff.py @@ -3,13 +3,8 @@ from __future__ import unicode_literals import os from dvc.main import main - - from dvc.scm.base import FileNotInCommitError import dvc.repo.diff as diff -from dvc.command.diff import CmdDiff - - from tests.basic_env import TestDvcGit @@ -68,26 +63,6 @@ class TestDiffCmdLine(TestDiff): self.assertEqual(ret, 0) -class TestDiffCmdMessage(TestDiff): - maxDiff = None - - def test(self): - msg = CmdDiff._show(self.test_dct) - test_msg = ( - "dvc diff from {0} to {1}\n\n" - "diff for '{2}'\n" - "+{2} with md5 {3}\n\n" - "added file with size 13 Bytes" - ) - test_msg = test_msg.format( - self.test_dct[diff.DIFF_A_REF], - self.test_dct[diff.DIFF_B_REF], - self.test_dct[diff.DIFF_LIST][0][diff.DIFF_TARGET], - self.test_dct[diff.DIFF_LIST][0][diff.DIFF_NEW_CHECKSUM], - ) - self.assertEqual(test_msg, msg) - - class TestDiffDir(TestDvcGit): def setUp(self): super(TestDiffDir, self).setUp() @@ -192,3 +167,109 @@ class TestDiffFileNotFound(TestDiffDir): def test(self): with self.assertRaises(FileNotInCommitError): self.dvc.diff(self.a_ref, target=self.unknown_file) + + +class TestDiffModifiedFile(TestDiff): + maxDiff = None + + def setUp(self): + super(TestDiffModifiedFile, self).setUp() + + self.old_checksum = _get_checksum(self.dvc, self.new_file) + self.new_file_content = "new_test_file_bigger_content_123456789" + self.diff_len = len(self.new_file) + len(self.new_file_content) + self.create(self.new_file, self.new_file_content) + self.dvc.add(self.new_file) + self.git.index.add([self.new_file + ".dvc"]) + self.git.index.commit("change new_file content to be bigger") + self.new_checksum = _get_checksum(self.dvc, self.new_file) + self.b_ref = self.git.git.rev_parse(self.git.head.commit, short=True) + + def test(self): + result = self.dvc.diff( + self.a_ref, b_ref=self.b_ref, target=self.new_file + ) + test_dct = { + diff.DIFF_A_REF: self.git.git.rev_parse(self.a_ref, short=True), + diff.DIFF_B_REF: self.git.git.rev_parse(self.b_ref, short=True), + diff.DIFF_LIST: [ + { + diff.DIFF_NEW_CHECKSUM: self.new_checksum, + diff.DIFF_NEW_FILE: self.new_file, + diff.DIFF_TARGET: self.new_file, + diff.DIFF_SIZE: self.diff_len, + } + ], + } + self.assertEqual(test_dct, result) + + +class TestDiffDirWithFile(TestDiffDir): + maxDiff = None + + def setUp(self): + super(TestDiffDirWithFile, self).setUp() + + self.a_ref = self.git.git.rev_parse(self.git.head.commit, short=True) + self.old_checksum = _get_checksum(self.dvc, self.DATA_DIR) + self.new_file_content = "new_test_file_bigger_content_123456789" + self.diff_len = len(self.new_file_content) + self.create(self.new_file, self.new_file_content) + self.dvc.add(self.DATA_DIR) + self.git.index.add([self.DATA_DIR + ".dvc"]) + self.git.index.commit(message="modify file in the data dir") + self.new_checksum = _get_checksum(self.dvc, self.DATA_DIR) + self.b_ref = self.git.git.rev_parse(self.git.head.commit, short=True) + + def test(self): + result = self.dvc.diff(self.a_ref, target=self.DATA_DIR) + test_dct = { + diff.DIFF_A_REF: self.git.git.rev_parse(self.a_ref, short=True), + diff.DIFF_B_REF: self.git.git.rev_parse(self.b_ref, short=True), + diff.DIFF_LIST: [ + { + diff.DIFF_IDENT: 2, + diff.DIFF_CHANGE: 1, + diff.DIFF_DEL: 0, + diff.DIFF_MOVE: 0, + diff.DIFF_NEW: 0, + diff.DIFF_IS_DIR: True, + diff.DIFF_TARGET: self.DATA_DIR, + diff.DIFF_NEW_FILE: self.DATA_DIR, + diff.DIFF_NEW_CHECKSUM: self.new_checksum, + diff.DIFF_OLD_FILE: self.DATA_DIR, + diff.DIFF_OLD_CHECKSUM: self.old_checksum, + diff.DIFF_SIZE: self.diff_len, + } + ], + } + self.assertEqual(test_dct, result) + + +class TestDiffCmdMessage(TestDiff): + maxDiff = None + + def test(self): + ret = main( + [ + "diff", + self.test_dct[diff.DIFF_A_REF], + self.test_dct[diff.DIFF_B_REF], + ] + ) + self.assertEqual(ret, 0) + + msg1 = "dvc diff from {0} to {1}".format( + self.git.git.rev_parse(self.test_dct[diff.DIFF_A_REF], short=True), + self.git.git.rev_parse(self.test_dct[diff.DIFF_B_REF], short=True), + ) + msg2 = "diff for '{0}'".format( + self.test_dct[diff.DIFF_LIST][0][diff.DIFF_TARGET] + ) + msg3 = "+{0} with md5 {1}".format( + self.test_dct[diff.DIFF_LIST][0][diff.DIFF_TARGET], + self.test_dct[diff.DIFF_LIST][0][diff.DIFF_NEW_CHECKSUM], + ) + msg4 = "added file with size 13 Bytes" + for m in [msg1, msg2, msg3, msg4]: + assert m in self._caplog.text