-
-
Notifications
You must be signed in to change notification settings - Fork 346
integrate gix-status #1291
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
Merged
integrate gix-status #1291
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cf5406c
to
f76d8ed
Compare
Previously it was possible for `.git` files in directories to not trigger repository detection.
This is useful for rename tracking as it allows to see all files that may take part in a rename (i.e. when a directory is renamed).
This is accomplished by providing a context which now contains only statically known types, among them also a pathspec search. This allows the attribute stack to be passed and can thus cheaply be cloned, instead of being created internally.
…rectory()`. That way it's possible to use the common-prefix safely in a situation where a directory is required, while offering the ability to maximize the common prefix at the expense of an additional check to see if the longest possible directory is actually accessible.
…rectory. This makes the overall handling more unified, while assuring it's always in the worktree. And as a pathspec directory isn't exactly the same as a user-specified root, it's also possible to override this automation.
c7f87d6
to
56a8ea8
Compare
- when deleting items, we will always list them according to the prefix - when listing items otherwise, the top-level only if the traversal starts in the worktree.
…thing ...if the current-dir is one level in. Now such `.` is special and means to match everything.
With it, a path 'a' with prefix 'b' will be '../a'.
…efix. Otherwise it's not possible to have the 'no pattern matches everything' case which is important in conjunction with prefixes and the requirement to still see everything outside of the prefix.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Based on #1285
diff-correctness →
gix-status
→ gix resetImprove
gix status
to the point where it's suitable for use inreset
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 ofreset()
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 thecurrent-index with target-index
. The set of files to touch can then be used to lookup information provided bygit-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 currentgix status
implementation and assure correctness of what's there, which currently doesn't seem to be the case in comparison. Further, implementinggix status
similarly togit status
should be made possible.Tasks
dirwalk()
intogix status
to learn more about it (and its performance)emit_collapsed
is still testedcommon_prefix()
not being a directory for sure. Maybe find the actual prefix directory based on the pathspecs themselves..
- normalization leaves it as is -gix --trace -v clean --debug -d ..
has.
pathspec in the end which matches nothingcd d && git clean -nd ..
- instead prevent it from being collapsed as special case.Next PR
gix-status
crategix
crate with index-worktreeprefix()
ingix status
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.
Status Enables
gitoxide
backend Byron/built#1Next 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 --hardPostponed
What follows is important for resets, but won't be needed for
cargo
worktree resets.gix index entries
to optionally expand sparse entriesgix status
with actual submodule support - needsstatus
ingix
(crate) effectivelygix status
with actual conflict supportResearch
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.merge
andkeep
? How to controlrefresh
? 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.git reset
andgit checkout
in terms ofHEAD
modifications. With the former changingHEAD
s referent, and the latter changingHEAD
itself.checkout()
method as technically that's areset --hard
with optional overwrite check. Could it be rolled into one, with pathspec support added?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.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...
and that root will be always be used to open files like../.gitignore
, which is useful for display to the user)