From a588d71a8375b3482b97ab3ec9af99bd013438a4 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Tue, 27 Jun 2017 02:53:00 -0700 Subject: [PATCH] Small GC changes --- dvc/command/gc.py | 8 ++++++++ dvc/command/traverse.py | 1 - dvc/data_cloud.py | 6 ++++-- dvc/main.py | 5 ++++- dvc/repository_change.py | 5 +++-- 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dvc/command/gc.py b/dvc/command/gc.py index 2209f1eac..b1195ede2 100644 --- a/dvc/command/gc.py +++ b/dvc/command/gc.py @@ -53,6 +53,14 @@ class CmdGC(Traverse): def gc_all(self): return self._traverse_all() + @property + def no_git_actions(self): + return True + + @staticmethod + def not_committed_changes_warning(): + pass + if __name__ == '__main__': Runtime.run(CmdGC) diff --git a/dvc/command/traverse.py b/dvc/command/traverse.py index 686a0643e..7826978a4 100644 --- a/dvc/command/traverse.py +++ b/dvc/command/traverse.py @@ -39,7 +39,6 @@ class Traverse(CmdBase): return False error = False - print('TARGET={}'.format(self.parsed_args.target)) for target in self.parsed_args.target: if not self._traverse(target): error = True diff --git a/dvc/data_cloud.py b/dvc/data_cloud.py index c636e967f..b823f3f16 100644 --- a/dvc/data_cloud.py +++ b/dvc/data_cloud.py @@ -242,7 +242,8 @@ class DataCloudAWS(DataCloudBase): key_name = self.cache_file_key(item.resolved_cache.dvc) key = bucket.get_key(key_name) if not key: - raise DataCloudError('File "{}" does not exist in the cloud'.format(key_name)) + Logger.error('File "{}" does not exist in the cloud'.format(key_name)) + return Logger.info('Downloading cache file from S3 "{}/{}"'.format(bucket.name, key_name)) key.get_contents_to_filename(item.resolved_cache.relative, @@ -320,7 +321,8 @@ class DataCloudGCP(DataCloudBase): blob = bucket.get_blob(key) if not blob: - raise DataCloudError('File "{}" does not exist in the cloud'.format(key)) + Logger.error('File "{}" does not exist in the cloud'.format(key)) + return Logger.info('Downloading cache file from gc "{}/{}"'.format(bucket.name, key)) diff --git a/dvc/main.py b/dvc/main.py index ed88d29f0..c1dd19ade 100644 --- a/dvc/main.py +++ b/dvc/main.py @@ -15,6 +15,7 @@ from dvc.command.run import CmdRun from dvc.command.repro import CmdRepro from dvc.command.data_sync import CmdDataSync from dvc.command.lock import CmdLock +from dvc.command.gc import CmdGC from dvc.command.test import CmdTest VERSION = '0.8.5' @@ -39,7 +40,7 @@ def print_usage(): def main(): cmds = ['--help', '--version', 'init', 'run', 'sync', 'repro', 'data', 'remove', 'import', 'lock', 'cloud', \ 'cloud', 'cloud-run', 'cloud-instance-create', 'cloud-instance-remove', 'cloud-instance-describe', \ - 'test', 'test-aws', 'test-gcloud', 'test-cloud'] + 'test', 'test-aws', 'test-gcloud', 'test-cloud', 'gc'] if len(sys.argv) < 2 or sys.argv[1] not in cmds: if len(sys.argv) >= 2: @@ -67,6 +68,8 @@ def main(): Runtime.run(CmdRemove) elif cmd == 'lock': Runtime.run(CmdLock) + elif cmd == 'gc': + Runtime.run(CmdGC) elif cmd == 'cloud-run': print('cloud-run unimplemented') elif cmd == 'cloud-instance-create': diff --git a/dvc/repository_change.py b/dvc/repository_change.py index 60939a9ec..10aad3d25 100644 --- a/dvc/repository_change.py +++ b/dvc/repository_change.py @@ -119,7 +119,8 @@ class RepositoryChange(object): for root, dirs, files in os.walk(self._settings.config.data_dir): for file in files: filename = os.path.join(root, file) - timestemp = os.path.getmtime(filename) - res.add((filename, timestemp)) + if os.path.exists(filename): + timestemp = os.path.getmtime(filename) + res.add((filename, timestemp)) return res