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

integrate gix-status #1301

Merged
merged 7 commits into from
Feb 25, 2024
Merged

integrate gix-status #1301

merged 7 commits into from
Feb 25, 2024

Conversation

Byron
Copy link
Member

@Byron Byron commented Feb 18, 2024

Based on #1291


diff-correctness → gix-status → gix reset


Improve gix status to the point where it's suitable for use in reset functinoality.
Leads to a proper worktree reset implementation, eventually leading to a high-level reset similar to how git supports it.

Architecture

The reason this PR deals quite a bit with gix status is that for a safe implementation of reset() we need to be sure that the files we would want to touch don't don't carry modifications or are untracked files. In order to know what would need to be done, we have to diff the current-index with target-index. The set of files to touch can then be used to lookup information provided by git-status, like worktree modifications, index modifications, and untracked files, to know if we can proceed or not. Here is also where the reset-modes would affect the outcome, i.e. what to change and how.

This is a very modular approach which facilitates testing and understanding of what otherwise would be a very complex algorithm. Having a set of changes as output also allows to one day parallelize applying these changes.

This leaves us in a situation where the current checkout() implementation wants to become a fastpath for situations where the reset involves an empty tree as source (i.e. create everything and overwrite local changes).

On the way to reset() it's a valid choice to warm up more with the matter by improving on the current gix status implementation and assure correctness of what's there, which currently doesn't seem to be the case in comparison. Further, implementing gix status similarly to git status should be made possible.

Tasks for main

  • If pruned ‘.gitdirs’ are inside of ignored directories that are matched with ‘*’ pathspec, they can’t be deleted unless one searches for repositories, but that isn’t suggested as git dirs always seem pruned. They should have the same data like everything else.
  • gix clean -dx '*/generated-do-not-edit/' --skip-hidden-repositories=all -rp is showing precious repos outside of the pathspec range. That's a no-go. Happens during dirwalk, maybe related to repositories but not always. Pathspec shouldn't even match
  • Strange, but not wrong, behaviour when doing using wildcard matches (i.e. hide directories that have undeletable files inside instead of avoiding to collapse them). This happens because a wildcard search causes a deep search, without the option to not recurse into otherwise ignored directories. So */generated-do-not-edit yields three directories, with everything else pruned as it doesn’t match the pathspec. However, /generated-do-not-edit/ matches all previously pruned items.
  • With recent changes, it's possible to delete them at least, dot-git isn't always pruned by default anymore.
    It fails to collapse a folder that has precious files and/or repositories inside, even if you tell to delete them, leaving an empty directory that needs deletion in a second pass. This is intended, as these items prevent collapse and there is no way to say you want to delete them.
    In theory, it shouldn't walk into these at all, recheck if this is still the case.

Tasks

  • mix index-check with dirwalk
  • rename-tracking in gix-status crate
  • adjust printed path according to prefix() in gix status
  • diff index with index to learn what we would want to do in the worktree, or alternatively,
    diff tree with index (with reverse-diff functionality to simulate diff of index with tree), for better performance as it
    would avoid having to allocate a whole index even though we are only interested in a diff.
    • Must include rename tracking.
  • how to make diff results available from status with all transformations applied, to allow user to obtain diffs of any kind?

Status Enables

Next PR: Reset

  • reset() that checks if it's allowed to perform a worktree modification is allowed, or if an entry should be skipped. That way we can postpone safety checks like --hard

Postponed

What follows is important for resets, but won't be needed for cargo worktree resets.

  • a way to expand sparse dirs (but figure out if this is truly always necessary) - probably not, unless sparse dirs can be empty, but even then no expansion is needed
    • wire it up in gix index entries to optionally expand sparse entries
  • gix status with actual submodule support - needs status in gix (crate) effectively
  • gix status with actual conflict support

Research

  • Ignored files are considered expandable and can be overwritten on reset
  • How to integrate submodules - probably easy to answer once gix status can deal a little better with submodules. Even though in this case a lot of submodule-related information is needed for a complete reset, probably only doable by a higher-level caller which orchestrates it.
  • How to deal with various modes like merge and keep? How to control refresh? Maybe partial (only the files we touch), and full, to also update the files we don't touch as part of status? Maybe it's part of status if that is run before.
  • Worthwhile to make explicit the difference between git reset and git checkout in terms of HEAD modifications. With the former changing HEADs referent, and the latter changing HEAD itself.
  • figure out how this relates to the current checkout() method as technically that's a reset --hard with optional overwrite check. Could it be rolled into one, with pathspec support added?
    • just keep them separate until it's clear that reset() performs just as well, which is unlikely as there is more overhead. But maybe it's not worth to maintain two versions over it. But if so, one should probably rename it.
  • for git status: what about rename tracking? It's available for tree-diffs and quite complex on its own. Probably only needs HEAD-vs-index rename tracking. No, also can have worktree rename tracking, even though it's hard to imagine how this can be fast unless it's tightly integrated with untracked-files handling. This screams for a generalization of the tracking code though as the testing and implementation is complex, but should be generalisable.

Re-learn

  • pathspecs normalize themselves to turn from any kind of specification into repo-root relative patterns.
  • attribute/ignore file sources are naturally relative to the root of the repo, which remains relative (i.e. can be .. and that root will be always be used to open files like ../.gitignore, which is useful for display to the user)

@Byron Byron force-pushed the status branch 3 times, most recently from 42bbebe to 671c8c8 Compare February 21, 2024 06:07
This cleans up the model despite also making it harder to detect
whether something is a DotGit.
- assure it always signals that the dirwalk is 'for deletion', to have
  additional CWD checks.
- add `--match-entries` flag to apply pathspec later, when filtering entries determined
  by an unfiltered dirwalk.
…ible

A repository may be emitted on its own accord, without having to go through
the folding logic which filters directories that have been 'prefix' matched.
@Byron Byron force-pushed the status branch 2 times, most recently from 7b8619d to 562c02a Compare February 25, 2024 08:43
@Byron Byron merged commit d53504a into main Feb 25, 2024
18 checks passed
@Byron Byron mentioned this pull request Feb 25, 2024
26 tasks
@Byron Byron mentioned this pull request Mar 15, 2024
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant