dandavison/delta
1
1
Fork 0
mirror of https://github.com/dandavison/delta.git synced 2024-10-04 20:07:18 +03:00
Code Issues Projects Releases Wiki Activity
1,709 Commits 80 Branches 64 Tags 18 MiB
0b3aefb48c
Commit Graph

1709 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Davison
0b3aefb48c Disable last-resort process tree inspection 
See #824 in which some users are reporting very slow performance.

Fixes #824
 2021-12-07 21:40:42 -05:00
Thomas Otto
e5eea75eee Fixed some test clippys 
Note that currently `cargo clippy --tests` is not checked by the CI runs
 2021-12-07 19:18:23 -05:00
Thomas Otto
91b8c3066c Fix more side-by-side line number miscounts 2021-12-07 19:18:23 -05:00
Thomas Otto
d7ef078acb Add DeltaTest to speed up adding and fixing tests 
Using a syntax similar to the builder pattern:
  `DeltaTest::with([config options]).with_input(DIFF).expect(lines)`
plus `.explain_ansi()` to pretty-print ansi codes and `.inspect()` to
print the to-be-tested output.

Rewrite a few tests using it and add ansi tests for 
  --line-fill-method=<spaces|ansi>
 2021-12-07 19:18:23 -05:00
Thomas Otto
47b073d224 Move explain_ansi() part out of parse_ansi() 2021-12-07 19:18:23 -05:00
An Yu
7eb56b0997 Clarify hyperlinks field 2021-12-07 13:05:11 -05:00
Dan Davison
034e6c64a0 Add @nkouevda's pdiff to the Similar Projects list 2021-12-06 18:16:14 -05:00
Dan Davison
a34eab9368 Bump version in links to executables 2021-12-06 14:00:46 -05:00
Dan Davison
3bbf170482 Bump version 2021-12-06 12:00:14 -05:00
Dan Davison
5901af5028 Be permissive about unexpected state machine state 
Fixes #826
 2021-12-06 11:56:26 -05:00
Dan Davison
0acbc475d6 Add a link to ARCHITECTURE.md 2021-12-05 22:53:51 -05:00
Dan Davison
517e3d8cbc Update README 2021-12-05 22:47:58 -05:00
Dan Davison
c900b6ca62 Bump version in private Homebrew formula 2021-12-05 22:38:25 -05:00
Dan Davison
31b402a7ce Document merge conflict handling 2021-12-05 20:14:14 -05:00
Dan Davison
644e8089f7 README edits 2021-12-05 20:14:11 -05:00
Dan Davison
93ec465514 Bump version 2021-12-05 19:30:17 -05:00
Dan Davison
3ec9306182 Gracefully handle failure to parse hunk header 
Fixes #765
 2021-12-05 19:27:40 -05:00
Dan Davison
e7456d4e28 Failing test for #765 2021-12-05 19:27:40 -05:00
Dan Davison
6f5090b763 Do not truncate hunk header line 
Fixes #813
 2021-12-05 11:25:05 -05:00
Dan Davison
1f41d4f7cd Add test of parsing cthulhu commit hunk header 
Ref #813
 2021-12-05 11:25:05 -05:00
Dan Davison
975f4e867f Bug fix: fix panic in merge conflict diff -U0 2021-12-05 11:25:05 -05:00
Dan Davison
cfe900edbe Add InMergeConflict to combined diff enum variant 
This allows keep-plus-minus-markers=false to be honored inside merge
conflicts but not honored for combined diff regions outside merge
conflicts.
 2021-12-05 11:25:05 -05:00
