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

Add pro-tip about hg diff #379

Closed
wants to merge 38 commits into from
Closed

Conversation

srsudar
Copy link
Contributor

@srsudar srsudar commented Aug 1, 2020

As requested on #186.

LMK if you want some style changes, or feel free to edit before merging.

ryenus and others added 12 commits August 5, 2019 22:46
When line numbers are shown in less, the horizontal ruler would wrap
around if line wrapping is turned on, there're 2 options:
1. turn off line wrapping in less, using `-S`
2. decrease horizontal_rule width, e.g.: `$width -= 8`,
   to accommodate line numbers up to 4 digits.

I added `-S`, but It should be fine to use either here.
We end up getting a lot of bug reports due to broken tput installations.
This will wrapper tput and keep errors to a minimum
@scottchiefbaker
Copy link
Contributor

This looks good to me. Pull Requests should target the next branch. Update this to target next and I'll land it.

@srsudar srsudar changed the base branch from master to next August 2, 2020 22:29
@srsudar
Copy link
Contributor Author

srsudar commented Aug 27, 2020

I forgot a variable in the command. It should terminate with $@ to apply other command line arguments (to allow hg diff -r foo rather than always forcing hg diff).

It should be:

diff = !HGPLAIN=1 $HG diff --pager=on --config pager.pager=diff-so-fancy $@

I'm surprised to see that this PR has some additional commits merged into it. Should I update my branch and apply it to the PR, or should I create new PR with the fix?

@scottchiefbaker
Copy link
Contributor

You must have done a git pull which pulled in the other commits from next. Try doing a git fetch upstream and then git rebase next to clean up the PR.

Once the PR is clean I'll merge it.

scottchiefbaker and others added 14 commits August 27, 2020 14:38
We end up getting a lot of bug reports due to broken tput installations.
This will wrapper tput and keep errors to a minimum
When line numbers are shown in less, the horizontal ruler would wrap
around if line wrapping is turned on, there're 2 options:
1. turn off line wrapping in less, using `-S`
2. decrease horizontal_rule width, e.g.: `$width -= 8`,
   to accommodate line numbers up to 4 digits.

I added `-S`, but It should be fine to use either here.
We end up getting a lot of bug reports due to broken tput installations.
This will wrapper tput and keep errors to a minimum
scottchiefbaker and others added 12 commits August 27, 2020 14:42
When line numbers are shown in less, the horizontal ruler would wrap
around if line wrapping is turned on, there're 2 options:
1. turn off line wrapping in less, using `-S`
2. decrease horizontal_rule width, e.g.: `$width -= 8`,
   to accommodate line numbers up to 4 digits.

I added `-S`, but It should be fine to use either here.
We end up getting a lot of bug reports due to broken tput installations.
This will wrapper tput and keep errors to a minimum
@srsudar
Copy link
Contributor Author

srsudar commented Aug 27, 2020

Everything I did made this worse. I'm going to open a clean PR and spend some time in the shame cube.

@srsudar srsudar closed this Aug 27, 2020
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.

5 participants