fix: path resolution, wasted git calls, parallel status#5
Open
sulthonzh wants to merge 1 commit into
Open
Conversation
…l, optimize getConflictStatus - ConflictResolver now stores workingDir and uses it for all resolve() calls (fixes files not found when cwd differs from git working directory) - Removed unused git.status() call in getConflictedFiles (was discarded anyway) - getConflictStatus runs getConflictedFiles + getMergeInfo in parallel - Removed unused StatusFile interface
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Found while reviewing latest code (on top of the pending branch fixes):
Bugs Fixed
ConflictResolver path resolution ignores workingDir —
validateResolution,getConflictCount, andopenInEditorall didresolve(filePath)which resolves againstprocess.cwd(), not the git working directory. If someone uses the library with acwdparameter (or runs the CLI from a parent directory), files wouldn't be found.Wasted
git.status()call ingetConflictedFiles— Calledthis.git.status()and immediately discarded the result. The actual conflict detection is done viagit diff. This spawns an unnecessary git subprocess every time.Sequential git calls in
getConflictStatus—getConflictedFiles()andgetMergeInfo()were called sequentially, but they're independent. Now runs in parallel withPromise.all.Removed unused
StatusFileinterface — Dead code.All 11 tests pass.