From 912f0f72e5225d38fe73720810def1125573011d Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Sat, 15 Sep 2018 04:17:38 +0300 Subject: [PATCH 1/2] run: require at least some arguments Fix #1100 Signed-off-by: Ruslan Kuprieiev --- dvc/cli.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dvc/cli.py b/dvc/cli.py index 3e9a28af4..a00d76b22 100644 --- a/dvc/cli.py +++ b/dvc/cli.py @@ -805,4 +805,12 @@ def parse_args(argv=None): pipeline_show_parser.error(msg) args.targets = ['Dvcfile'] + if issubclass(args.func, CmdRun) \ + and len(args.deps) == 0 \ + and len(args.outs) == 0 \ + and len(args.outs_no_cache) == 0 \ + and len(args.command) == 0: + run_parser.error("Too few arguments. Specify at least one: " + "'-d', '-o', '-O', 'command'.") + return args From b4e62772b81710785b77a4d2c068fda2a55b499b Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Sat, 15 Sep 2018 04:24:18 +0300 Subject: [PATCH 2/2] state: merge state and link state Fixes #1091 Signed-off-by: Ruslan Kuprieiev --- dvc/project.py | 1 - dvc/state.py | 3 --- 2 files changed, 4 deletions(-) diff --git a/dvc/project.py b/dvc/project.py index 2af02dbc3..98e58f59a 100644 --- a/dvc/project.py +++ b/dvc/project.py @@ -106,7 +106,6 @@ class Project(object): def _ignore(self): flist = [self.state.state_file, - self.link_state.state_file, self.lock.lock_file, self.config.config_local_file, self.updater.updater_file] diff --git a/dvc/state.py b/dvc/state.py index 634b722ca..cf813ba39 100644 --- a/dvc/state.py +++ b/dvc/state.py @@ -14,7 +14,6 @@ class StateDuplicateError(DvcException): class State(object): STATE_FILE = 'state' - STATE_LOCK_FILE = 'state.lock' STATE_TABLE = 'state' STATE_TABLE_LAYOUT = "inode TEXT PRIMARY KEY, " \ "mtime TEXT NOT NULL, " \ @@ -166,8 +165,6 @@ class State(object): class LinkState(State): - STATE_FILE = 'link.state' - STATE_LOCK_FILE = STATE_FILE + '.lock' STATE_TABLE = 'link' STATE_TABLE_LAYOUT = "path TEXT PRIMARY KEY, " \ "inode TEXT NOT NULL, " \