• J
    color-words: change algorithm to allow for 0-character word boundaries · 2e5d2003
    Johannes Schindelin 提交于
    Up until now, the color-words code assumed that word boundaries are
    identical to white space characters.
    
    Therefore, it could get away with a very simple scheme: it copied the
    hunks, substituted newlines for each white space character, called
    libxdiff with the processed text, and then identified the text to
    output by the offsets (which agreed since the original text had the
    same length).
    
    This code was ugly, for a number of reasons:
    
    - it was impossible to introduce 0-character word boundaries,
    
    - we had to print everything word by word, and
    
    - the code needed extra special handling of newlines in the removed part.
    
    Fix all of these issues by processing the text such that
    
    - we build word lists, separated by newlines,
    
    - we remember the original offsets for every word, and
    
    - after calling libxdiff on the wordlists, we parse the hunk headers, and
      find the corresponding offsets, and then
    
    - we print the removed/added parts in one go.
    
    The pre and post samples in the test were provided by Santi Béjar.
    
    Note that there is some strange special handling of hunk headers where
    one line range is 0 due to POSIX: in this case, the start is one too
    low.  In other words a hunk header '@@ -1,0 +2 @@' actually means that
    the line must be added after the _second_ line of the pre text, _not_
    the first.
    Signed-off-by: NJohannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: NJunio C Hamano <gitster@pobox.com>
    2e5d2003
t4034-diff-words.sh 1009 字节