Commit Graph
5993 Commits
Author SHA1 Message Date
19cd0dedb9 Use sumtree instead of iterator linear search for diff hunks in range
Co-Authored-By: Max Brunsfeld <max@zed.dev>
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-09-30 13:32:54 -04:00
Julia 310975fcbc Fix test build 2022-09-30 11:13:22 -04:00
Julia 883465c016 Bump protocol version to be ahead of main 2022-09-29 13:16:02 -04:00
Julia d1a7dc02a2 Track index instead of head for diffs 2022-09-29 13:16:02 -04:00
Mikayla Maki 63747c8fee made git stuff slightly more themable 2022-09-29 13:16:02 -04:00
Nate Butler 1456445f2a wip 2022-09-29 13:16:02 -04:00
Nate Butler 22b1d0eae9 WIP Git gutter styling 2022-09-29 13:16:02 -04:00
Mikayla Maki 4398b2f9a4 Added test, and fix, for changed_repos method on LocalWorktree 2022-09-29 13:16:02 -04:00
Julia b1838a6a1d Don't pretend this is async 2022-09-29 13:16:02 -04:00
Mikayla Maki ab3f820edc WIP, re-doing fs and fake git repos 2022-09-29 13:16:02 -04:00
JuliaandMikayla Maki 1da2b63b97 Move git related things into specialized git crate
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-09-29 13:16:02 -04:00
Julia 5527234e06 Build again 2022-09-29 13:16:02 -04:00
JuliaandMikayla Maki 51d8a04748 WIP Notifying buffers of head text change
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-09-29 13:16:02 -04:00
JuliaandMikayla Maki 486156fd26 Update repo scan id when files under dot git dir events
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-09-29 13:16:02 -04:00
JuliaandMikayla Maki 74deb91776 Remove git repos from worktree when deleted on storage
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-09-29 13:16:02 -04:00
JuliaandMikayla Maki a40f477416 Find repos under worktree & return correct results for repo queries
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-09-29 13:16:02 -04:00
Mikayla Maki 0199141606 Get the test to failing,,, correctly 2022-09-29 13:16:02 -04:00
Mikayla Maki 2170499ac3 Added git repository type infrastructure and moved git file system stuff into fs abstraction so we can test without touching the file system. Co-Authored-By: kay@zed.dev 2022-09-29 13:16:02 -04:00
Mikayla Maki 5deb414296 WIP - max & mikayla working on tests 2022-09-29 13:16:02 -04:00
7a52a2dde5 WIP pls amend me
Co-Authored-By: Max Brunsfeld <max@zed.dev>
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-09-29 13:16:02 -04:00
8f5a2a7a4f Pull git indicator colors out of theme
Co-Authored-By: Kay Simmons <kay@zed.dev>
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-09-29 13:16:02 -04:00
JuliaandMikayla Maki 39789691d5 Utilize initial file contents as head text by default
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-09-29 13:16:02 -04:00
JuliaandMikayla Maki f53a544038 Avoid racing git diffs & allow for "as fast as possible" diff updating
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-09-29 13:16:02 -04:00
Julia 3eadb80c9a Fully qualify outside git-related code when a diff is a git diff 2022-09-29 13:16:02 -04:00
Julia f019cfc81d Async-ify head text loading 2022-09-29 13:16:02 -04:00
Julia 9d777c74f2 Perform initial file load git diff async 2022-09-29 13:16:02 -04:00
Julia 6d23cbedc2 Properly invalidate when async git diff completes 2022-09-29 13:16:02 -04:00
Julia 8c17183c5a Changed diffs to be async and dropped git delay 2022-09-29 13:16:02 -04:00
JuliaandMikayla Maki f5f3d18bdb Disable unnecessary libgit2 cargo features
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-09-29 13:16:02 -04:00
Julia 203d0b2770 Track buffer row divergence while iterating through diff lines
This allows for offsetting head row index of deleted lines to normalize
into buffer row space
2022-09-29 13:16:02 -04:00
Julia ddeb59c3f3 Use row range while building buffer range during diff line iteration 2022-09-29 13:16:02 -04:00
Julia a5e049ec09 Reorganize for for purely file level invalidation 2022-09-29 13:16:02 -04:00
Julia 9cb5f7e323 Clear out commented code & once again perform full file diff on update 2022-09-29 13:16:02 -04:00
Julia 984f7052b2 Handle deletions more robustly and correctly 2022-09-29 13:16:02 -04:00
Julia ba0108b6ba Small clean 2022-09-29 13:16:02 -04:00
Julia 440a9aab5e buffer_divergence doesn't seem to be a concept that needs to be tracked 2022-09-29 13:16:02 -04:00
Julia ecc700e9d0 Checkpoint preparing for a more organized approach to incremental diff 2022-09-29 13:16:02 -04:00
Julia eb8c304418 Move diff logic back into BufferDiff::update 2022-09-29 13:16:02 -04:00
JuliaandMax Brunsfeld 343a34df74 Switch head range from row range to byte offset range
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2022-09-29 13:16:02 -04:00
JuliaandMax Brunsfeld 60bff07555 Move cloneable diff state into new snapshot type
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2022-09-29 13:16:02 -04:00
Julia 1853e15a73 Checkpoint on incremental diff sumtree shenanigans 2022-09-29 13:16:02 -04:00
JuliaandMax Brunsfeld 26464ad25b Update git gutter status after debounced delay
Co-authored-by: Max Brunsfeld <max@zed.com>
2022-09-29 13:16:02 -04:00
Julia f116340818 Render deletion gutter markers 2022-09-29 13:16:02 -04:00
Julia d05e7a0b5b Correct start/end of git diff hunks 2022-09-29 13:16:02 -04:00
Julia a23c5ded3a Correct git gutter indicator scroll position & add rounded corner 2022-09-29 13:16:02 -04:00
JuliaandMax Brunsfeld 745b30e6e9 Start painting some sort of hunk info, it's wrong but it's close
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2022-09-29 13:16:01 -04:00
Julia 2da503a3d9 Start asking Editors to update git after a debounced delay 2022-09-29 13:16:01 -04:00
ForLoveOfCats d7fbe9b084 Load a file's head text on file load just to get started 2022-09-29 13:16:01 -04:00
Max Brunsfeld 82b450a31a Merge pull request #1668 from zed-industries/telemetry-fixes
Telemetry fixes
2022-09-28 17:47:08 -07:00
Max Brunsfeld d5aa740c7b Remove TestTelemetry command 2022-09-28 15:50:17 -07:00