Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
ZIm/crates
History
Cole Miller 5704b50fb1
git: Compute and synchronize diffs from HEAD (#23626) 
This PR builds on #21258 to make it possible to use HEAD as a diff base.
The buffer store is extended to support holding multiple change sets,
and collab gains support for synchronizing the committed text of files
when any collaborator requires it.

Not implemented in this PR:

- Exposing the diff from HEAD to the user
- Decorating the diff from HEAD with information about which hunks are
staged

`test_random_multibuffer` now fails first at `SEED=13277`, similar to
the previous high-water mark, but with various bugs in the multibuffer
logic now shaken out.

Release Notes:

- N/A

---------

Co-authored-by: Max <max@zed.dev>
Co-authored-by: Ben <ben@zed.dev>
Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>
Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
Co-authored-by: Conrad <conrad@zed.dev>
2025-02-04 15:29:10 -05:00
..
activity_indicator Remove more references to 'model' in GPUI APIs (#23693) 2025-01-27 04:00:27 +00:00
anthropic Solve 50+ cargo doc warnings (#24071) 2025-02-01 06:19:29 +00:00
assets Eliminate GPUI View, ViewContext, and WindowContext types (#22632) 2025-01-26 03:02:45 +00:00
assistant assistant: Unship tool use (#23969) 2025-01-30 19:46:15 +00:00
assistant2 Rename model based variable names to entity (#24198) 2025-02-04 10:24:35 -08:00
assistant_context_editor Rename model based variable names to entity (#24198) 2025-02-04 10:24:35 -08:00
assistant_settings Solve 50+ cargo doc warnings (#24071) 2025-02-01 06:19:29 +00:00
assistant_slash_command Eliminate GPUI View, ViewContext, and WindowContext types (#22632) 2025-01-26 03:02:45 +00:00
assistant_slash_commands Omit gitignored files from context file picker (#23777) 2025-01-28 11:40:42 -03:00
assistant_tool Eliminate GPUI View, ViewContext, and WindowContext types (#22632) 2025-01-26 03:02:45 +00:00
assistant_tools Eliminate GPUI View, ViewContext, and WindowContext types (#22632) 2025-01-26 03:02:45 +00:00
audio Eliminate GPUI View, ViewContext, and WindowContext types (#22632) 2025-01-26 03:02:45 +00:00
auto_update Fix missed renames in #22632 (#23688) 2025-01-26 23:37:34 +00:00
auto_update_ui Eliminate GPUI View, ViewContext, and WindowContext types (#22632) 2025-01-26 03:02:45 +00:00
breadcrumbs Remove more references to 'model' in GPUI APIs (#23693) 2025-01-27 04:00:27 +00:00
call Use different commit author for collab project clients (#24058) 2025-01-31 23:25:58 +00:00
channel Rename model based variable names to entity (#24198) 2025-02-04 10:24:35 -08:00
cli cli: Instruct in --help how to run to see all logs (#24112) 2025-02-03 04:46:49 -03:00
client Rename model based variable names to entity (#24198) 2025-02-04 10:24:35 -08:00
clock chore: Use workspace fields for edition and publish (#23291) 2025-01-17 17:39:22 +01:00
collab git: Compute and synchronize diffs from HEAD (#23626) 2025-02-04 15:29:10 -05:00
collab_ui Rename model based variable names to entity (#24198) 2025-02-04 10:24:35 -08:00
collections chore: Use workspace fields for edition and publish (#23291) 2025-01-17 17:39:22 +01:00
command_palette Remove more references to 'model' in GPUI APIs (#23693) 2025-01-27 04:00:27 +00:00
command_palette_hooks Eliminate GPUI View, ViewContext, and WindowContext types (#22632) 2025-01-26 03:02:45 +00:00
context_server Fix missed renames in #22632 (#23688) 2025-01-26 23:37:34 +00:00
context_server_settings Eliminate GPUI View, ViewContext, and WindowContext types (#22632) 2025-01-26 03:02:45 +00:00
copilot Use the term "edit prediction" over "inline completion" (#24211) 2025-02-04 10:33:01 -08:00
db Eliminate GPUI View, ViewContext, and WindowContext types (#22632) 2025-01-26 03:02:45 +00:00
deepseek Add DeepSeek support (#23551) 2025-01-27 13:40:59 -05:00
diagnostics git: Compute and synchronize diffs from HEAD (#23626) 2025-02-04 15:29:10 -05:00
docs_preprocessor Eliminate GPUI View, ViewContext, and WindowContext types (#22632) 2025-01-26 03:02:45 +00:00
editor git: Compute and synchronize diffs from HEAD (#23626) 2025-02-04 15:29:10 -05:00
evals Fix missed renames in #22632 (#23688) 2025-01-26 23:37:34 +00:00
extension Eliminate GPUI View, ViewContext, and WindowContext types (#22632) 2025-01-26 03:02:45 +00:00
extension_api chore: Use workspace fields for edition and publish (#23291) 2025-01-17 17:39:22 +01:00
extension_cli extension_cli: Add support for packaging icon themes (#23978) 2025-01-30 21:45:04 +00:00
extension_host extensions_ui: Show the filtered icon theme selector when installing an icon theme (#23992) 2025-01-31 01:32:13 +00:00
extensions_ui Migrate more events to telemetry::event! macro (#24102) 2025-02-03 16:38:45 +00:00
feature_flags Project Diff 2 (#23891) 2025-02-03 13:18:50 -07:00
feedback Enable word wrap in feedback modal (#23893) 2025-01-31 00:13:53 -07:00
file_finder Remove more references to 'model' in GPUI APIs (#23693) 2025-01-27 04:00:27 +00:00
file_icons Eliminate GPUI View, ViewContext, and WindowContext types (#22632) 2025-01-26 03:02:45 +00:00
fs git: Compute and synchronize diffs from HEAD (#23626) 2025-02-04 15:29:10 -05:00
fsevent Deflake fs::test_event_stream_simple (#24013) 2025-01-30 23:53:36 -07:00
fuzzy chore: Use workspace fields for edition and publish (#23291) 2025-01-17 17:39:22 +01:00
git git: Compute and synchronize diffs from HEAD (#23626) 2025-02-04 15:29:10 -05:00
git_hosting_providers Eliminate GPUI View, ViewContext, and WindowContext types (#22632) 2025-01-26 03:02:45 +00:00
git_ui Revert "Skip COMMIT_EDITMSG contents when opening the file (#24146)" (#24216) 2025-02-04 21:05:10 +02:00
go_to_line Project Diff 2 (#23891) 2025-02-03 13:18:50 -07:00
google_ai Solve 50+ cargo doc warnings (#24071) 2025-02-01 06:19:29 +00:00
gpui Fix slow focus transitions to the terminal panel (#24172) 2025-02-04 20:23:20 +00:00
gpui_macros gpui: Switch from linkme to inventory for action registration (#24087) 2025-02-02 09:13:46 -08:00
gpui_tokio Make the gpui_tokio crate generic over the context it spawns (#23995) 2025-01-31 02:00:55 +00:00
html_to_markdown Eliminate GPUI View, ViewContext, and WindowContext types (#22632) 2025-01-26 03:02:45 +00:00
http_client Solve 50+ cargo doc warnings (#24071) 2025-02-01 06:19:29 +00:00
image_viewer Eliminate GPUI View, ViewContext, and WindowContext types (#22632) 2025-01-26 03:02:45 +00:00
indexed_docs Eliminate GPUI View, ViewContext, and WindowContext types (#22632) 2025-01-26 03:02:45 +00:00
inline_completion zeta: Revised data-collection onboarding experience (#24031) 2025-02-04 04:06:09 -03:00
inline_completion_button zeta: Fix data collection display on the status bar menu (#24177) 2025-02-04 08:05:28 +00:00
install_cli Fix missed renames in #22632 (#23688) 2025-01-26 23:37:34 +00:00
journal Eliminate GPUI View, ViewContext, and WindowContext types (#22632) 2025-01-26 03:02:45 +00:00
language git: Compute and synchronize diffs from HEAD (#23626) 2025-02-04 15:29:10 -05:00
language_extension Fix missed renames in #22632 (#23688) 2025-01-26 23:37:34 +00:00
language_model Add OpenAI o3-mini support (#24044) 2025-01-31 15:48:55 -05:00
language_model_selector assistant: Preserve selection focus in the model selector (#23713) 2025-01-27 12:29:08 -03:00
language_models Switch GitHub Copilot Chat from o1-mini to o3-mini (#24080) 2025-02-01 12:49:24 -05:00
language_selector Refactor to use SharedString in more places (#23813) 2025-01-28 19:04:21 -05:00
language_tools Allow buffer search in project search (#23819) 2025-01-31 00:13:46 -07:00
languages Enable CSS, JSON, Python, and Tailwind to lookup LSP installed in PATH (#22037) 2025-02-04 14:50:49 -05:00
livekit_client Fix missed renames in #22632 (#23688) 2025-01-26 23:37:34 +00:00
livekit_client_macos Eliminate GPUI View, ViewContext, and WindowContext types (#22632) 2025-01-26 03:02:45 +00:00
livekit_server chore: Use workspace fields for edition and publish (#23291) 2025-01-17 17:39:22 +01:00
lmstudio lmstudio: Support missing quantization in model metadata (#24054) 2025-01-31 22:28:11 +00:00
lsp Revert "project: Fine-grained language server management" (#23977) 2025-01-30 13:42:56 -08:00
markdown Rename model based variable names to entity (#24198) 2025-02-04 10:24:35 -08:00
markdown_preview Migrate more events to telemetry::event! macro (#24102) 2025-02-03 16:38:45 +00:00
media chore: Use workspace fields for edition and publish (#23291) 2025-01-17 17:39:22 +01:00
menu chore: Use workspace fields for edition and publish (#23291) 2025-01-17 17:39:22 +01:00
multi_buffer git: Compute and synchronize diffs from HEAD (#23626) 2025-02-04 15:29:10 -05:00
node_runtime Pass extra CA certs to node process if env var exists (#23662) 2025-01-30 08:56:02 -08:00
notifications Remove more references to 'model' in GPUI APIs (#23693) 2025-01-27 04:00:27 +00:00
ollama Eliminate GPUI View, ViewContext, and WindowContext types (#22632) 2025-01-26 03:02:45 +00:00
open_ai Solve 50+ cargo doc warnings (#24071) 2025-02-01 06:19:29 +00:00
outline Remove more references to 'model' in GPUI APIs (#23693) 2025-01-27 04:00:27 +00:00
outline_panel Rename model based variable names to entity (#24198) 2025-02-04 10:24:35 -08:00
paths Add auto-completion support for snippet files (#23698) 2025-01-27 12:32:22 +01:00
picker Rename model based variable names to entity (#24198) 2025-02-04 10:24:35 -08:00
prettier Revert "project: Fine-grained language server management" (#23977) 2025-01-30 13:42:56 -08:00
project git: Compute and synchronize diffs from HEAD (#23626) 2025-02-04 15:29:10 -05:00
project_panel Rename model based variable names to entity (#24198) 2025-02-04 10:24:35 -08:00
project_symbols Remove more references to 'model' in GPUI APIs (#23693) 2025-01-27 04:00:27 +00:00
prompt_library Refactor to use SharedString in more places (#23813) 2025-01-28 19:04:21 -05:00
proto git: Compute and synchronize diffs from HEAD (#23626) 2025-02-04 15:29:10 -05:00
recent_projects Rename model based variable names to entity (#24198) 2025-02-04 10:24:35 -08:00
refineable Revert "project: Fine-grained language server management" (#23977) 2025-01-30 13:42:56 -08:00
release_channel Solve 50+ cargo doc warnings (#24071) 2025-02-01 06:19:29 +00:00
remote Fix missed renames in #22632 (#23688) 2025-01-26 23:37:34 +00:00
remote_server git: Compute and synchronize diffs from HEAD (#23626) 2025-02-04 15:29:10 -05:00
repl Rename model based variable names to entity (#24198) 2025-02-04 10:24:35 -08:00
reqwest_client Solve 50+ cargo doc warnings (#24071) 2025-02-01 06:19:29 +00:00
rich_text Eliminate GPUI View, ViewContext, and WindowContext types (#22632) 2025-01-26 03:02:45 +00:00
rope git: Compute and synchronize diffs from HEAD (#23626) 2025-02-04 15:29:10 -05:00
rpc Revert "edit prediction: Try to expand context to parent treesitter region" (#24214) 2025-02-04 18:32:17 +00:00
schema_generator Add schema_generator for generating JSON schemas (#23991) 2025-01-31 01:22:10 +00:00
search Rename model based variable names to entity (#24198) 2025-02-04 10:24:35 -08:00
semantic_index Remove more references to 'model' in GPUI APIs (#23693) 2025-01-27 04:00:27 +00:00
semantic_version chore: Use workspace fields for edition and publish (#23291) 2025-01-17 17:39:22 +01:00
session Eliminate GPUI View, ViewContext, and WindowContext types (#22632) 2025-01-26 03:02:45 +00:00
settings Solve 50+ cargo doc warnings (#24071) 2025-02-01 06:19:29 +00:00
settings_ui Eliminate GPUI View, ViewContext, and WindowContext types (#22632) 2025-01-26 03:02:45 +00:00
snippet Eliminate GPUI View, ViewContext, and WindowContext types (#22632) 2025-01-26 03:02:45 +00:00
snippet_provider snippets: Fix snippets not updating while containing comments (#23755) 2025-01-28 10:37:48 +01:00
snippets_ui Remove more references to 'model' in GPUI APIs (#23693) 2025-01-27 04:00:27 +00:00
sqlez Eliminate GPUI View, ViewContext, and WindowContext types (#22632) 2025-01-26 03:02:45 +00:00
sqlez_macros chore: Use workspace fields for edition and publish (#23291) 2025-01-17 17:39:22 +01:00
story Eliminate GPUI View, ViewContext, and WindowContext types (#22632) 2025-01-26 03:02:45 +00:00
storybook Remove more references to 'model' in GPUI APIs (#23693) 2025-01-27 04:00:27 +00:00
streaming_diff chore: Use workspace fields for edition and publish (#23291) 2025-01-17 17:39:22 +01:00
sum_tree git: Compute and synchronize diffs from HEAD (#23626) 2025-02-04 15:29:10 -05:00
supermaven Use the term "edit prediction" over "inline completion" (#24211) 2025-02-04 10:33:01 -08:00
supermaven_api Eliminate GPUI View, ViewContext, and WindowContext types (#22632) 2025-01-26 03:02:45 +00:00
tab_switcher Remove more references to 'model' in GPUI APIs (#23693) 2025-01-27 04:00:27 +00:00
task Eliminate GPUI View, ViewContext, and WindowContext types (#22632) 2025-01-26 03:02:45 +00:00
tasks_ui Renames: HighlightedText->HighlightedMatch + HighlightedEdits->HighlightedText (#24057) 2025-01-31 23:15:46 +00:00
telemetry chore: Use workspace fields for edition and publish (#23291) 2025-01-17 17:39:22 +01:00
telemetry_events chore: Use workspace fields for edition and publish (#23291) 2025-01-17 17:39:22 +01:00
terminal Solve 50+ cargo doc warnings (#24071) 2025-02-01 06:19:29 +00:00
terminal_view Implement character index for point (#23989) 2025-02-04 20:15:43 +00:00
text Fix unnecessarily large edits emitted from multi buffer on diff recalculation (#23753) 2025-01-27 18:11:15 -08:00
theme themes: Make background colors partly transparent by default (#24151) 2025-02-03 22:38:14 +00:00
theme_extension Eliminate GPUI View, ViewContext, and WindowContext types (#22632) 2025-01-26 03:02:45 +00:00
theme_importer Add schema_generator for generating JSON schemas (#23991) 2025-01-31 01:22:10 +00:00
theme_selector theme_selector: Add a button to open the extension store (#24195) 2025-02-04 14:13:24 +00:00
time_format chore: Use workspace fields for edition and publish (#23291) 2025-01-17 17:39:22 +01:00
title_bar zeta: Revised data-collection onboarding experience (#24031) 2025-02-04 04:06:09 -03:00
toolchain_selector Remove more references to 'model' in GPUI APIs (#23693) 2025-01-27 04:00:27 +00:00
ui Fix prediction preview binding: Alt + Preview -> Alt Preview (#24220) 2025-02-04 19:32:30 +00:00
ui_input Eliminate GPUI View, ViewContext, and WindowContext types (#22632) 2025-01-26 03:02:45 +00:00
ui_macros Revert "project: Fine-grained language server management" (#23977) 2025-01-30 13:42:56 -08:00
util Canonicalize paths when running tests (#23655) 2025-01-26 14:56:07 +08:00
vcs_menu Remove more references to 'model' in GPUI APIs (#23693) 2025-01-27 04:00:27 +00:00
vim Rename model based variable names to entity (#24198) 2025-02-04 10:24:35 -08:00
vim_mode_setting Eliminate GPUI View, ViewContext, and WindowContext types (#22632) 2025-01-26 03:02:45 +00:00
welcome Migrate more events to telemetry::event! macro (#24102) 2025-02-03 16:38:45 +00:00
workspace Fix slow focus transitions to the terminal panel (#24172) 2025-02-04 20:23:20 +00:00
worktree git: Compute and synchronize diffs from HEAD (#23626) 2025-02-04 15:29:10 -05:00
zed Bump Zed to v0.174 (#24221) 2025-02-04 14:38:37 -05:00
zed_actions zeta: Revised data-collection onboarding experience (#24031) 2025-02-04 04:06:09 -03:00
zeta Revert "Skip COMMIT_EDITMSG contents when opening the file (#24146)" (#24216) 2025-02-04 21:05:10 +02:00