tk0miya/diff-highlight · GitHub

diff-highlight: pretty diff highlighter; emphasis changed words in diff

diff-highlight adds word highlighting feature to git, mercurial and other diff viewers.

• Add highlights to diff output
• mercurial extension for diff highlighting

Use easy_install or pip:

$ sudo easy_install diff-highlight

Or

$ sudo pip install diff-highlight

Add pager settings to your $HOME/.gitconfig to enable word highlights:

[pager]
    log = diff-highlight | less
    show = diff-highlight | less
    diff = diff-highlight | less

and to use diff-highlight for git add -p:

[interactive]
    diffFilter = diff-highlight

Add color and diff_highlight extensions to your $HOME/.hgrc to enable word highlights:

[extensions]
color =
diff_highlight =

• Python 2.6 or 2.7, or Python 3.2, 3.3, 3.4 (or higher (mercurial extension works on python 2.x only)

Apache License 2.0 (highlights/pprint.py is under PSFL).

• Grouping indented hunks
• Fix #1: highlight if large text appended
• Fix mercurial extension has been broken since mercurial-3.7.0

• Drop py24 and py25 support
• Support git styled diff

• Ignore IOError on showing result

• Fix result of diff-highlight commannd is broken when diff-text includes new file (thanks @troter)

• Fix diff-highlight command failed with python 2.4

• Add diff-highlight command
• Support python 2.4, 2.5, 3.2 and 3.3

• first release