Fix empty files can't be selected in builtin diff editor #3481
Conversation
This file contains 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
|
This is a first pass at fixing #3016. The upstream This PR should be a complete fix for |
emesterhazy
force-pushed
the
push-zlpuryytotqv
branch
from
4d92b16 to
6b7cf29
Compare
emesterhazy
force-pushed
the
push-zlpuryytotqv
branch
2 times, most recently
from
fef2509 to
ef95706
Compare
yuja
approved these changes
Apr 14, 2024
emesterhazy
force-pushed
the
push-zlpuryytotqv
branch
from
ef95706 to
963c6de
Compare
|
Thanks for reviewing @arxanas! |
emesterhazy
force-pushed
the
push-zlpuryytotqv
branch
from
963c6de to
0e85704
Compare
|
I'm going to submit this now and work on a patch for |
|
Sounds good. Thanks, both of you! EDIT: all three of you! |
emesterhazy
force-pushed
the
push-zlpuryytotqv
branch
from
0e85704 to
1b41780
Compare
This fixes several issues that made working with empty files difficult using the builtin diff editor. 1. The scm-record library used for the editor expects each file to have at least one section. For new empty files this should be a file mode section. jj wasn't rendering this mode section, which prevented empty files from being selected at all. 2. The scm-record library returns `SelectedContents::Absent` if the file has no contents after the diff editor is invoked. This can be because of several reasons: 1) the file is new and empty; 2) the file was empty before and is still empty; 3) the file has been deleted. Perhaps this is a bug in scm-record and it should return `SelectedContents::Unchanged` or `SelectedContents::Present` if the file hasn't been deleted. Until this is patched upstream, we can work around it by disambiguating these cases. See arxanas/scm-record#26 for the upstream bug. Fixes #3016
emesterhazy
force-pushed
the
push-zlpuryytotqv
branch
from
1b41780 to
09df602
Compare
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.
This fixes several issues that made working with empty files difficult using the builtin diff editor.
The scm-record library used for the editor expects each file to have at least one section. For empty files this should be a file mode section. jj wasn't rendering this mode section, which prevented empty files from being selected at all.
The scm-record library returns
SelectedContents::Absentif the file has no contents after the diff editor is invoked. This can be because of several reasons: 1) the file is new and empty; 2) the file was empty before and is still empty; 3) the file has been deleted. Perhaps this is a bug in scm-record and it should returnSelectedContents::UnchangedorSelectedContents::Presentif the file hasn't been deleted. Until this is patched upstream, we can work around it by disambiguating these cases.See arxanas/scm-record#26 for the upstream bug.
Fixes #3016