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,975 Commits 80 Branches 64 Tags 18 MiB
99451ead76
Commit Graph

1975 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Davison
34b99407a7 Failed attempt to add a test of --map-styles with --color-words 2021-12-12 00:20:52 -05:00
Dan Davison
15e9374b78 Allow calling process to be specified in DeltaTest builder methods 2021-12-12 00:20:52 -05:00
Dan Davison
b732c9419e Add failing tests of --word-diff and --color-words 2021-12-12 00:20:52 -05:00
Dan Davison
081e0a7c66 Refactor: factor out a helper function in DeltaTest 2021-12-12 00:20:52 -05:00
Dan Davison
8dfd22ba8a Fix specification of git revision in Cargo.toml dependency 
Ref #845
 2021-12-11 16:58:21 -05:00
Dan Davison
69c7aaa28f
Do not query CPU data when querying process data (#845) 
* Do not query CPU data when querying process data

Fixes #839
Ref https://github.com/GuillaumeGomez/sysinfo/issues/632

* Update branch of sysinfo

* Update upstream sysinfo commit

Ref https://github.com/GuillaumeGomez/sysinfo/pull/636

* Point sysinfo at an explicit commit rather than a symbolic branch name

commit d647acfbf216848a8237e1f9251b2c48860a547f
Merge: 989ac6c 67a586c
Author: Guillaume Gomez <guillaume1.gomez@gmail.com>
Date:   2 hours ago

    Merge pull request #636 from GuillaumeGomez/update-if-needed

    Only update processors if needed
 2021-12-11 15:31:34 -05:00
Thomas Otto
5c1612ec0a Query fewer processes when searching for the parent 
This query now happens for more invocation types, so speed it up.
Call `refresh_process()` only on pids numerically close to the one
of delta itself.
 2021-12-11 15:14:41 -05:00
Rashil Gandhi
87156fb871
Store history file in data_local_dir for Windows (#847) 
* Store history file in data_local_dir

* Be specific
 2021-12-11 14:19:43 -05:00
Dan Davison
da083bba2a Store raw_line in HunkZero, as HunkMinus and HunkPlus 
ref #829
 2021-12-09 20:46:28 -05:00
Dan Davison
9554f47ce9 Refactor 
Ref #829
 2021-12-09 20:46:28 -05:00
Dan Davison
354731b95a Update documentation of --width in README 2021-12-09 00:15:41 -05:00
Dan Davison
5ea8dfc433 Fix documentation of --width option 
Fixes #61
 2021-12-09 00:14:14 -05:00
Dan Davison
424fe8b59a Ignore test maing ANSI assertions 
This fails currently in some environments.

Fixes #842
 2021-12-08 20:19:11 -05:00
dependabot[bot]
2d6c6d4b29 Bump sysinfo from 0.19.2 to 0.20.5 
Bumps [sysinfo](https://github.com/GuillaumeGomez/sysinfo) from 0.19.2 to 0.20.5.
- [Release notes](https://github.com/GuillaumeGomez/sysinfo/releases)
- [Changelog](https://github.com/GuillaumeGomez/sysinfo/blob/master/CHANGELOG.md)
- [Commits](https://github.com/GuillaumeGomez/sysinfo/commits)

---
updated-dependencies:
- dependency-name: sysinfo
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-08 15:57:53 -05:00
Dan Davison
a55f0211ef Fix order of struct entries 2021-12-08 10:01:23 -05:00
Dan Davison
fbd1227f9d Bump version 2021-12-07 21:53:24 -05:00
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