Make lockfile's RepoSpec attributes more readable
#19684
Closed
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
fmeum
force-pushed
the
prettier-lockfile
branch
5 times, most recently
from
03b2f8f to
0f32f31
Compare
Member
|
To fix the bootstrap and determinism tests, you'll have to update the hack at: |
SalmaSamy
approved these changes
Oct 2, 2023
fmeum
force-pushed
the
prettier-lockfile
branch
from
0f32f31 to
04bec4d
Compare
github-actions
bot
added
awaiting-review
fmeum
force-pushed
the
prettier-lockfile
branch
2 times, most recently
from
bcb5951 to
e864e28
Compare
fmeum
force-pushed
the
prettier-lockfile
branch
from
e864e28 to
31f007a
Compare
Collaborator
Author
|
@bazel-io flag |
bazel-io
added
the
potential release blocker
Member
|
@bazel-io fork 6.4.0 |
bazel-io
removed
the
potential release blocker
meteorcloudy
approved these changes
Oct 4, 2023
meteorcloudy
approved these changes
Oct 4, 2023
meteorcloudy
added
awaiting-PR-merge
SalmaSamy
approved these changes
Oct 4, 2023
github-actions
bot
removed
the
awaiting-PR-merge
Member
|
@meteorcloudy @Wyverald @SalmaSamy @fmeum There are some conflicts when I try to cherry-pick this to release-6.4.0
is not in the release-6.4.0 branch. But it's in the master branch.
is not in the release-6.4.0 branch. But it's in the master branch.
cc: @bazelbuild/triage |
Collaborator
Author
|
@meteorcloudy Could you resolve these conflicts? I'm not sure I understand which branch needs which version of this workaround. |
Member
|
Np, I can do it! |
meteorcloudy
pushed a commit
to meteorcloudy/bazel
that referenced
this pull request
Oct 6, 2023
String-valued tag and repo rule attributes in the `MODULE.bazel.lock` file have to be serialized in a way that distinguishes them from label-valued attributes. This commit uses the fact that the string representation of labels always starts with `@@` to escape strings only if they start with `@@` (or happen to be of the form of an escaped string). Since string-valued attributes rarely start with `@@`, in particular when specified by humans and not macros, this greatly reduces the need for escaping in the lockfile. This commit raises the lockfile version to 3. Along the way also disables HTML escaping for attributes as it isn't needed and results in less readable representations of certain characters. Closes bazelbuild#19684. PiperOrigin-RevId: 571037360 Change-Id: I04bb60d371cd09326780004122e729d78c99732a
Member
|
We just need to drop all three conflict changes: #19748 |
meteorcloudy
added a commit
that referenced
this pull request
Oct 6, 2023
String-valued tag and repo rule attributes in the `MODULE.bazel.lock` file have to be serialized in a way that distinguishes them from label-valued attributes. This commit uses the fact that the string representation of labels always starts with `@@` to escape strings only if they start with `@@` (or happen to be of the form of an escaped string). Since string-valued attributes rarely start with `@@`, in particular when specified by humans and not macros, this greatly reduces the need for escaping in the lockfile. This commit raises the lockfile version to 3. Along the way also disables HTML escaping for attributes as it isn't needed and results in less readable representations of certain characters. Closes #19684. PiperOrigin-RevId: 571037360 Change-Id: I04bb60d371cd09326780004122e729d78c99732a Co-authored-by: Fabian Meumertzheim <[email protected]>
Member
|
The changes in this PR have been included in Bazel 6.4.0 RC2. Please test out the release candidate and report any issues as soon as possible. If you're using Bazelisk, you can point to the latest RC by setting USE_BAZEL_VERSION=last_rc. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
String-valued tag and repo rule attributes in the
MODULE.bazel.lockfile have to be serialized in a way that distinguishes them from label-valued attributes. This commit uses the fact that the string representation of labels always starts with@@to escape strings only if they start with@@(or happen to be of the form of an escaped string). Since string-valued attributes rarely start with@@, in particular when specified by humans and not macros, this greatly reduces the need for escaping in the lockfile.This commit raises the lockfile version to 3.
Along the way also disables HTML escaping for attributes as it isn't needed and results in less readable representations of certain characters.