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.

Sign up for GitHub

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

Jump to bottom

diff: specify available terminal width by caller, subtract graph width #4181

Merged
merged 2 commits into from
Jul 31, 2024
Merged

diff: specify available terminal width by caller, subtract graph width #4181

merged 2 commits into from
Jul 31, 2024

Conversation

yuja
Copy link
Contributor

@yuja yuja commented Jul 30, 2024

#4158

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

jonathantanmy
jonathantanmy reviewed Jul 30, 2024
View reviewed changes
Copy link
Contributor

@jonathantanmy jonathantanmy left a comment

Choose a reason for hiding this comment

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

Thanks, overall this looks good except for one comment above.

cli/tests/test_log_command.rs Show resolved Hide resolved
yuja added 2 commits July 31, 2024 14:15
@yuja
ui: fill in default term width globally and return as usize
ec0bfa5 
I'm going to add more ui.term_width() callers, and it's unlikely we'll have to
set different defaults or error out.
@yuja
diff: specify available terminal width by caller, subtract graph width
b3b3850 
The width parameter is mandatory so it wouldn't fall back to ui.term_width() by
mistake. The API is getting messy and we might want to extract some parameters
to separate struct.

Fixes jj-vcs#4158
@yuja yuja force-pushed the push-noqyoovkpxvl branch from 23e7cbb to b3b3850 Compare July 31, 2024 05:17
@yuja yuja enabled auto-merge (rebase) July 31, 2024 05:18
jonathantanmy
jonathantanmy approved these changes Jul 31, 2024
View reviewed changes
Copy link
Contributor

@jonathantanmy jonathantanmy left a comment

Choose a reason for hiding this comment

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

Thanks! Looks good.

@yuja yuja merged commit dc2b550 into jj-vcs:main Jul 31, 2024
17 checks passed
@yuja yuja deleted the push-noqyoovkpxvl branch July 31, 2024 17:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonathantanmy jonathantanmy jonathantanmy approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@yuja @jonathantanmy