Skip to content

Simplify manifest class #1111

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
spoorcc merged 4 commits into from
Apr 8, 2026
Merged

Simplify manifest class #1111

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e29cdb
Simplify manifest class
spoorcc Apr 6, 2026
0b09022
Use builder pattern for manifest
spoorcc Apr 7, 2026
9f2573c
Merge branch 'main' into simplify-manifest-class
spoorcc Apr 7, 2026
affd7a0
review comments
spoorcc Apr 8, 2026
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
2 changes: 1 addition & 1 deletion dfetch/commands/add.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ def _finalize_add(
return

superproject.manifest.append_project_entry(project_entry)
superproject.manifest.update_dump()
superproject.manifest.dump()
logger.print_info_line(
project_entry.name,
f"Added '{project_entry.name}' to manifest '{superproject.manifest.path}'",
Expand Down
2 changes: 1 addition & 1 deletion dfetch/commands/freeze.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,5 +135,5 @@ def __call__(self, args: argparse.Namespace) -> None:
manifest_updated = True

if manifest_updated:
superproject.manifest.update_dump()
superproject.manifest.dump()
logger.info(f"Updated manifest ({manifest_path}) in {os.getcwd()}")
10 changes: 9 additions & 1 deletion dfetch/commands/import_.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,19 @@ def __call__(self, _: argparse.Namespace) -> None:
project.set_remote(remote)
break

single_remote = len(remotes) == 1
project_dicts = []
for p in projects:
d = p.as_yaml()
if single_remote:
d.pop("remote", None)
project_dicts.append(d)

manifest_data = {
"manifest": {
"version": "0.0",
"remotes": [r.as_yaml() for r in remotes],
"projects": [p.as_yaml() for p in projects],
"projects": project_dicts,
}
}
manifest = Manifest.from_yaml(yaml.dump(manifest_data, sort_keys=False))
Expand Down
Loading
Loading