Skip to content

CLI: Param naming tweak #406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 16, 2022
Merged

CLI: Param naming tweak #406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c3d7af
refactor(cli[sync]): repo_terms -> repo_patterns (metavar: filter)
tony Oct 16, 2022
99634e1
docs(CHANGES): Note CLI copy updates
tony Oct 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGES
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ $ pipx install --suffix=@next 'vcspull' --pip-args '\--pre' --force

<!-- Maintainers, insert changes / features for the next release here -->

### Internal

- `sync()`: Rename `repo_terms` to `repo_patterns` (#406)

## vcspull v1.15.8 (2022-10-16)

### CLI
Expand Down
2 changes: 1 addition & 1 deletion src/vcspull/cli/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def cli(args=None):
return
elif args.subparser_name == "sync":
sync(
repo_terms=args.repo_terms,
repo_patterns=args.repo_patterns,
config=args.config,
exit_on_error=args.exit_on_error,
parser=sync_parser,
Expand Down
18 changes: 9 additions & 9 deletions src/vcspull/cli/sync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def create_sync_subparser(parser: argparse.ArgumentParser) -> argparse.ArgumentP
help="optional filepath to specify vcspull config",
)
parser.add_argument(
"repo_terms",
"repo_patterns",
metavar="filter",
nargs="*",
help="patterns / terms of repos, accepts globs / fnmatch(3)",
Expand All @@ -51,14 +51,14 @@ def create_sync_subparser(parser: argparse.ArgumentParser) -> argparse.ArgumentP


def sync(
repo_terms,
repo_patterns,
config,
exit_on_error: bool,
parser: t.Optional[
argparse.ArgumentParser
] = None, # optional so sync can be unit tested
) -> None:
if isinstance(repo_terms, list) and len(repo_terms) == 0:
if isinstance(repo_patterns, list) and len(repo_patterns) == 0:
if parser is not None:
parser.print_help()
sys.exit(2)
Expand All @@ -69,14 +69,14 @@ def sync(
configs = load_configs(find_config_files(include_home=True))
found_repos = []

for repo_term in repo_terms:
for repo_pattern in repo_patterns:
dir, vcs_url, name = None, None, None
if any(repo_term.startswith(n) for n in ["./", "/", "~", "$HOME"]):
dir = repo_term
elif any(repo_term.startswith(n) for n in ["http", "git", "svn", "hg"]):
vcs_url = repo_term
if any(repo_pattern.startswith(n) for n in ["./", "/", "~", "$HOME"]):
dir = repo_pattern
elif any(repo_pattern.startswith(n) for n in ["http", "git", "svn", "hg"]):
vcs_url = repo_pattern
else:
name = repo_term
name = repo_pattern

# collect the repos from the config files
found = filter_repos(configs, dir=dir, vcs_url=vcs_url, name=name)
Expand Down