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 ui.color = "debug" #3631

Merged
merged 1 commit into from
May 11, 2024
Merged

Conversation

tingerrr
Copy link
Collaborator

@tingerrr tingerrr commented May 6, 2024

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

Copy link

google-cla bot commented May 6, 2024

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

@tingerrr tingerrr force-pushed the tingerrr/rluzuwnltqxm branch from 909bae5 to 287c4b5 Compare May 6, 2024 18:06
@tingerrr tingerrr changed the title cli: add --color=debug to print active labels during formatting cli: add ui.color = "debug" May 6, 2024
@tingerrr tingerrr force-pushed the tingerrr/rluzuwnltqxm branch from 287c4b5 to da54563 Compare May 6, 2024 18:14
Copy link
Collaborator

@yuja yuja left a comment

Choose a reason for hiding this comment

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

looks generally good to me, thanks!

cli/src/ui.rs Outdated Show resolved Hide resolved
cli/src/formatter.rs Outdated Show resolved Hide resolved
cli/src/formatter.rs Outdated Show resolved Hide resolved
cli/tests/test_global_opts.rs Outdated Show resolved Hide resolved
@tingerrr tingerrr force-pushed the tingerrr/rluzuwnltqxm branch from da54563 to e341095 Compare May 10, 2024 13:11
When using `ui.color = "debug"`, changes in the output style
additionally include delimiters << and >>, as well as all active labels
at this point separated by ::. The output is otherwise unformatted and
the delimiters and labels inherit the style of the content they apply
to.
@tingerrr tingerrr force-pushed the tingerrr/rluzuwnltqxm branch from e341095 to 27ad324 Compare May 10, 2024 13:34
@tingerrr tingerrr requested a review from yuja May 10, 2024 13:44
@tingerrr
Copy link
Collaborator Author

Some changes were non-trivial, so I'm making sure and requested another review.

Copy link
Collaborator

@yuja yuja left a comment

Choose a reason for hiding this comment

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

much better, thanks.

cli/src/formatter.rs Show resolved Hide resolved
@tingerrr tingerrr merged commit d0a29a8 into jj-vcs:main May 11, 2024
16 checks passed
@tingerrr tingerrr deleted the tingerrr/rluzuwnltqxm branch May 11, 2024 08:16
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