From dcfe6f34cea15226dabdfc7be3507af12b7a564f Mon Sep 17 00:00:00 2001 From: alex maslakoff Date: Wed, 31 Jul 2019 16:07:20 +0300 Subject: [PATCH 1/9] fix #1874 --- dvc/command/diff.py | 2 +- dvc/repo/diff.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dvc/command/diff.py b/dvc/command/diff.py index 149d85451..21bdccd3c 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, " + "{} {} changed, {} {} 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])) From 734770114581fd41ae08778e7249a0c1bfffdb97 Mon Sep 17 00:00:00 2001 From: alex maslakoff Date: Thu, 1 Aug 2019 11:27:28 +0300 Subject: [PATCH 2/9] add test for modified file content --- tests/func/test_diff.py | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/tests/func/test_diff.py b/tests/func/test_diff.py index f4b148cfa..7b4c7663c 100644 --- a/tests/func/test_diff.py +++ b/tests/func/test_diff.py @@ -192,3 +192,39 @@ 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.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) From cf11cda84611f27d2da82d191f8b5db509b847df Mon Sep 17 00:00:00 2001 From: alex maslakoff Date: Fri, 2 Aug 2019 00:21:30 +0300 Subject: [PATCH 3/9] fix wording for 'diff' cmd --- dvc/command/diff.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dvc/command/diff.py b/dvc/command/diff.py index 21bdccd3c..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 = ( - "{} {} changed, {} {} modified, {} {} added, " + "{} {} untouched, {} {} modified, {} {} added, " "{} {} deleted, size was {}" ) changes_msg = changes_msg.format( From 433a43e5f063a1a09c7752619dad73e7e9b469fe Mon Sep 17 00:00:00 2001 From: alex maslakoff Date: Fri, 2 Aug 2019 00:26:41 +0300 Subject: [PATCH 4/9] reformat --- tests/func/test_diff.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/func/test_diff.py b/tests/func/test_diff.py index 7b4c7663c..4c8ec3fab 100644 --- a/tests/func/test_diff.py +++ b/tests/func/test_diff.py @@ -207,9 +207,7 @@ class TestDiffModifiedFile(TestDiff): 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 - ) + self.b_ref = self.git.git.rev_parse(self.git.head.commit, short=True) def test(self): result = self.dvc.diff( From 81c8ed9da5a2104becadf03a85aa6657a11c490b Mon Sep 17 00:00:00 2001 From: alex maslakoff Date: Fri, 2 Aug 2019 16:09:10 +0300 Subject: [PATCH 5/9] add a test for 'dir changes' --- tests/func/test_diff.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tests/func/test_diff.py b/tests/func/test_diff.py index 4c8ec3fab..dca648f85 100644 --- a/tests/func/test_diff.py +++ b/tests/func/test_diff.py @@ -226,3 +226,20 @@ class TestDiffModifiedFile(TestDiff): ], } self.assertEqual(test_dct, result) + + +class TestDiffModifiedFileMessage(TestDiffModifiedFile): + def test(self): + test_dct = { + diff.DIFF_IDENT: 0, + diff.DIFF_CHANGE: 1, + diff.DIFF_NEW: 0, + diff.DIFF_DEL: 0, + diff.DIFF_SIZE: self.diff_len, + } + + msg = CmdDiff._get_dir_changes(test_dct) + test_msg = "0 files untouched, 1 file modified, 0 files added, " + test_msg += "0 files deleted, size was increased by {} Bytes" + test_msg = test_msg.format(self.diff_len) + self.assertEqual(test_msg, msg) From 60359d8b98730a0ace13b1181d35425c808173f4 Mon Sep 17 00:00:00 2001 From: alex maslakoff Date: Sat, 3 Aug 2019 11:10:09 +0300 Subject: [PATCH 6/9] merge 2 tests --- tests/func/test_diff.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/func/test_diff.py b/tests/func/test_diff.py index dca648f85..ff7a4667c 100644 --- a/tests/func/test_diff.py +++ b/tests/func/test_diff.py @@ -209,7 +209,7 @@ class TestDiffModifiedFile(TestDiff): 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): + def test_checksum(self): result = self.dvc.diff( self.a_ref, b_ref=self.b_ref, target=self.new_file ) @@ -227,9 +227,7 @@ class TestDiffModifiedFile(TestDiff): } self.assertEqual(test_dct, result) - -class TestDiffModifiedFileMessage(TestDiffModifiedFile): - def test(self): + def test_cli_output(self): test_dct = { diff.DIFF_IDENT: 0, diff.DIFF_CHANGE: 1, From 10fa6eddb14adee7729b995165c691a2839055e3 Mon Sep 17 00:00:00 2001 From: alex maslakoff Date: Sat, 3 Aug 2019 20:25:07 +0300 Subject: [PATCH 7/9] fix 2 tests --- tests/func/test_diff.py | 65 +++++++++++++++++++++++++++++------------ 1 file changed, 47 insertions(+), 18 deletions(-) diff --git a/tests/func/test_diff.py b/tests/func/test_diff.py index ff7a4667c..b5c042b9c 100644 --- a/tests/func/test_diff.py +++ b/tests/func/test_diff.py @@ -3,15 +3,14 @@ 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 +# from subprocess import check_output, Popen +from subprocess import check_output + def _get_checksum(repo, file_name): outs = [out for s in repo.stages() for out in s.outs] @@ -200,6 +199,7 @@ class TestDiffModifiedFile(TestDiff): 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) @@ -209,7 +209,7 @@ class TestDiffModifiedFile(TestDiff): 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_checksum(self): + def test(self): result = self.dvc.diff( self.a_ref, b_ref=self.b_ref, target=self.new_file ) @@ -227,17 +227,46 @@ class TestDiffModifiedFile(TestDiff): } self.assertEqual(test_dct, result) - def test_cli_output(self): - test_dct = { - diff.DIFF_IDENT: 0, - diff.DIFF_CHANGE: 1, - diff.DIFF_NEW: 0, - diff.DIFF_DEL: 0, - diff.DIFF_SIZE: self.diff_len, - } - msg = CmdDiff._get_dir_changes(test_dct) - test_msg = "0 files untouched, 1 file modified, 0 files added, " - test_msg += "0 files deleted, size was increased by {} Bytes" - test_msg = test_msg.format(self.diff_len) - self.assertEqual(test_msg, msg) +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) From 619f53a5559859e9cc64bd4dcac38e04c54ba530 Mon Sep 17 00:00:00 2001 From: alex maslakoff Date: Sat, 3 Aug 2019 20:31:28 +0300 Subject: [PATCH 8/9] remove unused imports --- tests/func/test_diff.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/func/test_diff.py b/tests/func/test_diff.py index b5c042b9c..d6c5ccc85 100644 --- a/tests/func/test_diff.py +++ b/tests/func/test_diff.py @@ -8,9 +8,6 @@ import dvc.repo.diff as diff from dvc.command.diff import CmdDiff from tests.basic_env import TestDvcGit -# from subprocess import check_output, Popen -from subprocess import check_output - def _get_checksum(repo, file_name): outs = [out for s in repo.stages() for out in s.outs] From b78843881a57b559b81691c2854b8391e80a7c1b Mon Sep 17 00:00:00 2001 From: alex maslakoff Date: Tue, 6 Aug 2019 13:51:30 +0400 Subject: [PATCH 9/9] fix 'diff cmd message' test --- tests/func/test_diff.py | 54 +++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/tests/func/test_diff.py b/tests/func/test_diff.py index d6c5ccc85..267288300 100644 --- a/tests/func/test_diff.py +++ b/tests/func/test_diff.py @@ -5,7 +5,6 @@ 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 @@ -64,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() @@ -231,9 +210,7 @@ class TestDiffDirWithFile(TestDiffDir): def setUp(self): super(TestDiffDirWithFile, self).setUp() - self.a_ref = self.git.git.rev_parse( - self.git.head.commit, short=True - ) + 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) @@ -267,3 +244,32 @@ class TestDiffDirWithFile(TestDiffDir): ], } 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