Skip to content

Use native line breaks in dfetch import and dfetch freeze manifests #909

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 1 commit into from
Jan 3, 2026
Merged

Use native line breaks in dfetch import and dfetch freeze manifests #909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ Release 0.11.0 (unreleased)
* Don't consider ignored files for determining local changes (#350)
* Avoid waiting for user input in ``git`` & ``svn`` commands (#570)
* Extend git ssh command to run in BatchMode (#570)
* Use native line breaks in ``dfetch freeze`` & ``dfetch import`` (#327)

Release 0.10.0 (released 2025-03-12)
====================================
Expand Down
12 changes: 8 additions & 4 deletions dfetch/manifest/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,11 @@ def dump(self, path: str) -> None:
"""Dump metadata file to correct path."""
with open(path, "w+", encoding="utf-8") as manifest_file:
yaml.dump(
self._as_dict(), manifest_file, Dumper=ManifestDumper, sort_keys=False
self._as_dict(),
manifest_file,
Dumper=ManifestDumper,
sort_keys=False,
line_break=os.linesep,
)

def find_name_in_manifest(self, name: str) -> ManifestEntryLocation:
Expand Down Expand Up @@ -412,12 +416,12 @@ class ManifestDumper(yaml.SafeDumper): # pylint: disable=too-many-ancestors

def write_line_break(self, data: Any = None) -> None:
"""Write a line break."""
super().write_line_break(data) # type: ignore[unused-ignore]
super().write_line_break(data) # type: ignore[unused-ignore, no-untyped-call]

if len(self.indents) == 2 and getattr(self.event, "value", "") != "version":
super().write_line_break() # type: ignore[unused-ignore]
super().write_line_break() # type: ignore[unused-ignore, no-untyped-call]

if len(self.indents) == 3 and self._last_additional_break != 2:
super().write_line_break() # type: ignore[unused-ignore]
super().write_line_break() # type: ignore[unused-ignore, no-untyped-call]

self._last_additional_break = len(self.indents)
Loading