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

Resolved conflicts

Browse Source
This commit is contained in:
Naba7
2019-06-29 10:30:34 +05:30
parent d440cae5bf
commit 47398c0807
1 changed files with 9 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/completion/dvc.bash
+9 -47
View File
@@ -8,59 +8,26 @@
# - https://opensource.com/article/18/3/creating-bash-completion-script
#----------------------------------------------------------
<<<<<<< HEAD
_dvc_commands='init get get_url destroy add remove move unprotect run \
repro pull push fetch status gc import import_url config \
checkout remote cache metrics install root lock unlock \
pipeline commit diff version'
||||||| merged common ancestors
_dvc_commands='init destroy add import checkout run pull push fetch \
status repro remove move unprotect gc config remote metrics \
install root lock unlock pipeline commit'
=======
_dvc_commands='add checkout commit config destroy fetch get-url get gc \
_dvc_commands='add cache checkout commit config destroy diff fetch get-url get gc \
import-url import init install lock metrics move pipeline pull push \
remote remove repro root run status unlock unprotect'
>>>>>>> a0233ce4a9920cda18f4a10948f74820cd7bc624
remote remove repro root run status unlock unprotect version'
_dvc_options="-h --help -V --version"
_dvc_global_options="-h --help -q --quiet -v --verbose"
<<<<<<< HEAD
_dvc_add="-R --recursive -f --file --no-commit $(compgen -G '*')"
_dvc_cache=""
_dvc_checkout="-d --with-deps -R --recursive -f --force $(compgen -G '*.dvc')"
_dvc_commit="-d --with-deps -R --recursive -f --force $(compgen -G '*.dvc')"
||||||| merged common ancestors
_dvc_add="-R --recursive -f --file --no-commit"
_dvc_checkout="$(compgen -G '*.dvc')"
=======
_dvc_add="-R --recursive -f --file --no-commit"
_dvc_checkout="$(compgen -G '*.dvc')"
_dvc_commit=""
>>>>>>> a0233ce4a9920cda18f4a10948f74820cd7bc624
_dvc_checkout="-f --force -d --with-deps -R --recursive $(compgen -G '*.dvc')"
_dvc_commit="-f --force -d --with-deps -R --recursive $(compgen -G '*.dvc')"
_dvc_config="-u --unset --local --system --global"
_dvc_destroy="-f --force"
<<<<<<< HEAD
_dvc_diff="-t --target"
_dvc_fetch="--show-checksums -j --jobs -r --remote -a --all-branches -T --all-tags -d --with-deps -R --recursive $(compgen -G '*.dvc')"
_dvc_get_url=""
_dvc_get="-o --out --rev"
_dvc_gc="-a --all-branches -T --all-tags -c --cloud -r --remote -f --force -p --projects -j --jobs"
_dvc_get="-o --out --rev"
_dvc_get-url=""
_dvc_import_url="--resume -f --file"
_dvc_import="-o --out --rev"
_dvc_import-url="--resume -f --file"
||||||| merged common ancestors
_dvc_fetch="--show-checksums -j --jobs -r --remote -a --all-branches -T --all-tags -d --with-deps -R --recursive"
_dvc_gc="-a --all-branches -T --all-tags -c --cloud -r --remote -f --force -p --project"
_dvc_import="--resume"
=======
_dvc_fetch="--show-checksums -j --jobs -r --remote -a --all-branches -T --all-tags -d --with-deps -R --recursive"
_dvc_get-url=""
_dvc_get="-o --out --rev"
_dvc_gc="-a --all-branches -T --all-tags -c --cloud -r --remote -f --force -p --project"
_dvc_import-url="--resume -f --file"
_dvc_import="-o --out --rev"
>>>>>>> a0233ce4a9920cda18f4a10948f74820cd7bc624
_dvc_init="--no-scm -f --force"
_dvc_install=""
_dvc_lock="$(compgen -G '*.dvc')"
@@ -71,18 +38,13 @@ _dvc_pull="--show-checksums -j --jobs -r --remote -a --all-branches -T --all-tag
_dvc_push="--show-checksums -j --jobs -r --remote -a --all-branches -T --all-tags -d --with-deps -R --recursive $(compgen -G '*.dvc')"
_dvc_remote=""
_dvc_remove="-o --outs -p --purge -f --force $(compgen -G '*.dvc')"
_dvc_repro="-f --force -s --single-item -c --cwd -m --metrics --dry -i --interactive -p --pipeline -P --all-pipelines --ignore-build-cache --no-commit -R --recursive --downstream"
_dvc_repro="-f --force -s --single-item -c --cwd -m --metrics --dry -i --interactive -p --pipeline -P --all-pipelines --ignore-build-cache --no-commit -R --recursive --downstream $(compgen -G '*.dvc')"
_dvc_root=""
_dvc_run="--no-exec -f --file -c --cwd -d --deps -o --outs -O --outs-no-cache --outs-persist --outs-persist-no-cache -m --metrics -M --metrics-no-cache -y --yes --overwrite-dvcfile --ignore-build-cache --remove-outs --no-commit -w --wdir"
_dvc_status="--show-checksums -j --jobs -r --remote -a --all-branches -T --all-tags -d --with-deps -c --cloud $(compgen -G '*.dvc')"
_dvc_unlock="$(compgen -G '*.dvc')"
<<<<<<< HEAD
_dvc_unprotect="$(compgen -G '*.dvc')"
_dvc_unprotect="$(compgen -G '*')"
_dvc_version=""
||||||| merged common ancestors
=======
_dvc_unprotect=""
>>>>>>> a0233ce4a9920cda18f4a10948f74820cd7bc624
# Notes:
#