diff options
author | Dan Davison <dandavison7@gmail.com> | 2020-08-05 16:34:22 -0400 |
---|---|---|
committer | Dan Davison <dandavison7@gmail.com> | 2020-08-05 16:37:09 -0400 |
commit | cfd6ed0e077f3667b036902516a0348b1c596441 (patch) | |
tree | 678a5bf6ad901fc269a4315dfb7267c8339489a6 | |
parent | 2da099e53d5c0a7597757bca5b53bbef5d449e8b (diff) |
Reorganize
-rw-r--r-- | Makefile | 4 | ||||
-rw-r--r-- | etc/assets/syntaxes.bin (renamed from assets/syntaxes.bin) | bin | 650615 -> 650615 bytes | |||
-rw-r--r-- | etc/assets/themes.bin (renamed from assets/themes.bin) | bin | 14983 -> 14983 bytes | |||
-rw-r--r-- | etc/ci/.gitattributes (renamed from ci/.gitattributes) | 0 | ||||
-rwxr-xr-x | etc/ci/before_deploy.sh (renamed from ci/before_deploy.sh) | 0 | ||||
-rwxr-xr-x | etc/ci/before_install.sh (renamed from ci/before_install.sh) | 0 | ||||
-rwxr-xr-x | etc/ci/script.sh (renamed from ci/script.sh) | 0 | ||||
-rw-r--r-- | etc/completion/completion.bash (renamed from completion/completion.bash) | 0 | ||||
-rw-r--r-- | etc/completion/completion.zsh (renamed from completion/completion.zsh) | 0 | ||||
-rwxr-xr-x | etc/diagnostics (renamed from tests/diagnostics) | 0 | ||||
-rwxr-xr-x | etc/examples/119-within-line-edits (renamed from tests/examples/119-within-line-edits) | 0 | ||||
-rwxr-xr-x | etc/examples/121-unrecognized-content-before-diff-1 (renamed from tests/examples/121-unrecognized-content-before-diff-1) | 0 | ||||
-rwxr-xr-x | etc/examples/121-unrecognized-content-before-diff-2 (renamed from tests/examples/121-unrecognized-content-before-diff-2) | 0 | ||||
-rw-r--r-- | etc/examples/125-merge-conflict-1.diff (renamed from tests/examples/125-merge-conflict-1.diff) | 0 | ||||
-rw-r--r-- | etc/examples/125-merge-conflict-2.diff (renamed from tests/examples/125-merge-conflict-2.diff) | 0 | ||||
-rwxr-xr-x | etc/examples/127-paths-with-spaces--added (renamed from tests/examples/127-paths-with-spaces--added) | 0 | ||||
-rwxr-xr-x | etc/examples/127-paths-with-spaces--renamed (renamed from tests/examples/127-paths-with-spaces--renamed) | 0 | ||||
-rwxr-xr-x | etc/examples/128-empty-file (renamed from tests/examples/128-empty-file) | 0 | ||||
-rw-r--r-- | etc/examples/139-file-with-space-delimited-dash.diff (renamed from tests/examples/139-file-with-space-delimited-dash.diff) | 0 | ||||
-rwxr-xr-x | etc/examples/140-within-line-edits (renamed from tests/examples/140-within-line-edits) | 0 | ||||
-rwxr-xr-x | etc/examples/140-within-line-edits-counter-example (renamed from tests/examples/140-within-line-edits-counter-example) | 0 | ||||
-rw-r--r-- | etc/examples/205-highlight-bug-1.diff (renamed from tests/examples/205-highlight-bug-1.diff) | 0 | ||||
-rw-r--r-- | etc/examples/205-highlight-bug-2.diff (renamed from tests/examples/205-highlight-bug-2.diff) | 0 | ||||
-rw-r--r-- | etc/examples/205-highlight-bug.diff (renamed from tests/examples/205-highlight-bug.diff) | 0 | ||||
-rw-r--r-- | etc/examples/55-unicode-width.diff (renamed from tests/examples/55-unicode-width.diff) | 0 | ||||
-rwxr-xr-x | etc/examples/56-unified-directory-diff (renamed from tests/examples/56-unified-directory-diff) | 0 | ||||
-rwxr-xr-x | etc/examples/60-submodule (renamed from tests/examples/60-submodule) | 0 | ||||
-rw-r--r-- | etc/examples/72-color-moved.diff (renamed from tests/examples/72-color-moved.diff) | 0 | ||||
-rwxr-xr-x | etc/examples/93-binary (renamed from tests/examples/93-binary) | 0 | ||||
-rw-r--r-- | etc/performance/README.md (renamed from performance/README.md) | 0 | ||||
-rw-r--r-- | etc/performance/all-benchmarks.json | 26652 | ||||
-rw-r--r-- | etc/performance/chronologer.yaml (renamed from performance/chronologer.yaml) | 0 | ||||
-rw-r--r-- | etc/performance/data/hyperfine-output.json (renamed from performance/data/hyperfine-output.json) | 0 | ||||
-rw-r--r-- | etc/performance/data/hyperfine-processed-output.json (renamed from performance/data/hyperfine-processed-output.json) | 0 | ||||
-rw-r--r-- | etc/performance/index.html | 26720 | ||||
-rw-r--r-- | etc/performance/visualization.svg (renamed from performance/visualization.svg) | 0 | ||||
-rw-r--r-- | etc/release.Makefile (renamed from release.Makefile) | 0 | ||||
-rw-r--r-- | src/bat/.travis.yml | 6 | ||||
-rw-r--r-- | src/bat/assets.rs | 4 |
39 files changed, 53379 insertions, 7 deletions
@@ -37,9 +37,9 @@ benchmark: build # https://github.com/brendangregg/FlameGraph flamegraph: build $(BENCHMARK_COMMAND) | target/release/delta > /dev/null & - sample delta | stackcollapse-sample | flamegraph > performance/flamegraph.svg + sample delta | stackcollapse-sample | flamegraph > etc/performance/flamegraph.svg chronologer: - chronologer performance/chronologer.yaml + chronologer etc/performance/chronologer.yaml .PHONY: build format lint test unit-test end-to-end-test release version hash benchmark chronologer diff --git a/assets/syntaxes.bin b/etc/assets/syntaxes.bin Binary files differindex 2b12fad9..2b12fad9 100644 --- a/assets/syntaxes.bin +++ b/etc/assets/syntaxes.bin diff --git a/assets/themes.bin b/etc/assets/themes.bin Binary files differindex 9de98391..9de98391 100644 --- a/assets/themes.bin +++ b/etc/assets/themes.bin diff --git a/ci/.gitattributes b/etc/ci/.gitattributes index 36eaad9f..36eaad9f 100644 --- a/ci/.gitattributes +++ b/etc/ci/.gitattributes diff --git a/ci/before_deploy.sh b/etc/ci/before_deploy.sh index c79b8c69..c79b8c69 100755 --- a/ci/before_deploy.sh +++ b/etc/ci/before_deploy.sh diff --git a/ci/before_install.sh b/etc/ci/before_install.sh index 9acf6025..9acf6025 100755 --- a/ci/before_install.sh +++ b/etc/ci/before_install.sh diff --git a/ci/script.sh b/etc/ci/script.sh index e6e505ad..e6e505ad 100755 --- a/ci/script.sh +++ b/etc/ci/script.sh diff --git a/completion/completion.bash b/etc/completion/completion.bash index 9bb27207..9bb27207 100644 --- a/completion/completion.bash +++ b/etc/completion/completion.bash diff --git a/completion/completion.zsh b/etc/completion/completion.zsh index 0ff59208..0ff59208 100644 --- a/completion/completion.zsh +++ b/etc/completion/completion.zsh diff --git a/tests/diagnostics b/etc/diagnostics index 82a2f2b0..82a2f2b0 100755 --- a/tests/diagnostics +++ b/etc/diagnostics diff --git a/tests/examples/119-within-line-edits b/etc/examples/119-within-line-edits index 1bea9c0b..1bea9c0b 100755 --- a/tests/examples/119-within-line-edits +++ b/etc/examples/119-within-line-edits diff --git a/tests/examples/121-unrecognized-content-before-diff-1 b/etc/examples/121-unrecognized-content-before-diff-1 index c02c361e..c02c361e 100755 --- a/tests/examples/121-unrecognized-content-before-diff-1 +++ b/etc/examples/121-unrecognized-content-before-diff-1 diff --git a/tests/examples/121-unrecognized-content-before-diff-2 b/etc/examples/121-unrecognized-content-before-diff-2 index 2d09108d..2d09108d 100755 --- a/tests/examples/121-unrecognized-content-before-diff-2 +++ b/etc/examples/121-unrecognized-content-before-diff-2 diff --git a/tests/examples/125-merge-conflict-1.diff b/etc/examples/125-merge-conflict-1.diff index a13b761b..a13b761b 100644 --- a/tests/examples/125-merge-conflict-1.diff +++ b/etc/examples/125-merge-conflict-1.diff diff --git a/tests/examples/125-merge-conflict-2.diff b/etc/examples/125-merge-conflict-2.diff index 3fd66fac..3fd66fac 100644 --- a/tests/examples/125-merge-conflict-2.diff +++ b/etc/examples/125-merge-conflict-2.diff diff --git a/tests/examples/127-paths-with-spaces--added b/etc/examples/127-paths-with-spaces--added index 3a5096c2..3a5096c2 100755 --- a/tests/examples/127-paths-with-spaces--added +++ b/etc/examples/127-paths-with-spaces--added diff --git a/tests/examples/127-paths-with-spaces--renamed b/etc/examples/127-paths-with-spaces--renamed index 740ce6e0..740ce6e0 100755 --- a/tests/examples/127-paths-with-spaces--renamed +++ b/etc/examples/127-paths-with-spaces--renamed diff --git a/tests/examples/128-empty-file b/etc/examples/128-empty-file index a52bdb0c..a52bdb0c 100755 --- a/tests/examples/128-empty-file +++ b/etc/examples/128-empty-file diff --git a/tests/examples/139-file-with-space-delimited-dash.diff b/etc/examples/139-file-with-space-delimited-dash.diff index 58963b0a..58963b0a 100644 --- a/tests/examples/139-file-with-space-delimited-dash.diff +++ b/etc/examples/139-file-with-space-delimited-dash.diff diff --git a/tests/examples/140-within-line-edits b/etc/examples/140-within-line-edits index d2595518..d2595518 100755 --- a/tests/examples/140-within-line-edits +++ b/etc/examples/140-within-line-edits diff --git a/tests/examples/140-within-line-edits-counter-example b/etc/examples/140-within-line-edits-counter-example index b8913e90..b8913e90 100755 --- a/tests/examples/140-within-line-edits-counter-example +++ b/etc/examples/140-within-line-edits-counter-example diff --git a/tests/examples/205-highlight-bug-1.diff b/etc/examples/205-highlight-bug-1.diff index 2d0c38f1..2d0c38f1 100644 --- a/tests/examples/205-highlight-bug-1.diff +++ b/etc/examples/205-highlight-bug-1.diff diff --git a/tests/examples/205-highlight-bug-2.diff b/etc/examples/205-highlight-bug-2.diff index 1c62a7b8..1c62a7b8 100644 --- a/tests/examples/205-highlight-bug-2.diff +++ b/etc/examples/205-highlight-bug-2.diff diff --git a/tests/examples/205-highlight-bug.diff b/etc/examples/205-highlight-bug.diff index b79a48cb..b79a48cb 100644 --- a/tests/examples/205-highlight-bug.diff +++ b/etc/examples/205-highlight-bug.diff diff --git a/tests/examples/55-unicode-width.diff b/etc/examples/55-unicode-width.diff index 4e2b1c82..4e2b1c82 100644 --- a/tests/examples/55-unicode-width.diff +++ b/etc/examples/55-unicode-width.diff diff --git a/tests/examples/56-unified-directory-diff b/etc/examples/56-unified-directory-diff index 650ed20d..650ed20d 100755 --- a/tests/examples/56-unified-directory-diff +++ b/etc/examples/56-unified-directory-diff diff --git a/tests/examples/60-submodule b/etc/examples/60-submodule index c7830db5..c7830db5 100755 --- a/tests/examples/60-submodule +++ b/etc/examples/60-submodule diff --git a/tests/examples/72-color-moved.diff b/etc/examples/72-color-moved.diff index eb1f7c37..eb1f7c37 100644 --- a/tests/examples/72-color-moved.diff +++ b/etc/examples/72-color-moved.diff diff --git a/tests/examples/93-binary b/etc/examples/93-binary index 447ccdf6..447ccdf6 100755 --- a/tests/examples/93-binary +++ b/etc/examples/93-binary diff --git a/performance/README.md b/etc/performance/README.md index e8c12a8f..e8c12a8f 100644 --- a/performance/README.md +++ b/etc/performance/README.md diff --git a/etc/performance/all-benchmarks.json b/etc/performance/all-benchmarks.json new file mode 100644 index 00000000..f86240e7 --- /dev/null +++ b/etc/performance/all-benchmarks.json @@ -0,0 +1,26652 @@ +[ + { + "command": "/tmp/chronologer/delta/executables/5a4361fa037090adf729ab3f161832d969abc576 < /tmp/chronologer/delta/input.gitdiff > /dev/null", + "commit": "1561325305-5a4361fa037090adf729ab3f161832d969abc576", + "max": 0.013288195465, + "mean": 0.006001176865, + "median": 0.004928057465000001, + "message": "cargo new delta\n", + "min": 0.003220796465, + "stddev": 0.004157057519168492, + "system": 0.0016010150000000001, + "time": 0.013288195465, + "user": 0.0013687749999999996 + }, + { + "command": "/tmp/chronologer/delta/executables/5a4361fa037090adf729ab3f161832d969abc576 < /tmp/chronologer/delta/input.gitdiff > /dev/null", + "commit": "1561325305-5a4361fa037090adf729ab3f161832d969abc576", + "max": 0.013288195465, + "mean": 0.006001176865, + "median": 0.004928057465000001, + "message": "cargo new delta\n", + "min": 0.003220796465, + "stddev": 0.004157057519168492, + "system": 0.0016010150000000001, + "time": 0.0050741144650000005, + "user": 0.0013687749999999996 + }, + { + "command": "/tmp/chronologer/delta/executables/5a4361fa037090adf729ab3f161832d969abc576 < /tmp/chronologer/delta/input.gitdiff > /dev/null", + "commit": "1561325305-5a4361fa037090adf729ab3f161832d969abc576", + "max": 0.013288195465, + "mean": 0.006001176865, + "median": 0.004928057465000001, + "message": "cargo new delta\n", + "min": 0.003220796465, + "stddev": 0.004157057519168492, + "system": 0.0016010150000000001, + "time": 0.003494720465, + "user": 0.0013687749999999996 + }, + { + "command": "/tmp/chronologer/delta/executables/5a4361fa037090adf729ab3f161832d969abc576 < /tmp/chronologer/delta/input.gitdiff > /dev/null", + "commit": "1561325305-5a4361fa037090adf729ab3f161832d969abc576", + "max": 0.013288195465, + "mean": 0.006001176865, + "median": 0.004928057465000001, + "message": "cargo new delta\n", + "min": 0.003220796465, + "stddev": 0.004157057519168492, + "system": 0.0016010150000000001, + "time": 0.003220796465, + "user": 0.0013687749999999996 + }, + { + "command": "/tmp/chronologer/delta/executables/5a4361fa037090adf729ab3f161832d969abc576 < /tmp/chronologer/delta/input.gitdiff > /dev/null", + "commit": "1561325305-5a4361fa037090adf729ab3f161832d969abc576", + "max": 0.013288195465, + "mean": 0.006001176865, + "median": 0.004928057465000001, + "message": "cargo new delta\n", + "min": 0.003220796465, + "stddev": 0.004157057519168492, + "system": 0.0016010150000000001, + "time": 0.004928057465000001, + "user": 0.0013687749999999996 + }, + { + "command": "/tmp/chronologer/delta/executables/4404c17c22e593db5758884e26327309c4ccb219 < /tmp/chronologer/delta/input.gitdiff > /dev/null", + "commit": "1561327607-4404c17c22e593db5758884e26327309c4ccb219", + "max": 0.007402604130000001, + "mean": 0.005181866930000002, + "median": 0.003981811130000001, + "message": "Read from stdin, write to stdout\n", + "min": 0.003600826130000001, + "stddev": 0.001971755776176325, + "system": 0.0016420699999999996, + "time": 0.007267979130000002, + "user": 0.001356285 + }, + { + "command": "/tmp/chronologer/delta/executables/4404c17c22e593db5758884e26327309c4ccb219 < /tmp/chronologer/delta/input.gitdiff > /dev/null", + "commit": "1561327607-4404c17c22e593db5758884e26327309c4ccb219", + "max": 0.007402604130000001, + "mean": 0.005181866930000002, + "median": 0.003981811130000001, + "message": "Read from stdin, write to stdout\n", + "min": 0.003600826130000001, + "stddev": 0.001971755776176325, + "system": 0.0016420699999999996, + "time": 0.003981811130000001, + "user": 0.001356285 + }, + { + "command": "/tmp/chronologer/delta/executables/4404c17c22e593db5758884e26327309c4ccb219 < /tmp/chronologer/delta/input.gitdiff > /dev/null", + "commit": "1561327607-4404c17c22e593db5758884e26327309c4ccb219", + "max": 0.007402604130000001, + "mean": 0.005181866930000002, + "median": 0.003981811130000001, + "message": "Read from stdin, write to stdout\n", + "min": 0.003600826130000001, + "stddev": 0.001971755776176325, + "system": 0.0016420699999999996, + "time": 0.003600826130000001, + "user": 0.001356285 + }, + { + "command": "/tmp/chronologer/delta/executables/4404c17c22e593db5758884e26327309c4ccb219 < /tmp/chronologer/delta/input.gitdiff > /dev/null", + "commit": "1561327607-4404c17c22e593db5758884e26327309c4ccb219", + "max": 0.007402604130000001, + "mean": 0.005181866930000002, + "median": 0.003981811130000001, + "message": "Read from stdin, write to stdout\n", + "min": 0.003600826130000001, + "stddev": 0.001971755776176325, + "system": 0.0016420699999999996, + "time": 0.0036561141300000006, + "user": 0.001356285 + }, + { + "command": "/tmp/chronologer/delta/executables/4404c17c22e593db5758884e26327309c4ccb219 < /tmp/chronologer/delta/input.gitdiff > /dev/null", + "commit": "1561327607-4404c17c22e593db5758884e26327309c4ccb219", + "max": 0.007402604130000001, + "mean": 0.005181866930000002, + "median": 0.003981811130000001, + "message": "Read from stdin, write to stdout\n", + "min": 0.003600826130000001, + "stddev": 0.001971755776176325, + "system": 0.0016420699999999996, + "time": 0.007402604130000001, + "user": 0.001356285 + }, + { + "command": "/tmp/chronologer/delta/executables/044913f0bcd319b51733c9f6f91788d72314d40a < /tmp/chronologer/delta/input.gitdiff > /dev/null", + "commit": "1561557541-044913f0bcd319b51733c9f6f91788d72314d40a", + "max": 1.231345354705, + "mean": 1.200578412105, + "median": 1.196810656705, + "message": "Don't output +/- at beginning of diff lines\n", + "min": 1.183300461705, + "stddev": 0.01951776441841003, + "system": 0.013284755, + "time": 1.231345354705, + "user": 1.1792355799999998 + }, + { + "command": "/tmp/chronologer/delta/executables/044913f0bcd319b51733c9f6f91788d72314d40a < /tmp/chronologer/delta/input.gitdiff > /dev/null", + "commit": "1561557541-044913f0bcd319b51733c9f6f91788d72314d40a", + "max": 1.231345354705, + "mean": 1.200578412105, + "median": 1.196810656705, + "message": "Don't output +/- at beginning of diff lines\n", + "min": 1.183300461705, + "stddev": 0.01951776441841003, + "system": 0.013284755, + "time": 1.183300461705, + "user": 1.1792355799999998 + }, + { + "command": "/tmp/chronologer/delta/executables/044913f0bcd319b51733c9f6f91788d72314d40a < /tmp/chronologer/delta/input.gitdiff > /dev/null", + "commit": "1561557541-044913f0bcd319b51733c9f6f91788d72314d40a", + "max": 1.231345354705, + "mean": 1.200578412105, + "median": 1.196810656705, + "message": "Don't output +/- at beginning of diff lines\n", + "min": 1.183300461705, + "stddev": 0.01951776441841003, + "system": 0.013284755, + "time": 1.185296829705, + "user": 1.1792355799999998 + }, + { + "command": "/tmp/chronologer/delta/executables/044913f0bcd319b51733c9f6f91788d72314d40a < /tmp/chronologer/delta/input.gitdiff > /dev/null", + "commit": "1561557541-044913f0bcd319b51733c9f6f91788d72314d40a", + "max": 1.231345354705, + "mean": 1.200578412105, + "median": 1.196810656705, + "message": "Don't output +/- at beginning of diff lines\n", + "min": 1.183300461705, + "stddev": 0.01951776441841003, + "system": 0.013284755, + "time": 1.196810656705, + "user": 1.1792355799999998 + }, + { + "command": "/tmp/chronologer/delta/executables/044913f0bcd319b51733c9f6f91788d72314d40a < /tmp/chronologer/delta/input.gitdiff > /dev/null", + "commit": "1561557541-044913f0bcd319b51733c9f6f91788d72314d40a", + "max": 1.231345354705, + "mean": 1.200578412105, + "median": 1.196810656705, + "message": "Don't output +/- at beginning of diff lines\n", + "min": 1.183300461705, + "stddev": 0.01951776441841003, + "system": 0.013284755, + "time": 1.206138757705, + "user": 1.1792355799999998 + }, + { + "command": "/tmp/chronologer/delta/executables/0cabaa4b4a3d55857fa3cda445ad066b8dac5d1c < /tmp/chronologer/delta/input.gitdiff > /dev/null", + "commit": "1561557541-0cabaa4b4a3d55857fa3cda445ad066b8dac5d1c", + "max": 1.3078658624650001, + "mean": 1.283300375665, + "median": 1.282167388465, + "message": "Revert \"Only output color if stdout is a tty\"\n\nThis reverts commit e0e2d5fb1ea52294afb0d7ed4ab59752b13b3c41.\n\nPipe to ansifilter if this is needed\n", + "min": 1.2680449394650002, + "stddev": 0.01586539302076975, + "system": 0.013374965000000003, + "time": 1.3078658624650001, + "user": 1.2625939699999997 + }, + { + "command": "/tmp/chronologer/delta/executables/0cabaa4b4a3d55857fa3cda445ad066b8dac5d1c < /tmp/chronologer/delta/input.gitdiff > /dev/null", + "commit": "1561557541-0cabaa4b4a3d55857fa3cda445ad066b8dac5d1c", + "max": 1.3078658624650001, + "mean": 1.283300375665, + "median": 1.282167388465, + "message": "Revert \"Only output color if stdout is a tty\"\n\nThis reverts commit e0e2d5fb1ea52294afb0d7ed4ab59752b13b3c41.\n\nPipe to ansifilter if this is needed\n", + "min": 1.2680449394650002, + "stddev": 0.01586539302076975, + "system": 0.013374965000000003, + "time": 1.270967589465, + "user": 1.2625939699999997 + }, + { + "command": "/tmp/chronologer/delta/executables/0cabaa4b4a3d55857fa3cda445ad066b8dac5d1c < /tmp/chronologer/delta/input.gitdiff > /dev/null", + "commit": "1561557541-0cabaa4b4a3d55857fa3cda445ad066b8dac5d1c", + "max": 1.3078658624650001, + "mean": 1.283300375665, + "median": 1.282167388465, + "message": "Revert \"Only output color if stdout is a tty\"\n\nThis reverts commit e0e2d5fb1ea52294afb0d7ed4ab59752b13b3c41.\n\nPipe to ansifilter if this is needed\n", + "min": 1.2680449394650002, |