cli: allow adding a workspace in an existing empty directory #8249
+37
−15
Conversation
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
botovq
force-pushed
the
push-nmnqnpsyqtoq
branch
from
cb5280b to
58313e7
Compare
This moves the is_empty_dir() helper from the clone subcommand to the library and changes its return value to Result<bool, PathError>, so it can be used from elsewhere. The next commit will make use of it in commands/workspace/add.rs.
Cloning into an existing empty directory works. There is no reason why 'jj workspace add' should fail. After all, the directory is empty. For example, if the target directory is the root of a file system, it is impossible to remove directory to let 'jj workspace add' create it. Reword the error message to match the one for jj git clone.
botovq
force-pushed
the
push-nmnqnpsyqtoq
branch
from
58313e7 to
37880cc
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
I was in precisely the situation described in the second commit where I wanted to add a workspace at the root of a file system and was first confused by the error message and then why it refused to use the empty directory. This makes the behavior and errors consistent with
jj git clone.Unsure if the move of
is_empty_dir()is to the right spot, but it seemed to fit well enough next toremove_dir_contents().Checklist
If applicable:
CHANGELOG.mdREADME.md,docs/,demos/)cli/src/config-schema.json)