diff --git a/dvc/command/gc.py b/dvc/command/gc.py index 7cbffc537..2ee4979d5 100644 --- a/dvc/command/gc.py +++ b/dvc/command/gc.py @@ -52,10 +52,10 @@ class CmdGC(CmdBase): def add_parser(subparsers, parent_parser): - GC_HELP = "Collect unused data from DVC cache or a remote storage." + GC_HELP = "Garbage collect unused objects from cache or remote storage." GC_DESCRIPTION = ( - "Deletes all files in the cache or a remote which are not in\n" - "use by the specified git references (defaults to just HEAD)." + "Removes all files in the cache or a remote which are not in\n" + "use by the specified Git revisions (defaults to just HEAD)." ) gc_parser = subparsers.add_parser( "gc", diff --git a/dvc/command/get.py b/dvc/command/get.py index e27c178b5..a0bc5186f 100644 --- a/dvc/command/get.py +++ b/dvc/command/get.py @@ -73,7 +73,7 @@ def add_parser(subparsers, parent_parser): "-o", "--out", nargs="?", help="Destination path to download files to" ) get_parser.add_argument( - "--rev", nargs="?", help="Git revision (e.g. branch, tag, SHA)" + "--rev", nargs="?", help="Git revision (e.g. SHA, branch, tag)" ) get_parser.add_argument( "--show-url", diff --git a/dvc/command/imp.py b/dvc/command/imp.py index 7d095dbd1..83ee0da7b 100644 --- a/dvc/command/imp.py +++ b/dvc/command/imp.py @@ -53,6 +53,6 @@ def add_parser(subparsers, parent_parser): "-o", "--out", nargs="?", help="Destination path to download files to" ) import_parser.add_argument( - "--rev", nargs="?", help="Git revision (e.g. branch, tag, SHA)" + "--rev", nargs="?", help="Git revision (e.g. SHA, branch, tag)" ) import_parser.set_defaults(func=CmdImport) diff --git a/dvc/remote/base.py b/dvc/remote/base.py index 33ec566bb..6096af65f 100644 --- a/dvc/remote/base.py +++ b/dvc/remote/base.py @@ -191,7 +191,7 @@ class RemoteBASE(object): tasks, total=len(file_infos), unit="md5", - desc="Computing hashes (only done once)", + desc="Computing file checksum(s) (only done once)", ) as tasks: checksums = dict(zip(file_infos, tasks)) return checksums diff --git a/dvc/scm/git/tree.py b/dvc/scm/git/tree.py index 776d77c81..7933dee72 100644 --- a/dvc/scm/git/tree.py +++ b/dvc/scm/git/tree.py @@ -102,7 +102,7 @@ class GitTree(BaseTree): tree = self.git.tree(self.rev) except git.exc.BadName as exc: raise DvcException( - "revision '{}' not found in git '{}'".format( + "revision '{}' not found in Git '{}'".format( self.rev, os.path.relpath(self.git.working_dir) ) ) from exc diff --git a/dvc/version.py b/dvc/version.py index d4bf622aa..0b2db6be5 100644 --- a/dvc/version.py +++ b/dvc/version.py @@ -57,7 +57,7 @@ def _is_release(dir_path, base_version): def _git_revision(dir_path): - """Get the SHA-1 of the HEAD of a git repository.""" + """Get SHA of the HEAD of a Git repository.""" return subprocess.check_output( ["git", "rev-parse", "HEAD"], cwd=dir_path ).strip() diff --git a/scripts/completion/dvc.zsh b/scripts/completion/dvc.zsh index 32bdef47f..6129fce0f 100644 --- a/scripts/completion/dvc.zsh +++ b/scripts/completion/dvc.zsh @@ -22,7 +22,7 @@ _dvc_commands() { "fetch:Fetch data files from a DVC remote storage." "get-url:Download or copy files from URL." "get:Download data from DVC repository." - "gc:Collect unused data from DVC cache or a remote storage." + "gc:Garbage collect unused objects from cache or remote storage." "import-url:Download or copy file from URL and take it under DVC control." "import:Download data from DVC repository and take it under DVC control." "init:Initialize DVC in the current directory." @@ -117,7 +117,7 @@ _dvc_geturl=( _dvc_get=( {-o,--out}"[Destination path to put data to.]:OUT:_files -/" - "--rev[Git revision (e.g. branch, tag, SHA)]:Revision:" + "--rev[Git revision (e.g. SHA, branch, tag)]:Revision:" "--show-url[Returns path/url to the location in remote for given path]" "1:URL:" "2:Path:" @@ -141,7 +141,7 @@ _dvc_importurl=( _dvc_import=( {-o,--out}"[Destination path to put data to.]:OUT:_files -/" - "--rev[DVC repository git revision.]:Commit hash:" + "--rev[Git revision (e.g. SHA, branch, tag)]:Commit hash:" "1:URL:" "2:Path:" )