diff options
Diffstat (limited to 'etc')
25 files changed, 25 insertions, 2486 deletions
diff --git a/etc/assets/syntaxes.bin b/etc/assets/syntaxes.bin Binary files differnew file mode 100644 index 00000000..a69ec6fe --- /dev/null +++ b/etc/assets/syntaxes.bin diff --git a/etc/assets/themes.bin b/etc/assets/themes.bin Binary files differnew file mode 100644 index 00000000..b8683424 --- /dev/null +++ b/etc/assets/themes.bin diff --git a/etc/bin/diagnostics b/etc/bin/diagnostics index 89a446db..0b4d47cc 100755 --- a/etc/bin/diagnostics +++ b/etc/bin/diagnostics @@ -3,7 +3,7 @@ commands=( "delta --version" "less --version | head -n1" - "env | grep -iE '(less|pager|bat|delta)'" + "env | grep -E '(less|pager|bat)'" "printf '\e[34m\e[43mtext\e[m\n'" "printf '\e[38;5;19m\e[48;5;226mtext\e[m\n'" "printf '\e[38;2;0;0;255m\e[48;2;255;255;0mtext\e[m\n'" diff --git a/etc/ci/before_deploy.sh b/etc/ci/before_deploy.sh index b80b3397..8e188ed3 100755 --- a/etc/ci/before_deploy.sh +++ b/etc/ci/before_deploy.sh @@ -156,13 +156,14 @@ Priority: optional Maintainer: Dan Davison <dandavison7@gmail.com> Architecture: $architecture Depends: $depends +Provides: $PROJECT_NAME Conflicts: $conflictname -Description: Syntax highlighter for git +Description: Syntax highlighter for git. Delta provides language syntax-highlighting, within-line insertion/deletion detection, and restructured diff output for git on the command line. EOF - fakeroot dpkg-deb -Zxz --build "$tempdir" "${dpkgname}_${version}_${architecture}.deb" + fakeroot dpkg-deb --build "$tempdir" "${dpkgname}_${version}_${architecture}.deb" } diff --git a/etc/completion/completion.bash b/etc/completion/completion.bash index 03557fbe..9bb27207 100644 --- a/etc/completion/completion.bash +++ b/etc/completion/completion.bash @@ -66,4 +66,4 @@ _delta() { eval "$__delta_previous_extglob_setting" unset __delta_previous_extglob_setting -complete -F _delta -A file delta +complete -F _delta delta diff --git a/etc/completion/completion.fish b/etc/completion/completion.fish deleted file mode 100644 index 7bea07ed..00000000 --- a/etc/completion/completion.fish +++ /dev/null @@ -1,99 +0,0 @@ -complete -c delta -l blame-code-style -x -d "Style string for the code section of a git blame line" -complete -c delta -l blame-format -x -d "Format string for git blame commit metadata" -complete -c delta -l blame-palette -x -d "Background colors used for git blame lines" -complete -c delta -l blame-separator-format -x -d "Separator between the blame format and the code section of a git blame line" -complete -c delta -l blame-separator-style -x -d "Style string for the blame-separator-format" -complete -c delta -l blame-timestamp-format -x -d "Format of git blame timestamp in raw git output received by delta" -complete -c delta -l color-only -d "Do not alter the input structurally in any way" -complete -c delta -l commit-decoration-style -x -d "Style string for the commit hash decoration" -complete -c delta -l commit-regex -x -d "Regular expression used to identify the commit line when parsing git output" -complete -c delta -l commit-style -x -d "Style string for the commit hash line" -complete -c delta -l dark -d "Use default colors appropriate for a dark terminal background" -complete -c delta -l default-language -x -d "Default language used for syntax highlighting" -complete -c delta -l diff-highlight -d "Emulate diff-highlight" -complete -c delta -l diff-so-fancy -d "Emulate diff-so-fancy" -complete -c delta -l diff-stat-align-width -x -d "Width allocated for file paths in a diff stat section" -complete -c delta -l features -x -d "Names of delta features to activate" -complete -c delta -l file-added-label -x -d "Text to display before an added file path" -complete -c delta -l file-copied-label -x -d "Text to display before a copied file path" -complete -c delta -l file-decoration-style -x -d "Style string for the file decoration" -complete -c delta -l file-modified-label -x -d "Text to display before a modified file path" -complete -c delta -l file-removed-label -x -d "Text to display before a removed file path" -complete -c delta -l file-renamed-label -x -d "Text to display before a renamed file path" -complete -c delta -l file-style -x -d "Style string for the file section" -complete -c delta -l file-transformation -x -d "Sed-style command transforming file paths for display" -complete -c delta -l grep-context-line-style -x -d "Style string for non-matching lines of grep output" -complete -c delta -l grep-file-style -x -d "Style string for file paths in grep output" -complete -c delta -l grep-line-number-style -x -d "Style string for line numbers in grep output" -complete -c delta -l grep-match-line-style -x -d "Style string for matching lines of grep output" -complete -c delta -l grep-match-word-style -x -d "Style string for the matching substrings within a matching line of grep output" -complete -c delta -l grep-separator-symbol -x -d "Separator symbol printed after the file path and line number in grep output" -complete -c delta -l hunk-header-decoration-style -x -d "Style string for the hunk-header decoration" -complete -c delta -l hunk-header-file-style -x -d "Style string for the file path part of the hunk-header" -complete -c delta -l hunk-header-line-number-style -x -d "Style string for the line number part of the hunk-header" -complete -c delta -l hunk-header-style -x -d "Style string for the hunk-header" -complete -c delta -l hunk-label -x -d "Text to display before a hunk header" -complete -c delta -l hyperlinks -d "Render commit hashes, file names, and line numbers as hyperlinks" -complete -c delta -l hyperlinks-commit-link-format -x -d "Format string for commit hyperlinks" -complete -c delta -l hyperlinks-file-link-format -x -d "Format string for file hyperlinks" -complete -c delta -l inline-hint-style -x -d "Style string for short inline hint text" -complete -c delta -l inspect-raw-lines -xa "true false" -d "Kill-switch for --color-moved support" -complete -c delta -l keep-plus-minus-markers -d "Prefix added/removed lines with a +/- character" -complete -c delta -l light -d "Use default colors appropriate for a light terminal background" -complete -c delta -l line-buffer-size -x -d "Size of internal line buffer" -complete -c delta -l line-fill-method -xa "ansi spaces" -d "Line-fill method in side-by-side mode" -complete -c delta -l line-numbers -s n -d "Display line numbers next to the diff" -complete -c delta -l line-numbers-left-format -x -d "Format string for the left column of line numbers" -complete -c delta -l line-numbers-left-style -x -d "Style string for the left column of line numbers" -complete -c delta -l line-numbers-minus-style -x -d "Style string for line numbers in the old (minus) version of the file" -complete -c delta -l line-numbers-plus-style -x -d "Style string for line numbers in the new (plus) version of the file" -complete -c delta -l line-numbers-right-format -x -d "Format string for the right column of line numbers" -complete -c delta -l line-numbers-right-style -x -d "Style string for the right column of line numbers" -complete -c delta -l line-numbers-zero-style -x -d "Style string for line numbers in unchanged (zero) lines" -complete -c delta -l list-languages -d "List supported languages and associated file extensions" -complete -c delta -l list-syntax-themes -d "List available syntax-highlighting color themes" -complete -c delta -l map-styles -x -d "Map styles encountered in raw input to desired output styles" -complete -c delta -l max-line-distance -x -d "Maximum line pair distance parameter in within-line diff algorithm" -complete -c delta -l max-line-length -x -d "Truncate lines longer than this" -complete -c delta -l merge-conflict-begin-symbol -x -d "String marking the beginning of a merge conflict region" -complete -c delta -l merge-conflict-end-symbol -x -d "String marking the end of a merge conflict region" -complete -c delta -l merge-conflict-ours-diff-header-decoration-style -x -d "Style string for the decoration of the header above the 'ours' merge conflict diff" -complete -c delta -l merge-conflict-ours-diff-header-style -x -d "Style string for the header above the 'ours' branch merge conflict diff" -complete -c delta -l merge-conflict-theirs-diff-header-decoration-style -x -d "Style string for the decoration of the header above the 'theirs' merge conflict diff" -complete -c delta -l merge-conflict-theirs-diff-header-style -x -d "Style string for the header above the 'theirs' branch merge conflict diff" -complete -c delta -l minus-empty-line-marker-style -x -d "Style string for removed empty line marker" -complete -c delta -l minus-emph-style -x -d "Style string for emphasized sections of removed lines" -complete -c delta -l minus-non-emph-style -x -d "Style string for non-emphasized sections of removed lines that have an emphasized section" -complete -c delta -l minus-style -x -d "Style string for removed lines" -complete -c delta -l navigate -d "Activate diff navigation" -complete -c delta -l navigate-regex -x -d "Regular expression defining navigation stop points" -complete -c delta -l no-gitconfig -d "Do not read any settings from git config" -complete -c delta -l pager -x -d "Which pager to use" -complete -c delta -l paging -xa "auto always never" -d "Whether to use a pager when displaying output" -complete -c delta -l parse-ansi -d "Display ANSI color escape sequences in human-readable form" -complete -c delta -l plus-emph-style -x -d "Style string for emphasized sections of added lines" -complete -c delta -l plus-empty-line-marker-style -x -d "Style string for added empty line marker" -complete -c delta -l plus-non-emph-style -x -d "Style string for non-emphasized sections of added lines that have an emphasized section" -complete -c delta -l plus-style -x -d "Style string for added lines" -complete -c delta -l raw -d "Do not alter the input in any way" -complete -c delta -l relative-paths -d "Output all file paths relative to the current directory" -complete -c delta -l right-arrow -x -d "Text to display with a changed file path" -complete -c delta -l show-colors -d "Show available named colors" -complete -c delta -l show-config -d "Display the active values for all Delta options" -complete -c delta -l show-syntax-themes -d "Show example diff for available syntax-highlighting themes" -complete -c delta -l show-themes -d "Show example diff for available delta themes" -complete -c delta -l side-by-side -s s -d "Display diffs in side-by-side layout" -complete -c delta -l syntax-theme -xa "(delta --list-syntax-themes | cut -f 2)" -d "The syntax-highlighting theme to use" -complete -c delta -l tabs -x -d "The number of spaces to replace tab characters with" -complete -c delta -l true-color -xa "auto always never" -d "Whether to emit 24-bit RGB color codes" -complete -c delta -l whitespace-error-style -x -d "Style string for whitespace errors" -complete -c delta -l width -s w -x -d "The width of underline/overline decorations" -complete -c delta -l word-diff-regex -x -d "Regular expression defining a 'word' in within-line diff algorithm" -complete -c delta -l wrap-left-symbol -x -d "End-of-line wrapped content symbol" -complete -c delta -l wrap-max-lines -x -d "How often a line should be wrapped if it does not fit" -complete -c delta -l wrap-right-percent -x -d "Threshold for right-aligning wrapped content" -complete -c delta -l wrap-right-prefix-symbol -x -d "Pre-wrapped content symbol" -complete -c delta -l wrap-right-symbol -x -d "End-of-line wrapped content symbol" -complete -c delta -l zero-style -x -d "Style string for unchanged lines" -complete -c delta -l help -s h -d "Print help information" -complete -c delta -l version -s V -d "Print version information" diff --git a/etc/docker/Makefile b/etc/docker/Makefile deleted file mode 100644 index dc555591..00000000 --- a/etc/docker/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -.PHONY: delta-ubuntu -delta-ubuntu: - docker build -f ubuntu.Dockerfile -t delta-ubuntu . diff --git a/etc/docker/README.md b/etc/docker/README.md deleted file mode 100644 index 6bc008fe..00000000 --- a/etc/docker/README.md +++ /dev/null @@ -1 +0,0 @@ -The docker image built here is intended for investigating delta issues, for example when they are OS-dependent. diff --git a/etc/docker/delta-ubuntu b/etc/docker/delta-ubuntu deleted file mode 100755 index d2cd5fd1..00000000 --- a/etc/docker/delta-ubuntu +++ /dev/null @@ -1 +0,0 @@ -docker run -i delta-ubuntu delta $@
\ No newline at end of file diff --git a/etc/docker/ubuntu.Dockerfile b/etc/docker/ubuntu.Dockerfile deleted file mode 100644 index f3aa0785..00000000 --- a/etc/docker/ubuntu.Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -FROM ubuntu:latest - -RUN apt-get update && \ - apt-get install -y curl git less gcc - -RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y - -RUN git clone https://github.com/dandavison/delta.git -WORKDIR delta -RUN /root/.cargo/bin/cargo build --release - -ENV PATH="${PWD}/target/release:${PATH}" - -CMD delta diff --git a/etc/examples/189-merge-conflict.1.diff b/etc/examples/189-merge-conflict.1.diff deleted file mode 100644 index b9751de3..00000000 --- a/etc/examples/189-merge-conflict.1.diff +++ /dev/null @@ -1,38 +0,0 @@ -diff --cc src/handlers/merge_conflict.rs -index 8fc4116b,eb115dde..00000000 ---- a/src/handlers/merge_conflict.rs -+++ b/src/handlers/merge_conflict.rs -@@@ -88,8 -88,10 +88,20 @@@ fn paint_buffered_merge_conflict_lines - .map(|s| (s.to_string(), State::HunkMinus(None, None))) - .collect(); - for plus_lines in &[&lines[Ours], &lines[Theirs]] { -++<<<<<<< HEAD - + let plus_lines = plus_lines.iter().collect(); - + let a = 1; -++||||||| cf306705 -++ let plus_lines = plus_lines -++ .iter() -++ .map(|s| (s.to_string(), State::HunkMinus(None, None))) -++ .collect(); -++======= -+ let plus_lines = plus_lines -+ .iter() -+ .map(|s| (s.to_string(), State::HunkMinus(None, Some(7)))) -+ .collect(); -++>>>>>>> z-189-combined-diff-and-conflicts-merge-conflict-branch-2 - paint::paint_minus_and_plus_lines( - MinusPlus::new(&minus_lines, &plus_lines), - line_numbers_data, -@@@ -97,7 -99,7 +109,12 @@@ - output_buffer, - config, - ); -++<<<<<<< HEAD - + let b = 2; -++||||||| cf306705 -++======= -+ let b = 9; -++>>>>>>> z-189-combined-diff-and-conflicts-merge-conflict-branch-2 - output_buffer.push_str("\n\n"); - } - Ok(()) diff --git a/etc/examples/189-merge-conflict.2.diff b/etc/examples/189-merge-conflict.2.diff deleted file mode 100644 index 6a846a6f..00000000 --- a/etc/examples/189-merge-conflict.2.diff +++ /dev/null @@ -1,100 +0,0 @@ -[1mdiff --cc src/paint.rs[m -[1mindex 79b44db1,0f429d5c..00000000[m -[1m--- a/src/paint.rs[m -[1m+++ b/src/paint.rs[m -[36m@@@ -387,30 -457,36 +387,88 @@@[m [mimpl<'p> Painter<'p> [m - ) -> (Option<BgFillMethod>, Style) {[m - // style: for right fill if line contains no emph sections[m - // non_emph_style: for right fill if line contains emph sections[m -[32m++<<<<<<< HEAD[m -[32m + let (style, non_emph_style) = match state {[m -[32m + State::HunkMinus(None) | State::HunkMinusWrapped => {[m -[32m + (config.minus_style, config.minus_non_emph_style)[m -[32m + }[m -[32m + State::HunkZero | State::HunkZeroWrapped => (config.zero_style, config.zero_style),[m -[32m + State::HunkPlus(None) | State::HunkPlusWrapped => {[m -[32m + (config.plus_style, config.plus_non_emph_style)[m -[32m + }[m -[32m + State::HunkMinus(Some(_)) | State::HunkPlus(Some(_)) => {[m -[32m + let style = if !diff_sections.is_empty() {[m -[32m + diff_sections[diff_sections.len() - 1].0[m -[32m++||||||| parent of 4d4b19ca (Always use non-emph style for right fill)[m -[32m++ let (style, non_emph_style) = match state {[m -[32m++ State::HunkMinus(None) | State::HunkMinusWrapped => {[m -[32m++ (config.minus_style, config.minus_non_emph_style)[m -[32m++ }[m -[32m++ State::HunkMinus(Some(raw_line)) => {[m -[32m++ // TODO: This is the second time we are parsing the ANSI sequences[m -[32m++ if let Some(ansi_term_style) = ansi::parse_first_style(raw_line) {[m -[32m++ let style = Style {[m -[32m++ ansi_term_style,[m -[32m++ ..Style::new()[m -[32m++ };[m -[32m++ (style, style)[m -[32m++ } else {[m -[32m++ (config.minus_style, config.minus_non_emph_style)[m -[32m++ }[m -[32m++ }[m -[32m++ State::HunkZero | State::HunkZeroWrapped => (config.zero_style, config.zero_style),[m -[32m++ State::HunkPlus(None) | State::HunkPlusWrapped => {[m -[32m++ (config.plus_style, config.plus_non_emph_style)[m -[32m++ }[m -[32m++ State::HunkPlus(Some(raw_line)) => {[m -[32m++ // TODO: This is the second time we are parsing the ANSI sequences[m -[32m++ if let Some(ansi_term_style) = ansi::parse_first_style(raw_line) {[m -[32m++ let style = Style {[m -[32m++ ansi_term_style,[m -[32m++ ..Style::new()[m -[32m++ };[m -[32m++ (style, style)[m -[32m++=======[m -[32m+ let non_emph_style = match state {[m -[32m+ State::HunkMinus(None) | State::HunkMinusWrapped => config.minus_non_emph_style,[m -[32m+ State::HunkMinus(Some(raw_line)) => {[m -[32m+ // TODO: This is the second time we are parsing the ANSI sequences[m -[32m+ if let Some(ansi_term_style) = ansi::parse_first_style(raw_line) {[m -[32m+ Style {[m -[32m+ ansi_term_style,[m -[32m+ ..Style::new()[m -[32m+ }[m -[32m+ } else {[m -[32m+ config.minus_non_emph_style[m -[32m+ }[m -[32m+ }[m -[32m+ State::HunkZero | State::HunkZeroWrapped => config.zero_style,[m -[32m+ State::HunkPlus(None) | State::HunkPlusWrapped => config.plus_non_emph_style,[m -[32m+ State::HunkPlus(Some(raw_line)) => {[m -[32m+ // TODO: This is the second time we are parsing the ANSI sequences[m -[32m+ if let Some(ansi_term_style) = ansi::parse_first_style(raw_line) {[m -[32m+ Style {[m -[32m+ ansi_term_style,[m -[32m+ ..Style::new()[m -[32m+ }[m -[32m++>>>>>>> 4d4b19ca (Always use non-emph style for right fill)[m - } else {[m -[32m++<<<<<<< HEAD[m -[32m + config.null_style[m -[32m + };[m -[32m + (style, style)[m -[32m++||||||| parent of 4d4b19ca (Always use non-emph style for right fill)[m -[32m++ (config.plus_style, config.plus_non_emph_style)[m -[32m++ }[m -[32m++=======[m -[32m+ config.plus_non_emph_style[m -[32m+ }[m -[32m++>>>>>>> 4d4b19ca (Always use non-emph style for right fill)[m - }[m -[31m- State::Blame(_, _) => (diff_sections[0].0, diff_sections[0].0),[m -[31m- _ => (config.null_style, config.null_style),[m -[31m- };[m -[31m- let fill_style = if style_sections_contain_more_than_one_style(diff_sections) {[m -[31m- non_emph_style // line contains an emph section[m -[31m- } else {[m -[31m- style[m -[32m+ State::Blame(_, _) => diff_sections[0].0,[m -[32m+ _ => config.null_style,[m - };[m -[32m+ let fill_style = non_emph_style;[m - [m - match ([m - fill_style.get_background_color().is_some(),[m diff --git a/etc/examples/189-merge-conflict.3.diff b/etc/examples/189-merge-conflict.3.diff deleted file mode 100644 index a9600510..00000000 --- a/etc/examples/189-merge-conflict.3.diff +++ /dev/null @@ -1,41 +0,0 @@ -diff --cc Makefile -index 759070d,3daf9eb..0000000 ---- a/Makefile -+++ b/Makefile -@@@ -4,13 -4,16 +4,37 @@@ build - lint: - cargo clippy - -++<<<<<<< Updated upstream - +test: unit-test end-to-end-test - + - +unit-test: - + cargo test - + - +end-to-end-test: build - + bash -c "diff -u <(git log -p) <(git log -p | target/release/delta --color-only | perl -pe 's/\e\[[0-9;]*m//g')" -++||||||| constructed merge base -++test: -++ cargo test -++ bash -c "diff -u <(git log -p) \ -++ <(git log -p | delta --width variable \ -++ --tabs 0 \ -++ --retain-plus-minus-markers \ -++ --commit-style plain \ -++ --file-style plain \ -++ --hunk-style plain \ -++ | ansifilter)" ++======= -+ test: -+ cargo test --release -+ bash -c "diff -u <(git log -p) \ -+ <(git log -p | target/release/delta --width variable \ -+ --tabs 0 \ -+ --retain-plus-minus-markers \ -+ --commit-style plain \ -+ --file-style plain \ -+ --hunk-style plain \ -+ | ansifilter)"> /dev/null -++>>>>>>> Stashed changes - - release: - @make -f release.Makefile release diff --git a/etc/examples/189-merge-conflict.4.diff b/etc/examples/189-merge-conflict.4.diff deleted file mode 100644 index d88ea2e2..00000000 --- a/etc/examples/189-merge-conflict.4.diff +++ /dev/null @@ -1,16 +0,0 @@ -diff --cc src/handlers/merge_conflict.rs -index 888eee8b,7ea2e9d3..00000000 ---- a/src/handlers/merge_conflict.rs -+++ b/src/handlers/merge_conflict.rs -@@@ -5,7 -5,7 +5,11 @@@ use crate::utils::process - impl<'a> StateMachine<'a> { - pub fn handle_merge_confict_line(&mut self) -> std::io::Result<bool> { - self.painter.emit()?; -++<<<<<<< HEAD - + // hello -++======= -+ // bye -++>>>>>>> b - let mut handled_line = false; - if matches!(self.state, State::Unknown) { - if let Some(process::CallingProcess::GitShow(_, extension)) = diff --git a/etc/examples/189-merge-conflict.5.diff b/etc/examples/189-merge-conflict.5.diff deleted file mode 100644 index 8e9ddab9..00000000 --- a/etc/examples/189-merge-conflict.5.diff +++ /dev/null @@ -1,17 +0,0 @@ -diff --cc src/handlers/merge_conflict.rs -index 888eee8b,7ea2e9d3..00000000 ---- a/src/handlers/merge_conflict.rs -+++ b/src/handlers/merge_conflict.rs -@@@ -5,7 -5,7 +5,12 @@@ use crate::utils::process - impl<'a> StateMachine<'a> { - pub fn handle_merge_confict_line(&mut self) -> std::io::Result<bool> { - self.painter.emit()?; -++<<<<<<< HEAD - + // hello -++||||||| e641341d -++======= -+ // bye -++>>>>>>> b - let mut handled_line = false; - if matches!(self.state, State::Unknown) { - if let Some(process::CallingProcess::GitShow(_, extension)) = diff --git a/etc/examples/308-side-by-side-tabs.diff b/etc/examples/308-side-by-side-tabs.diff deleted file mode 100644 index 5abb52ae..00000000 --- a/etc/examples/308-side-by-side-tabs.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff --git .config/git/config .config/git/config -index bc4ae2e..b058f99 100644 ---- .config/git/config -+++ .config/git/config -@@ -26,7 +21,6 @@ - # Show summary of changes to submodules. See also: - # https://git-scm.com/book/en/v2/Git-Tools-Submodules - submoduleSummary = true -- showStash = true - - [diff] - tool = vimdiff diff --git a/etc/examples/662-submodules b/etc/examples/662-submodules deleted file mode 100755 index 1f4a5189..00000000 --- a/etc/examples/662-submodules +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash -REPO_ROOT=/tmp/submodule-diff-example -REPO_DATE_FMT=%H:%M:%S.%N -mkdir ${REPO_ROOT} && git -C ${REPO_ROOT} init && cd ${REPO_ROOT} -date +${REPO_DATE_FMT} >> baserepo && git add baserepo && git commit -m "Base repo commit 1" - -for sub in A B C; do - git init submodule${sub} - for iter in $(seq 1 4); do - date +${REPO_DATE_FMT} >> submodule${sub}/subcontent - git -C submodule${sub} add subcontent && git -C submodule${sub} commit -m "Submodule ${sub} initial commit $iter" - done - # Add initial submodule, message of "Submodule submoduleX 0000000...xxxxxxx (new submodule)", no individual commits - git submodule add ../bogus-url-${sub} submodule${sub} && \ - git commit -m "Add submodule${sub}" # the diff handling for this is correct in delta - - # Create additional submodule commits - for iter in $(seq 1 2); do - date +${REPO_DATE_FMT} >> submodule${sub}/subcontent - git -C submodule${sub} add subcontent && git -C submodule${sub} commit -m "Submodule ${sub} extra change ${iter}" - done - git add submodule${sub} && git commit -m "Update submodule${sub}" -done - -git -C submoduleA reset --hard HEAD~4 -git -C submoduleC reset --hard HEAD~2 - -for sub in B C; do - for iter in $(seq 1 3); do - date +${REPO_DATE_FMT} >> submodule${sub}/subcontent - git -C submodule${sub} add subcontent && git -C submodule${sub} commit -m "Submodule ${sub} stage change ${iter}" - done -done - -# Add all submodule updates in single commit to test multiple submodule updates in single commit -git add submodule[A-C] && git commit -m "Update all submodules" - -# submoduleA end state is only removed commits -# submoduleB end state is only added commits -# submoduleC is a mixture of removed and added commits (e.g. different branch) - -# Manual, inspect superproject history via: -# "git -c diff.submodule=short log -p | delta --no-gitconfig" -# "git -c diff.submodule=log log -p | delta --no-gitconfig" -# "git -c diff.submodule=diff log -p | delta --no-gitconfig" diff --git a/etc/examples/72-color-moved-2.diff b/etc/examples/72-color-moved-2.diff deleted file mode 100644 index 69ddc5c8..00000000 --- a/etc/examples/72-color-moved-2.diff +++ /dev/null @@ -1,8 +0,0 @@ -[1mdiff --git a/file.py b/file.py[m -[1mindex f07db74..3cb162d 100644[m -[1m--- a/file.py[m -[1m+++ b/file.py[m -[36m@@ -1,2 +1,2 @@[m -[1;35m-class X: pass[m - class Y: pass[m -[1;36m+[m[1;36mclass X: pass[m diff --git a/etc/examples/72-color-moved-3.diff b/etc/examples/72-color-moved-3.diff deleted file mode 100644 index a24d447a..00000000 --- a/etc/examples/72-color-moved-3.diff +++ /dev/null @@ -1,14 +0,0 @@ -[33mcommit fffb6bf94087c432b6e2e29cab97bf1f8987c641[m -Author: Dan Davison <dandavison7@gmail.com> -Date: Tue Nov 23 14:51:46 2021 -0500 - - DEBUG - -[1mdiff --git a/src/config.rs b/src/config.rs[m -[1mindex efe6adb..9762222 100644[m -[1m--- a/src/config.rs[m -[1m+++ b/src/config.rs[m -[36m@@ -400,6 +400,7 @@[m [mfn make_blame_palette(blame_palette: Option<String>, is_light_mode: bool) -> Vec[m -[1;36m+[m[1;36mpub fn user_supplied_option(option: &str, arg_matches: &clap::ArgMatches) -> bool {[m -[36m@@ -416,29 +433,30 @@[m [mfn make_styles_map(opt: &cli::Opt) -> Option<HashMap<style::AnsiTermStyleEqualit[m -[1;35m-pub fn user_supplied_option(option: &str, arg_matches: &clap::ArgMatches) -> bool {[m diff --git a/etc/examples/72-color-moved-4.diff b/etc/examples/72-color-moved-4.diff deleted file mode 100644 index 9aa6fc6e..00000000 --- a/ |