From 3057a4e072413ed69b58a2409a173b9460fbb174 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Sun, 14 Jan 2018 20:55:42 +0200 Subject: [PATCH 1/5] main: catch unexpected exceptions Signed-off-by: Ruslan Kuprieiev --- dvc/main.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dvc/main.py b/dvc/main.py index 76deb4bd9..534874ccd 100644 --- a/dvc/main.py +++ b/dvc/main.py @@ -12,4 +12,10 @@ def main(argv=None): Logger.error('Initialization error: {}'.format(str(ex))) return 255 - return cmd.run_cmd() + try: + ret = cmd.run_cmd() + except Exception as ex: + Logger.error('Unexpected error: {}'.format(str(ex))) + return 254 + + return ret From e9c86a87f6a33af2ffc687457372da26ee3b18c7 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Sun, 14 Jan 2018 21:20:48 +0200 Subject: [PATCH 2/5] logger: fix double msgs Signed-off-by: Ruslan Kuprieiev --- dvc/logger.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dvc/logger.py b/dvc/logger.py index 893736ad2..6985e3cbf 100644 --- a/dvc/logger.py +++ b/dvc/logger.py @@ -25,7 +25,9 @@ class Logger(object): } def __init__(self, config=None): - self.init(config) + if config: + level = config['Global'].get('LogLevel', None) + Logger.set_level(level) @staticmethod def init(config=None): @@ -34,10 +36,7 @@ class Logger(object): sh.setLevel(logging.DEBUG) Logger.logger().addHandler(sh) - level = None - if config: - level = config['Global'].get('LogLevel', None) - Logger.set_level(level) + Logger.set_level() @staticmethod def logger(): From b0ecbdb5175597442d74101ce869cec5daf43612 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Sun, 14 Jan 2018 21:21:09 +0200 Subject: [PATCH 3/5] lock: print msg if dvc is busy Signed-off-by: Ruslan Kuprieiev --- dvc/command/common/base.py | 7 ++++++- dvc/lock.py | 9 ++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dvc/command/common/base.py b/dvc/command/common/base.py index b6ba891dd..f0c7e98b9 100644 --- a/dvc/command/common/base.py +++ b/dvc/command/common/base.py @@ -3,6 +3,7 @@ import os from dvc.project import Project from dvc.logger import Logger from dvc.exceptions import DvcException +from dvc.lock import LockError class CmdBase(object): @@ -26,8 +27,12 @@ class CmdBase(object): raise DvcException(msg.format(root)) def run_cmd(self): - with self.project.lock: + try: + with self.project.lock: return self.run() + except LockError as ex: + self.project.logger.error(str(ex)) + return 1 # Abstract methods that have to be implemented by any inheritance class def run(self): diff --git a/dvc/lock.py b/dvc/lock.py index d6f21506c..5063cd219 100644 --- a/dvc/lock.py +++ b/dvc/lock.py @@ -1,5 +1,11 @@ import os import fasteners +from dvc.exceptions import DvcException + + +class LockError(DvcException): + pass + class Lock(object): LOCK_FILE = 'lock' @@ -14,7 +20,8 @@ class Lock(object): return Lock(dvc_dir) def lock(self): - self._lock.acquire(timeout=self.TIMEOUT) + if not self._lock.acquire(timeout=self.TIMEOUT): + raise LockError('Cannot perform the cmd since DVC is busy and locked. Please retry the cmd later.') def unlock(self): self._lock.release() From a7dbf70995359880a4314c50ee2a3d050ced84cc Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Sun, 14 Jan 2018 22:16:15 +0200 Subject: [PATCH 4/5] dvc: remove .gitignore entries Fixes #378 Signed-off-by: Ruslan Kuprieiev --- dvc/scm.py | 24 +++++++++++++++++++++++- dvc/stage.py | 1 + tests/test_scm.py | 3 +++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dvc/scm.py b/dvc/scm.py index 2c8cdf78e..865388b0c 100644 --- a/dvc/scm.py +++ b/dvc/scm.py @@ -23,6 +23,9 @@ class Base(object): def ignore(self, path): pass + def ignore_remove(self, path): + pass + def ignore_file(self): pass @@ -68,7 +71,7 @@ class Git(Base): git_dir = os.path.join(root_dir, Git.GIT_DIR) return os.path.isdir(git_dir) - def ignore(self, path): + def _get_gitignore(self, path): entry = os.path.basename(path) gitignore = os.path.join(os.path.abspath(os.path.dirname(path)), self.GITIGNORE) @@ -77,6 +80,11 @@ class Git(Base): if not gitignore.startswith(self.root_dir): raise FileNotInRepoError() + return entry, gitignore + + def ignore(self, path): + entry, gitignore = self._get_gitignore(path) + ignore_list = [] if os.path.exists(gitignore): ignore_list = open(gitignore, 'r').readlines() @@ -90,6 +98,20 @@ class Git(Base): open(gitignore, 'a').write(content) + def ignore_remove(self, path): + entry, gitignore = self._get_gitignore(path) + + if not os.path.exists(gitignore): + return + + with open(gitignore, 'r') as fd: + lines = fd.readlines() + + filtered = list(filter(lambda x: x.strip() != entry.strip(), lines)) + + with open(gitignore, 'w') as fd: + fd.writelines(filtered) + def add(self, paths): self.repo.index.add(paths) diff --git a/dvc/stage.py b/dvc/stage.py index 29ddefbf5..0a180c67f 100644 --- a/dvc/stage.py +++ b/dvc/stage.py @@ -242,6 +242,7 @@ class Output(Dependency): self.project.logger.debug("Removing '{}'".format(self.path)) os.chmod(self.path, stat.S_IWUSR) os.unlink(self.path) + self.project.scm.ignore_remove(self.path) if os.path.exists(self.cache): os.chmod(self.cache, stat.S_IREAD) diff --git a/tests/test_scm.py b/tests/test_scm.py index f3aaeed47..aa54661eb 100644 --- a/tests/test_scm.py +++ b/tests/test_scm.py @@ -42,3 +42,6 @@ class TestIgnore(TestGit): git.ignore('foo') self.assertEqual(self._count_gitignore(), 1) + + git.ignore_remove('foo') + self.assertEqual(self._count_gitignore(), 0) From b73af1f636d16d10e3c5dd760b9b5f5c36479ee4 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Sun, 14 Jan 2018 22:16:47 +0200 Subject: [PATCH 5/5] checkout: check if dirname actually returned directory Signed-off-by: Ruslan Kuprieiev --- dvc/command/checkout.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dvc/command/checkout.py b/dvc/command/checkout.py index c8c171d38..28a588e27 100644 --- a/dvc/command/checkout.py +++ b/dvc/command/checkout.py @@ -18,7 +18,7 @@ class CmdCheckout(CmdBase): os.remove(file) dir = os.path.dirname(file) - if not os.listdir(dir): + if len(dir) != 0 and not os.listdir(dir): Logger.info(u'Remove empty directory \'{}\''.format(dir)) os.removedirs(dir) pass