Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Pretty diff to html javascript cli (diff2html-cli)

License

NotificationsYou must be signed in to change notification settings

rtfpessoa/diff2html-cli

Repository files navigation

npmnodenpmGitHub Actions

npm weekly downloadsnpm monthly downloadsnpm yearly downloadsnpm downloads

Diff to Html generates pretty HTML diffs from unified and git diff output in your terminal

Table of Contents

Features

  • Unified diff and Git diff input

  • line-by-line andside-by-side diff

  • new and old line numbers

  • inserted and removed lines

  • GitHub like style

  • Code syntax highlight

  • Line similarity matching

Online Example

Go toDiff2HTML

Distributions

Setup

npm install -g diff2html-cli

Usage

Usage: diff2html [ flags and/or options ] -- [git diff passthrough flags and options]

flagaliasdescriptionchoicesdefault
-s--styleOutput styleline,sideline
--fct--fileContentToggleAdds a viewed checkbox to toggle file contenttrue,falsetrue
--sc--synchronisedScrollSynchronised horizontal scrolltrue,falsetrue
--hc--highlightCodeHighlight codetrue,falsetrue
--cs--colorSchemeColor schemeauto,dark,lightauto
--su--summaryShow files summaryclosed,open,hiddenclosed
-d--diffStyleDiff styleword,charword
--lm--matchingDiff line matching typelines,words,nonenone
--lmt--matchWordsThresholdDiff line matching word threshold0.25
--lmm--matchingMaxComparisonsDiff line matching maximum line comparisons of a block of changes2500
--diffMaxChangesNumber of changed lines after which a file diff is deemed as too big and not displayed
--diffMaxLineLengthNumber of characters in a diff line after which a file diff is deemed as too big and not displayed
--renderNothingWhenEmptyRender nothing if the diff shows no change in its comparisonfalse
--maxLineSizeInBlockForComparisonMaximum number of characters of the bigger line in a block to apply comparison200
--maxLineLengthHighlightMaximum number of characters in a line to apply highlight10000
--hwt--htmlWrapperTemplatePath to custom template to be rendered when using thehtml output format[string]
-t--titlePage title forhtml output[string]
-f--formatOutput formathtml,jsonhtml
-i--inputDiff input sourcefile,command,stdincommand
-o--outputOutput destinationpreview,stdoutpreview
-u--diffyUpload to diffy.orgbrowser,pbcopy,print
-F--fileSend output to file (overrides output option)[string]
--ig--ignoreIgnore particular files from the diff[string]
-v--versionShow version number
-h--helpShow help

Exit Status Codes

  • 🎉 0: Success
  • 😵 1: Generic Error
  • 😰 3: Input diff is empty
  • 👮 4: Value of--hwt | --htmlWrapperTemplate is not a valid file

Custom HTML wrapper template

The template is a very based on a simple replace of several placeholders as codedhttps://github.com/rtfpessoa/diff2html-cli/blob/master/src/cli.ts#L40

To provide a custom template you need to make sure you have the following comments and imports in your HTML, exactly asthey are here:

  • Inside the<head> tag
<linkrel="stylesheet"href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.9.0/styles/github.min.css"/><!--diff2html-css--><!--diff2html-js-ui--><script>document.addEventListener('DOMContentLoaded',()=>{consttargetElement=document.getElementById('diff');constdiff2htmlUi=newDiff2HtmlUI(targetElement);//diff2html-fileListToggle//diff2html-synchronisedScroll//diff2html-highlightCode});</script>
  • Inside the<body> tag
<divid="diff"><!--diff2html-diff--></div>

Examples

diff2html -s line -f html -d word -i command -o preview -- -M HEAD~1

  • diff last commit, line by line, word comparison between lines, previewed in the browser and input from git diffcommand

diff2html -i file -- my-file-diff.diff

  • reading the input from a file

diff -u file1.txt file2.txt | diff2html -i stdin

  • reading diff from stdin

diff2html -f json -o stdout -- -M HEAD~1

  • print json format to stdout

diff2html -F my-pretty-diff.html -- -M HEAD~1

  • print to file

diff2html -F my-pretty-diff.html --hwt my-custom-template.html -- -M HEAD~1

  • print to file using custom markup templates can include the following variables

diff2html --ig package-lock.json --ig yarn.lock

  • Ignorepackage-lock.json andyarn.lock from the generated diff

NOTE: notice the-- in the examples

Contribute

This is a developer friendly project, all the contributions are welcome. To contribute just send a pull request withyour changes following the guidelines described inCONTRIBUTING.md. I will try to review them as soon as possible.

Developing

Make some changes,yarn build and then./bin/diff2html 😉

License

Copyright 2014-present Rodrigo Fernandes. Released under the terms of the MIT license.

Thanks

This project is inspired inpretty-diff byScott González.



[8]ページ先頭

©2009-2025 Movatter.jp