Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cli: add another tip to the "max snapshot size" error #3925

Closed
wants to merge 1 commit into from

Conversation

thoughtpolice
Copy link
Contributor

A helpful additional tip, suggested by Fynn Schmitt-Ulms.

Closes #3912.

Checklist

If applicable:

  • I have updated CHANGELOG.md
  • I have updated the documentation (README.md, docs/, demos/)
  • I have updated the config schema (cli/src/config-schema.json)
  • I have added tests to cover my changes

A helpful additional tip, suggested by Fynn Schmitt-Ulms.

Closes #3912.

Signed-off-by: Austin Seipp <[email protected]>
Copy link
Member

@martinvonz martinvonz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a little worried that people will follow this advice and expect everything to work after it, but it typically just makes the next command fail in the same way, right?

@@ -327,7 +327,9 @@ impl From<SnapshotError> for CommandError {
- Run `jj config set --repo snapshot.max-new-file-size {}`
This will increase the maximum file size allowed for new files, in this repository only.
- Run `jj --config-toml 'snapshot.max-new-file-size={}' st`
This will increase the maximum file size allowed for new files, for this command only.",
This will increase the maximum file size allowed for new files, for this command only.
Copy link
Contributor

@ilyagr ilyagr Jun 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps the distinction should be made that with --config-toml, the file will likely get snapshotted and not warn anymore, while with --ignore-working-copy, it will not. Something like:

  • Run jj --config-toml 'snapshot.max-new-file-size={}' st
    This will increase the maximum file size allowed for new files, for this command
    only. Any such command will snapshot all the files under the higher limit.
    They will no longer be considered "new", and this
    warning should not appear again until other large files are added to the repository.
  • Run a one-off informational command with --ignore-working-copy (e.g. jj log --ignore-working-copy).
    This will ignore changes to the working copy. No files will be snapshotted and this warning will occur again on the next command.

@thoughtpolice
Copy link
Contributor Author

I'm a little worried that people will follow this advice and expect everything to work after it, but it typically just makes the next command fail in the same way, right?

Yeah, I actually got into a few hurdles with this and tried my own advice here and it didn't really help anyway since the workspace became stale anyway too, requiring an update which required an ignored snapshot. So I think we'll close this and we need to address the original ticket another way, somehow. We can file another PR for this, in the mean time I think closing this one is fine.

@thoughtpolice thoughtpolice deleted the aseipp/push-qqvwqwzvztvw branch July 20, 2024 21:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

FR: Add --ignore-working-copy hint to large file snapshot error
3 participants