Skip to content
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.

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

Elevate next-status and iter_gitstatus() #679

Merged
merged 5 commits into from
May 7, 2024
Merged

Elevate next-status and iter_gitstatus() #679

merged 5 commits into from
May 7, 2024

Conversation

mih
Copy link
Member

@mih mih commented May 7, 2024

mih added 4 commits May 7, 2024 09:47
An added file is and stays added only, even if it has unstaged
modifications on top.

Ping datalad#637
Decided to reuse the existing `modification_types` qualifiers.
It is a bit weird that the type enum is called
`GitContainerModificationType`. It is primarily targeting
submodules -- so this makes some sense. But it does not make sense
to install another enum for the same purpose. It should probably
be just `GitModificationType`.
The previous setup used red/green (like git-status) to communicate
the nature of a change. But that was poorly aligned. See
datalad#640

This change does NOT align with Git's behavior. Instead, it acknowledges
even more that DataLad does not work with Git's staging of content in
the index.

Color coding is now purely about the nature of the change (add, delete,
mod, untracked), and not its status with respect to the index.

Closes datalad#640
The previous implementation assumed that no submodule items need
to be produced, because individual modification reports from
within the submodules would be sufficient.

However, this missed all cases with new submodule commits, but
no other changes.

This change adjusts the implementation and tests to produce and
verify modification reports for such cases.

Closes datalad#645
@mih mih changed the title Fix #637 Elevate next-status and iter_gitstatus() May 7, 2024
@mih mih marked this pull request as ready for review May 7, 2024 16:34
@mih mih merged commit ad6720c into datalad:main May 7, 2024
4 of 5 checks passed
@mih mih deleted the bf-637 branch May 7, 2024 17:19
@mih mih added this to the 1.4 milestone May 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
1 participant