Formatting test #148
Draft
Formatting test #148
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 replaces `.map(|c| c.id().clone())` with `.ids().cloned()` to use nicer syntax for getting `CommitId`s from an iterator of commits using the `CommitIteratorExt` trait. In one case we can actually call `.parent_ids()` directly. I also pluralized a variable to make it clearer that it's a vec of IDs and not a single ID.
Also move some sentences away from "check out" to "create a new revision ...", even if it isn't the phrasing we want. Fixes jj-vcs#3487
Bumps the github-dependencies group with 1 update: [actions/checkout](https://github.com/actions/checkout). Updates `actions/checkout` from 4.1.2 to 4.1.3 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@9bb5618...1d96c77) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-dependencies ... Signed-off-by: dependabot[bot] <[email protected]>
Previously, this command would work:
jj --config-toml='snapshot.max-new-file-size="1"' st
And is equivalent to this:
jj --config-toml='snapshot.max-new-file-size="1B"' st
But this would not work, despite looking like it should:
jj --config-toml='snapshot.max-new-file-size=1' st
This is extremely confusing for users.
This config value is deserialized via serde; and while the `HumanByteSize`
struct allegedly implemented Serde's `visit_u64` method, it was not called by
the deserialize visitor. Strangely, adding an `visit_i64` method *did* work, but
then requires handling of overflow, etc. This is likely because TOML integers
are naturally specified in `i64`.
Instead, just don't bother with any of that; implement a `TryFrom<String>`
instance for `HumanByteSize` that uses `u64::from_str` to try parsing the string
immediately; *then* fall back to `parse_human_byte_size` if that doesn't work.
This not only fixes the behavior but, IMO, is much simpler to reason about; we
get our `Deserialize` instance for free from the `TryFrom` instance.
Finally, this adjusts the test for `max-new-file-size` to now use a raw integer
literal, to ensure it doesn't regress. (There are already in-crate tests for
parsing the human readable strings.)
Signed-off-by: Austin Seipp <[email protected]>
Change-Id: I8dafa2358d039ad1c07e9a512c1d10fed5845738
This was not documented, for some reason. Signed-off-by: Austin Seipp <[email protected]> Change-Id: I01a86a2d62b225c0175ed690fe9966ed22c92745
For new users this results in a significantly better error output, that actually shows them how to solve the problem, and why it happened. Signed-off-by: Austin Seipp <[email protected]> Change-Id: Ide0c86fdfb40d66f970ceaef7b60a71392d2cd4b
This one just tests with a larger value and a human-readable string (10KB). Signed-off-by: Austin Seipp <[email protected]> Change-Id: If9e5d62146b369d3a1b7efe4e56a1b6b4338c720
It's reasonable for a `WorkingCopy` implementation to want to return an error. `LocalWorkingCopyFactory` doesn't because it loads all data lazily. The VFS-based one at Google wants to be able to return an error, however.
Since we have two separate "immutable" calls in the builtin node template, and user might add a few more to their text template, it seems reasonable to cache the containing_fn globally.
…raph Maybe it's personal preference, but the hash sign looks bigger compared to the normal "o" nodes, and is slanted. This makes immutable commits stand out too much. I think "+" is closer to the diamond character used in the unicode template.
## Feature Description If enabled in the user or repository settings, the local branches pointing to the parents of the revision targeted by `jj commit` will be advanced to the newly created commit. Support for `jj new` will be added in a future change. This behavior can be enabled by default for all branches by setting the following in the config.toml: ``` [experimental-advance-branches] enabled-branches = ["glob:*"] ``` Specific branches can also be disabled: ``` [experimental-advance-branches] enabled-branches = ["glob:*"] disabled-branches = ["main"] ``` Branches that match a disabled pattern will not be advanced, even if they also match an enabled pattern. This implements feature request jj-vcs#2338.
In a future commit these tests will run with both `jj commit` and `jj new` since both will have the same semantics for advancing the branch pointer. Parameterizing the tests allows us to run both variants without duplicating the test bodies. Since the commit IDs are different when `jj describe` + `jj new` is used instead of `jj commit`, this commit also drops the commit IDs from the test snapshots. This is fine because the commit IDs are not important for these tests.
While this is arguably not part of the revset language, this is a likely place for a user to look. See https://discord.com/channels/968932220549103686/968932220549103689/1228065431281995837
This would have caught a bug in jj-vcs#3550 that otherwise might have slipped through.
This is following on the rewrite for `parallelize`. - jj-vcs#3521 Since rebase_descendants from rebase.rs is no longer used outside of that file, it can be made private again.
I'm not sure if this was an intentional omission, but I think it would be useful to have `-e` as a short flag for `--edit`. I don't usually edit commits, but I do use `prev` and `next` with edit to navigate to a commit that I want to squash. Often this is easier than typing `--from` and `--into` plus the change IDs. If people want to edit commits we shouldn't stand in their way.
Basically, clean up instances of `if\(([^,]+), \1,`. Also fix one annoying comma without a following space.
…CommitId]` CommitIds are often manipulated by reference, so this makes the API more flexible for cases where the caller doesn't already have a Vec or array of owned CommitIds. In many cases `rewrite_parents()` does not even need to clone the input CommitIds. This refactor allows the clone to be avoided if it's unnecessary. There might be other APIs that would benefit from a similar change. In general, it seems like there are a lot of places where we're writing `&[commit_x.id().clone, commit_y.id().clone()]` and similiar. - [Rust API Guidelines](https://rust-lang.github.io/api-guidelines/flexibility.html#functions-minimize-assumptions-about-parameters-by-using-generics-c-generic)
Now that it takes `IntoIterator` the caller doesn't need to clone the input `CommitIds`.
Apparently, these gc() invocations rely on that the previous "git gc" packed all refs so there are no loose refs to compare mtimes. If there were new (or remaining) loose refs, mtime comparison could fail. I also added +1sec to effectively turn off the keep_newer option, which isn't important in these tests.
This addresses the test instability. The underlying problem still exists, but it's unlikely to trigger user-facing issues because of that. A repo instance won't be reused after gc() call. Fixes jj-vcs#3537
I will be updating `rebase -r` to avoid simplifying ancestor merges in a subsequent commit, which will cause existing tests to fail for the Git backend due to ancestor merges with the root commit.
When you use e.g. `git switch` to check out a conflicted commit, you're going to end up with the `.jjconflicts-*` directories in your working copy. It's probably not obvious what those mean. This patch adds a README file to the root tree to try to explain to users what's going on and how to recover. The authoritative information about conflicts is stored in the `jj:trees` commit header. The contents of conflicted commits is only used for preventing GC. We can therefore add contents to the tree without much consequence.
Bumps the cargo-dependencies group with 2 updates: [rustix](https://github.com/bytecodealliance/rustix) and [thiserror](https://github.com/dtolnay/thiserror). Updates `rustix` from 0.38.32 to 0.38.33 - [Release notes](https://github.com/bytecodealliance/rustix/releases) - [Commits](bytecodealliance/rustix@v0.38.32...v0.38.33) Updates `thiserror` from 1.0.58 to 1.0.59 - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](dtolnay/thiserror@1.0.58...1.0.59) --- updated-dependencies: - dependency-name: rustix dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: thiserror dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps the github-dependencies group with 1 update: [EmbarkStudios/cargo-deny-action](https://github.com/embarkstudios/cargo-deny-action). Updates `EmbarkStudios/cargo-deny-action` from 1.6.2 to 1.6.3 - [Release notes](https://github.com/embarkstudios/cargo-deny-action/releases) - [Commits](EmbarkStudios/cargo-deny-action@b01e7a8...3f4a782) --- updated-dependencies: - dependency-name: EmbarkStudios/cargo-deny-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-dependencies ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps the cargo-dependencies group with 1 update: [rustix](https://github.com/bytecodealliance/rustix). Updates `rustix` from 0.38.33 to 0.38.34 - [Release notes](https://github.com/bytecodealliance/rustix/releases) - [Commits](bytecodealliance/rustix@v0.38.33...v0.38.34) --- updated-dependencies: - dependency-name: rustix dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <[email protected]>
…er found While I like strict parsing, it's not uncommon that we have to deal with file names containing spaces, and doubly-quoted strings such as '"Foo Bar"' look ugly. So, this patch adds an exception that accepts top-level bare strings. This parsing rule is specific to command arguments, and won't be enabled when loading fileset aliases.
I'm thinking of moving them to dsl_util, but we'll probably want to avoid importing dsl_util at call sites.
…ents error This will help extract interface of the error constructor without depending on T: ExpressionKind type.
For the same reason as the templater changes. These FunctionCallNode types will be extracted as utility type.
I'm about to make `[Merged]Tree::path_value()` return a `Result`. This will help even more then.
Turns out we use some of the functions in `commands/config.rs` at Google. (We use them for writing name and email if the user hasn't set them.)
`prettier` also automatically detected `.github/scripts/docs-build-deploy` as a shell script, so it formatted that too.
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.
No description provided.