From 4010675d5f43c60d596aac951a1bf43b2222156c Mon Sep 17 00:00:00 2001 From: karajan1001 Date: Mon, 17 Jan 2022 19:44:51 +0800 Subject: [PATCH 1/7] exp show: add `--rev`, `-n`, `-A` flag exp pull/push related to https://github.com/iterative/dvc/pull/7255 Co-authored-by: Jorge Orpinel --- content/docs/command-reference/exp/pull.md | 16 +++++++++++++--- content/docs/command-reference/exp/push.md | 16 +++++++++++++--- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/content/docs/command-reference/exp/pull.md b/content/docs/command-reference/exp/pull.md index e15b4a2bf4..14fcc661a9 100644 --- a/content/docs/command-reference/exp/pull.md +++ b/content/docs/command-reference/exp/pull.md @@ -6,13 +6,13 @@ data from a `dvc remote`. ## Synopsis ```usage -usage: dvc exp pull [-h] [-q | -v] [-f] [--no-cache] - [-r ] [-j ] [--run-cache] +usage: dvc exp pull [-h] [-q | -v] [-A] [--rev ] [-n ] [-f] + [--no-cache] [-r ] [-j ] [--run-cache] git_remote experiment positional arguments: git_remote Git remote name or Git URL - experiment Experiment to pull + experiment Experiments to pull ``` ## Description @@ -43,6 +43,16 @@ all cached data associated with the experiment to DVC ## Options +- `-A`, `--all-commits` - pull all experiments in the repository (overrides + `--rev` and `--num`). + +- `--rev ` - pull experiments derived from the specified `` as + baseline. + +- `-n `, `--num ` - show experiments from the previous `num` commits + (before the `--rev` baseline). For example `-n -2` includes experiments from + `HEAD` and its 2 first ancestors. + - `-f`, `--force` - rewrite the `experiment` commit if it already exists in the local repo. Equivalent to `git push --force` (rewrites history) diff --git a/content/docs/command-reference/exp/push.md b/content/docs/command-reference/exp/push.md index f2a8ac0fd5..37887803c6 100644 --- a/content/docs/command-reference/exp/push.md +++ b/content/docs/command-reference/exp/push.md @@ -6,13 +6,13 @@ to a `dvc remote`. ## Synopsis ```usage -usage: dvc exp push [-h] [-q | -v] [-f] [--no-cache] - [-r ] [-j ] [--run-cache] +usage: dvc exp push [-h] [-q | -v] [-A] [--rev ] [-n ] [-f] + [--no-cache] [-r ] [-j ] [--run-cache] git_remote experiment positional arguments: git_remote Git remote name or Git URL - experiment Experiment to push + experiment Experiments to push ``` ## Description @@ -40,6 +40,16 @@ This command will also try to [push](/doc/command-reference/push) all ## Options +- `-A`, `--all-commits` - push all experiments in the repository (overrides + `--rev` and `--num`). + +- `--rev ` - push experiments derived from the specified `` as + baseline. + +- `-n `, `--num ` - show experiments from the previous `num` commits + (before the `--rev` baseline). For example `-n -2` includes experiments from + `HEAD` and its 2 first ancestors. + - `-f`, `--force` - rewrite the `experiment` commit if it already exists in the Git remote. Equivalent to `git push --force` (rewrites history) From 51dc7fd4ef9bb25e3fa808d0e59decb5bb954286 Mon Sep 17 00:00:00 2001 From: karajan1001 Date: Tue, 8 Mar 2022 20:37:55 +0800 Subject: [PATCH 2/7] some updates --- content/docs/command-reference/exp/pull.md | 6 +++--- content/docs/command-reference/exp/push.md | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/content/docs/command-reference/exp/pull.md b/content/docs/command-reference/exp/pull.md index 14fcc661a9..9012b4b1ea 100644 --- a/content/docs/command-reference/exp/pull.md +++ b/content/docs/command-reference/exp/pull.md @@ -49,9 +49,9 @@ all cached data associated with the experiment to DVC - `--rev ` - pull experiments derived from the specified `` as baseline. -- `-n `, `--num ` - show experiments from the previous `num` commits - (before the `--rev` baseline). For example `-n -2` includes experiments from - `HEAD` and its 2 first ancestors. +- `-n `, `--num ` - show experiments from the `--rev` baseline and + from `num` commits before it (first parents). Give a negative value to include + all first-parent commits (similar to `git log -n`). - `-f`, `--force` - rewrite the `experiment` commit if it already exists in the local repo. Equivalent to `git push --force` (rewrites history) diff --git a/content/docs/command-reference/exp/push.md b/content/docs/command-reference/exp/push.md index 37887803c6..1c8c04846b 100644 --- a/content/docs/command-reference/exp/push.md +++ b/content/docs/command-reference/exp/push.md @@ -46,9 +46,9 @@ This command will also try to [push](/doc/command-reference/push) all - `--rev ` - push experiments derived from the specified `` as baseline. -- `-n `, `--num ` - show experiments from the previous `num` commits - (before the `--rev` baseline). For example `-n -2` includes experiments from - `HEAD` and its 2 first ancestors. +- `-n `, `--num ` - show experiments from the `--rev` baseline and + from `num` commits before it (first parents). Give a negative value to include + all first-parent commits (similar to `git log -n`). - `-f`, `--force` - rewrite the `experiment` commit if it already exists in the Git remote. Equivalent to `git push --force` (rewrites history) From 64f80e50655023822ef28c2bdcb419de9cdb41e0 Mon Sep 17 00:00:00 2001 From: Gao Date: Wed, 9 Mar 2022 15:30:55 +0800 Subject: [PATCH 3/7] Update content/docs/command-reference/exp/push.md Co-authored-by: Jorge Orpinel --- content/docs/command-reference/exp/push.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/docs/command-reference/exp/push.md b/content/docs/command-reference/exp/push.md index 1c8c04846b..c37c8600c7 100644 --- a/content/docs/command-reference/exp/push.md +++ b/content/docs/command-reference/exp/push.md @@ -46,8 +46,8 @@ This command will also try to [push](/doc/command-reference/push) all - `--rev ` - push experiments derived from the specified `` as baseline. -- `-n `, `--num ` - show experiments from the `--rev` baseline and - from `num` commits before it (first parents). Give a negative value to include +- `-n `, `--num ` - show experiments from the last `num` commits + (first parents) starting from the `--rev` baseline. Give a negative value to include all first-parent commits (similar to `git log -n`). - `-f`, `--force` - rewrite the `experiment` commit if it already exists in the From 08599bcb3d0aeda4f7afb7c48ecbd82a79c16297 Mon Sep 17 00:00:00 2001 From: Gao Date: Wed, 9 Mar 2022 15:31:06 +0800 Subject: [PATCH 4/7] Update content/docs/command-reference/exp/pull.md Co-authored-by: Jorge Orpinel --- content/docs/command-reference/exp/pull.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/docs/command-reference/exp/pull.md b/content/docs/command-reference/exp/pull.md index 9012b4b1ea..9e935bc541 100644 --- a/content/docs/command-reference/exp/pull.md +++ b/content/docs/command-reference/exp/pull.md @@ -49,8 +49,8 @@ all cached data associated with the experiment to DVC - `--rev ` - pull experiments derived from the specified `` as baseline. -- `-n `, `--num ` - show experiments from the `--rev` baseline and - from `num` commits before it (first parents). Give a negative value to include +- `-n `, `--num ` - show experiments from the last `num` commits + (first parents) starting from the `--rev` baseline. Give a negative value to include all first-parent commits (similar to `git log -n`). - `-f`, `--force` - rewrite the `experiment` commit if it already exists in the From d7568294e8584491b1adcb325128483ffb184d76 Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Wed, 9 Mar 2022 07:31:21 +0000 Subject: [PATCH 5/7] Restyled by prettier --- content/docs/command-reference/exp/pull.md | 4 ++-- content/docs/command-reference/exp/push.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/content/docs/command-reference/exp/pull.md b/content/docs/command-reference/exp/pull.md index 9e935bc541..8c7c421999 100644 --- a/content/docs/command-reference/exp/pull.md +++ b/content/docs/command-reference/exp/pull.md @@ -50,8 +50,8 @@ all cached data associated with the experiment to DVC baseline. - `-n `, `--num ` - show experiments from the last `num` commits - (first parents) starting from the `--rev` baseline. Give a negative value to include - all first-parent commits (similar to `git log -n`). + (first parents) starting from the `--rev` baseline. Give a negative value to + include all first-parent commits (similar to `git log -n`). - `-f`, `--force` - rewrite the `experiment` commit if it already exists in the local repo. Equivalent to `git push --force` (rewrites history) diff --git a/content/docs/command-reference/exp/push.md b/content/docs/command-reference/exp/push.md index c37c8600c7..0914ff9226 100644 --- a/content/docs/command-reference/exp/push.md +++ b/content/docs/command-reference/exp/push.md @@ -47,8 +47,8 @@ This command will also try to [push](/doc/command-reference/push) all baseline. - `-n `, `--num ` - show experiments from the last `num` commits - (first parents) starting from the `--rev` baseline. Give a negative value to include - all first-parent commits (similar to `git log -n`). + (first parents) starting from the `--rev` baseline. Give a negative value to + include all first-parent commits (similar to `git log -n`). - `-f`, `--force` - rewrite the `experiment` commit if it already exists in the Git remote. Equivalent to `git push --force` (rewrites history) From fd6385c45024e4c591be05539a4472e653852ba4 Mon Sep 17 00:00:00 2001 From: Gao Date: Wed, 6 Apr 2022 14:57:11 +0800 Subject: [PATCH 6/7] Update content/docs/command-reference/exp/pull.md Co-authored-by: Jorge Orpinel --- content/docs/command-reference/exp/pull.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/docs/command-reference/exp/pull.md b/content/docs/command-reference/exp/pull.md index 8c7c421999..b6a484ce1c 100644 --- a/content/docs/command-reference/exp/pull.md +++ b/content/docs/command-reference/exp/pull.md @@ -12,7 +12,7 @@ usage: dvc exp pull [-h] [-q | -v] [-A] [--rev ] [-n ] [-f] positional arguments: git_remote Git remote name or Git URL - experiment Experiments to pull + experiment Experiment to pull ``` ## Description From 6b62c67d8075beea363ae99645d17574274c4aba Mon Sep 17 00:00:00 2001 From: Gao Date: Wed, 6 Apr 2022 14:57:19 +0800 Subject: [PATCH 7/7] Update content/docs/command-reference/exp/push.md Co-authored-by: Jorge Orpinel --- content/docs/command-reference/exp/push.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/docs/command-reference/exp/push.md b/content/docs/command-reference/exp/push.md index 0914ff9226..9447de2572 100644 --- a/content/docs/command-reference/exp/push.md +++ b/content/docs/command-reference/exp/push.md @@ -12,7 +12,7 @@ usage: dvc exp push [-h] [-q | -v] [-A] [--rev ] [-n ] [-f] positional arguments: git_remote Git remote name or Git URL - experiment Experiments to push + experiment Experiment to push ``` ## Description