Stone_Red/dvc
1
0
Fork 0
mirror of https://github.com/Stone-Red-Code/dvc.git synced 2026-11-10 07:18:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

dvc-repro after dvc-merge: Ignore state file changes for data sources. Close #266

Browse Source
This commit is contained in:
Dmitry
2017-11-07 00:22:17 -08:00
parent bf44f53656
commit 046d356137
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dvc/command/repro.py
+8 -3
View File
@@ -85,6 +85,7 @@ class CmdRepro(CmdRun):
continue
globally_changed_files = self.git.get_changed_files(target_commit)
Logger.debug('Repro globally changed files: {}'.format(', '.join(globally_changed_files)))
changed_files = set()
change = ReproChange(data_item, self, globally_changed_files, recursive, force)
if change.reproduce(changed_files):
@@ -244,9 +245,13 @@ class ReproChange(object):
Logger.debug(u'Repro data item {}: dependency {} was changed'.format(
data_item_dvc, data_item.data.dvc))
elif data_item.state.dvc in self._globally_changed_files:
msg = u'Repro data item {}: dependency {} was not changed but the state file was changed'
Logger.debug(msg.format(data_item_dvc, data_item.data.dvc))
result = True
dep_state = StateFile.load(data_item, self._settings)
if dep_state.command != StateFile.COMMAND_IMPORT_FILE:
msg = u'Repro data item {}: dependency {} was not changed but the state file was changed'
Logger.debug(msg.format(data_item_dvc, data_item.data.dvc))
result = True
else:
Logger.debug(u'Repro data item {}: skip dependency state file change {} due to data source command')
else:
msg = u'Repro data item {}: dependency {} was not changed'
Logger.debug(msg.format(data_item_dvc, data_item.data.dvc))