Commit Graph
9071 Commits
Author SHA1 Message Date
Mikayla Maki 4e433a3bf5 Merge pull request #2454 from zed-industries/fix-mismatching-panes-when-deserializing-empty-panes
Fully remove panes and update internal data structures
2023-05-08 20:37:06 -04:00
Mikayla Maki 6c599f4b82 Refactor and fix format 2023-05-08 17:32:40 -07:00
Mikayla Maki 2de2e8a94c Add manual removal code to remove_panes 2023-05-08 17:25:28 -07:00
Mikayla Maki ed1f4f8d77 Fully remove panes and update internal data structures 2023-05-08 17:09:29 -07:00
Max Brunsfeld 8afc8a01d5 collab 0.12.0 2023-05-08 15:54:11 -07:00
Mikayla Maki dc32c72e77 Merge pull request #2428 from zed-industries/add-branch-name
Add branch name and synchronize repository representations on the worktree.
2023-05-08 17:40:47 -04:00
Mikayla Maki 1f544cf486 Bump protocol version number 2023-05-08 14:34:14 -07:00
Mikayla Maki 858efd1f63 Fix styling of titlebar highlights 2023-05-08 14:33:59 -07:00
Mikayla Maki 53bccf44fd Add postgres migration 2023-05-08 14:33:59 -07:00
Mikayla Maki cb5ca6c54c Restore randomized integration tests 2023-05-08 14:33:59 -07:00
Mikayla Maki 1ea9ec550c fix format 2023-05-08 14:33:59 -07:00
Mikayla Maki 7fce8a259e Fix panic in tests 2023-05-08 14:33:59 -07:00
Mikayla Maki 7a40544d05 Removed test modifications, added special case to git initialization for when the repository is inside a .git folder 2023-05-08 14:33:59 -07:00
Mikayla Maki b241677bf8 Refresh titlebar on project notifications 2023-05-08 14:33:59 -07:00
Mikayla Maki 162e1ba814 Adjust tests to not create repositories inside repositories 2023-05-08 14:33:59 -07:00
Mikayla MakiandMax 09b0ea9e7b Fixed randomized test failures
co-authored-by: Max <max@zed.dev>
2023-05-08 14:33:59 -07:00
Mikayla MakiandMax 134e12a79d Removed scan ID from repository interfaces
co-authored-by: Max <max@zed.dev>
2023-05-08 14:33:59 -07:00
Mikayla MakiandMax 1d5c06465c Finished RepositoryEntry refactoring, smoke tests passing
co-authored-by: Max <max@zed.dev>
2023-05-08 14:33:59 -07:00
Mikayla Maki c5f4722a4a WIP: Change RepositoryEntry representation to be keyed off of the work directory
Removes branches button scaffolding
2023-05-08 14:33:59 -07:00
950b5873a6 WIP: re-arranging the RepositoryEntry representation
Added branches to the randomized test to check the git branch
Added the remaining database integrations in collab

Co-authored-by: Max <max@zed.dev>
Co-authored-by: Petros <petros@zed.dev>
2023-05-08 14:33:59 -07:00
Mikayla MakiandPetros 585e612b3a Add branch name in title UI
co-authored-by: Petros <petros@zed.dev>
2023-05-08 14:33:59 -07:00
Petros Amoiridis e2df701b38 Rebase main and fix error 2023-05-08 14:33:59 -07:00
Mikayla MakiandMax 46db4cbb79 WIP: Add repository entries to collab and synchronize when rejoining the room
co-authored-by: Max <max@zed.dev>
2023-05-08 14:33:59 -07:00
Mikayla Maki 8f3c07b943 Add proto fields for repository entry maintenance 2023-05-08 14:33:59 -07:00
Mikayla Maki adf07dc837 Add smoke test for collaboration 2023-05-08 14:33:59 -07:00
Petros Amoiridis 1902d69e19 Remove unused functions 2023-05-08 14:33:59 -07:00
Petros AmoiridisandMikayla Maki 5c1703823b Introduce BrancesButton in title bar
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
2023-05-08 14:33:58 -07:00
Petros Amoiridis 2092ce2230 Render title root names without branches 2023-05-08 14:33:58 -07:00
Petros Amoiridis 3045e18d75 Introduce a version control branch icon 2023-05-08 14:33:58 -07:00
Mikayla Maki da07fa114d Add branch name into title 2023-05-08 14:33:58 -07:00
Petros AmoiridisandMikayla Maki b45856e137 Display branch information per worktree root
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
2023-05-08 14:33:58 -07:00
Mikayla Maki bb5f30a58b Fix bug in repo detection 2023-05-08 14:33:58 -07:00
Mikayla Maki 8403c589d5 Add API for accessing git branch 2023-05-08 14:33:58 -07:00
Mikayla Maki d9afcb71e7 Wire in the branch name 2023-05-08 14:33:58 -07:00
Mikayla Maki cf830b1c0e Fix repo_for and clean up repository_entries 2023-05-08 14:33:58 -07:00
Mikayla Maki c1dcd83835 Fix TreeMap retain 2023-05-08 14:33:58 -07:00
Mikayla Maki f2dadb0dc9 Restored a lost API and got everything compiling 2023-05-08 14:33:58 -07:00
Mikayla Makiandpetros 0fb2dbfda6 WIP: Refactor existing git code to use new representation.
co-authored-by: petros <petros@zed.dev>
2023-05-08 14:33:58 -07:00
Mikayla MakiandNathan 627994ab94 WIP: Convert old git repository vec to new treemap based approach.
co-authored-by: Nathan <nathan@zed.dev>
2023-05-08 14:33:58 -07:00
Mikayla MakiandNathan b84f88b61a Add a data driven representation of the current git repository state to the worktree snapshots
WIP: Switch git repositories to use SumTrees

Co-authored-by: Nathan <nathan@zed.dev>
2023-05-08 14:33:58 -07:00
Mikayla Maki d56568792a Merge pull request #2453 from zed-industries/fix-click-fallthrough
Fixed clicks falling through the modal terminal
2023-05-08 13:59:57 -04:00
Mikayla MakiandAntonio f6b2e7f596 Fixed clicks falling through the modal terminal
co-authored-by: Antonio <antonio@zed.dev>
2023-05-08 10:54:12 -07:00
Kirill Bulatov d7f97a2a2d Only allow invisbles in local and leader selections 2023-05-08 19:36:51 +03:00
Kirill Bulatov bb78d10859 Code review fixes 2023-05-08 19:36:51 +03:00
Kirill Bulatov 16293ef907 Add invisibles wrapping test 2023-05-08 19:36:51 +03:00
Kirill Bulatov af7ba36856 Do not print invisibles in non-full mode editors 2023-05-08 19:36:51 +03:00
a89d1c939e Add a theme entry for whitespace, use it to style whitespaces
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
Co-Authored-By: Kirill Bulatov <mail4score@gmail.com>
2023-05-08 19:36:51 +03:00
Kirill Bulatov 820bc9b5b7 Fix wrapped line detection 2023-05-08 19:36:51 +03:00
Kirill Bulatov 9f008a5a69 Use more convntional name for the settings 2023-05-08 19:36:51 +03:00
Kirill Bulatov 21d1d2ec4c Add a test 2023-05-08 19:36:51 +03:00