Dan Davison
6745f42dda Display merge conflicts 2021-12-05 11:25:05 -05:00
Dan Davison
e7294060ef Example diffs 2021-12-05 11:25:05 -05:00
Dan Davison
006fcec271 Refactor: paint_minus_and_plus_lines function 2021-12-05 11:25:05 -05:00
Dan Davison
422954164f Handle combined diff format 
With this commit combined diff
format (https://git-scm.com/docs/git-diff#_combined_diff_format) is
handled appropriately. However, there is no special handling of merge
conflict markers.

Fixes #189, #736
 2021-12-05 11:25:05 -05:00
Dan Davison
f73f0a8cbd Fix blame background colors 
These had been broken by ec08c4de76
 2021-12-05 09:44:03 -05:00
Dan Davison
c632494c80 PERF: Add comment 2021-12-05 09:25:31 -05:00
Dan Davison
1f444c9d36 Silence warning 2021-12-04 22:29:31 -05:00
Dan Davison
e887d691a4 README edit 2021-12-04 22:29:31 -05:00
Dan Davison
3b7fcc66a6 Fix weird but correct line handling 
This handler function was returning `false`, thus signaling that it
had not handled the line, when it was not the responsibility of any
other handler to handle the line. It was doing this to rely on the
fall-through handlers determining whether to emit the line or skip it.
But this risks another handler handling it and is a violation of the
contract. It is much more appropriate to make the determination in the
handler itself, emit it if appropriate, and signal that it has been
handled.
 2021-12-04 18:01:30 -05:00
Dan Davison
580a1e88ad Cthulhu commit diff 
2cde51fbd0
https://www.destroyallsoftware.com/blog/2017/the-biggest-and-weirdest-commits-in-linux-kernel-git-history
 2021-12-04 15:58:20 -05:00
Dan Davison
5b8ce8c182 Bump version in links to executables 2021-12-03 20:31:51 -05:00
Dan Davison
a61a7021ca Bump version in private Homebrew formula 2021-12-03 17:35:14 -05:00
Thomas Otto
b38c0f0bba Fix new v1.57 clippy warnings 2021-12-02 20:33:35 -05:00
Thomas Otto
c8aa15d351 Fix side-by-side line number miscount 2021-12-02 20:33:35 -05:00
Kr1ss
75eaf90a44 [themes.gitconfig] add woolly-mammoth blame config 2021-11-30 22:36:41 -05:00
Maxim Doucet
588145e49e Fix colorMoved in git config example 
According to [git documentation for diff.colorMoved](https://git-scm.com/docs/git-diff#Documentation/git-diff.txt---color-movedltmodegt), `true` is not a correct value. `default` is a correct value and it also matches the "`--color-moved` support" section of this README.
 2021-11-30 17:43:17 -05:00
Maxim Doucet
7d01125e14 Fix navigate option in git config example 
The navigate option does not work when present in the `[core]` section of the git config because it is not a git option. It works correctly when present in the `[delta]` section.
 2021-11-30 17:23:49 -05:00
Dan Davison
063816cf7b README: Fix indentation 2021-11-30 11:35:07 -05:00
Dan Davison
4afae04919 README edits 2021-11-30 09:39:59 -05:00
Dan Davison
6271fca60f Refactor: if let instead of match 2021-11-29 20:22:25 -05:00
Dan Davison
b121d60c6e Rename: FileMeta => DiffHeader 2021-11-29 20:08:24 -05:00
Dan Davison
d0d1f09d24 Initial version of ARCHITECTURE.md 2021-11-29 08:55:57 -05:00
Dan Davison
b0e02830b2 Do not handle --word-diff or --color-words output 
Fixes #440
Ref #152
 2021-11-29 08:41:24 -05:00
Dan Davison
0f66f753d0 Refactor: is_in_hunk 2021-11-29 08:41:24 -05:00
Dan Davison
67df50c8a8 Refactor: parse command line 2021-11-29 08:41:24 -05:00
Thomas Otto
1c9be71dd9 Test sibling process detection 2021-11-29 08:39:56 -05:00
Thomas Otto
46b0c0441a Match process binary case insensitively 2021-11-29 08:39:56 -05:00
Thomas Otto
b34a031122 Clean up FakeParentArgs 
Can fake once, for_scope, or with a given list.
 2021-11-29 08:39:56 -05:00