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

working_copy: on snapshot, warn new large files and continue #5069

Merged
merged 3 commits into from
Dec 11, 2024

Conversation

yuja
Copy link
Collaborator

@yuja yuja commented Dec 10, 2024

#3616, #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

cli/src/cli_util.rs Outdated Show resolved Hide resolved
yuja added 3 commits December 11, 2024 16:19
I think this provides a better UX than refusing any operation due to large
files. Because untracked files won't be overwritten, it's usually safe to
continue operation ignoring the untracked files. One caveat is that new large
files can become tracked if files of the same name checked out. (see the test
case)

FWIW, the warning will be printed only once if watchman is enabled. If we use
the snapshot stats to print untracked paths in "jj status", this will be a
problem.

Closes martinvonz#3616, martinvonz#3912
As Martin spotted, the original code can't prevent "1.0GiB, maximum size allowed
is ~1.0GiB." I personally don't mind if the error message contained the exact
size, so I simply let it print both exact and human byte sizes unconditionally.
@yuja yuja force-pushed the push-tkqqukynkmwk branch from c6114d9 to f80eb55 Compare December 11, 2024 07:29
@yuja yuja merged commit 71440fc into martinvonz:main Dec 11, 2024
18 checks passed
@yuja yuja deleted the push-tkqqukynkmwk branch December 11, 2024 11:19
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.

2 participants