git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] git-gui: support core.whitespace rules in diff view

From
Pat Thoyts <patthoyts@users.sourceforge.net>
Date
Oct 21, 2010, 18:58 UTC
Message-ID
<8762wve5k2.fsf@fox.patthoyts.tk>
In-Reply-To
<AANLkTikG0_9+Gjnhehf8436Kw089Zd-XaSdSOP-J6_yD@mail.gmail.com>
Tor Arvid Lund <torarvid@gmail.com> writes:
Show 36 quoted lines
>On Thu, Oct 21, 2010 at 1:43 AM, Junio C Hamano <gitster@pobox.com> wrote:
>> Pat Thoyts <patthoyts@users.sourceforge.net> writes:
>>
>>> This is a rather more complete implementation of whitespace highlighting
>>> according to the core.whitespace setting. The diff view whitespace
>>> highlights should match what you see with 'git diff' when color is
>>> enabled for all the whitespace rules except cr-at-eol where there is
>>> currently a rule to hide these.
>>>
>>> Suggested-by: Tor Arvid Lund <torarvid@gmail.com>
>>> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
>>> ---
>>
>> This might be a very stupid question, but isn't it an easier-to-maintain
>> option to let underlying "git diff" color its output and convert the ANSI
>> coloring to whatever Tcl wants to use, especially in the long run, instead
>> of trying to replicate the logic to check whitespace breakages here?
>
>Hi Pat, and thanks again for doing the Tcl hacking :)
>
>I did a quick test (with core.whitespace unset, so the defaults should
>be used). I wonder if there is a little bug somewhere else in git-gui.
>If I have committed a line like this:
>
>............Hello world
>
>and change it to:
>
>........*Hello world
>
>I used '.' to indicate Space, and '*' to indicate Tab, so I changed 4
>spaces to one tab character. As I understand space-before-tab, this
>should render 8 red spaces, 1 white Tab, and then "Hello world". But
>instead I get 9 white spaces... So the tab gets converted to a space
>(I verified that it was not my editor that converted it - it really is
>8 SP and 1 TAB).

This is caused by the tabstyle being defaulted to 'tabular'. This means the first tab on a line extends to the first tab position and if that lies to the left then the width of a single space is added. Looks like this widget should be using -tabstyle wordprocessor which would do what you expect and move to the next tab position.

It is still a tab - just the display width looks wrong.
Show 11 quoted lines
>
>If I change it to
>***Hello world
>so that there are no leading spaces, then the Tabs do not get converted.
>Can you reproduce this? I have applied your patch on top of Junio's
>master and build on msysgit on Vista 64 (if that matters).
>
>
>Btw, I almost feel bad saying this after you implemented my
>suggestion, but Junio's suggestion to parse the ANSI escapes seems
>quite clever, doesn't it?
Indeed - see my other post for an implementation.
-- 
Pat Thoyts                            http://www.patthoyts.tk/
PGP fingerprint 2C 6E 98 07 2C 59 C8 97  10 CE 11 E6 04 E0 B9 DD
Previous: Tor Arvid LundNext: Tor Arvid Lund
Message 7 of 14 in “Colored whitespace in git gui”
  1. Tor Arvid LundOct 18, 2010
  2. git-gui: highlight trailing whitespace in diff viewPat Thoyts, Oct 19, 2010
  3. Tor Arvid LundOct 20, 2010
  4. git-gui: support core.whitespace rules in diff viewPat Thoyts, Oct 20, 2010
  5. Junio C HamanoOct 20, 2010
  6. Tor Arvid LundOct 21, 2010
  7. Pat ThoytsOct 21, 2010
  8. Tor Arvid LundOct 22, 2010
  9. Pat ThoytsOct 22, 2010
  10. git-gui: apply color information from git diffPat Thoyts, Oct 21, 2010
  11. Kevin BallardOct 21, 2010
  12. Pat ThoytsOct 21, 2010
  13. git-gui: apply color information from git diff outputPat Thoyts, Oct 22, 2010
  14. Tor Arvid LundOct 22, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.