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,751 Commits 80 Branches 64 Tags 18 MiB
a1b8dbc410
Commit Graph

1751 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Davison
a1b8dbc410 New option blame-code-style 
Fixes #867
 2021-12-24 07:40:45 -05:00
Dan Davison
67124941d5 Tweak issue template 2021-12-22 12:23:09 -05:00
Dan Davison
31481db596 Tweak issue template 2021-12-22 12:04:21 -05:00
dependabot[bot]
990dca2675
Bump sysinfo from 0.22.2 to 0.22.3 (#862) 
Bumps [sysinfo](https://github.com/GuillaumeGomez/sysinfo) from 0.22.2 to 0.22.3.
- [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-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-12-20 18:13:33 -05:00
庄天翼
d71da62d49
Remove redundent spaces in README example (#861) 2021-12-19 23:26:17 -05:00
Dan Davison
ab54c116ec Update --help text 2021-12-15 19:03:29 -05:00
Dan Davison
0bf10022ad Bump version in docs 2021-12-15 18:56:15 -05:00
Dan Davison
1458879231 Bump version 2021-12-15 18:49:51 -05:00
Dan Davison
b8c93f3f07 Update sysinfo to released version 
Ref #839
 2021-12-15 18:44:30 -05:00
Dan Davison
b5d7c23e07
Line state refactor (#851) 
* Refactor: compute raw line and new line state
 2021-12-14 22:21:07 -05:00
Dan Davison
d72ddfc6ad Delete calls printing output in tests 2021-12-14 01:39:48 -05:00
Dan Davison
2dad3e8060 Add inspect_raw method to DeltaTest 2021-12-14 01:39:48 -05:00
Dan Davison
f650f485ed Add markers surrounding DeltaTest::inspect() output 2021-12-14 01:39:48 -05:00
Dan Davison
799ad15d15 Don't take syntax-theme from env var during tests 
Fixes #842
 2021-12-14 01:39:39 -05:00
Dan Davison
cec8542e5f Revert "Ignore test maing ANSI assertions" 
This reverts commit 424fe8b59a.
 2021-12-14 01:39:39 -05:00
Dan Davison
8b408cc57f Clean up DeltaTest argument 2021-12-13 23:21:31 -05:00
Dan Davison
bc8676dd4d Add Test for #753 3ce64ddefb 2021-12-13 23:21:31 -05:00
Dan Davison
cf270eefd9 Bug fix: emit merge conflict markers even when width=variable 2021-12-13 17:45:35 -05:00
Dan Davison
3ce64ddefb Emit line as raw if canonical line state is raw 
Fixes #753
 2021-12-12 23:34:34 -05:00
Dan Davison
1767b3be29 Refactor: make state available when determining whether line should be emitted raw 2021-12-12 23:34:34 -05:00
Dan Davison
fbf88e4686 DELTA_FEATURES appends iff prefixed with + 
Thanks @bew for the suggestion.

Fixes #848
 2021-12-12 17:36:56 -05:00
Dan Davison
ab278a77fb Avoid using environment variables during tests 2021-12-12 17:36:56 -05:00
Dan Davison
b995bd4ea0 Add @Wilfred's difftastic to Similar Projects section of README 2021-12-12 12:51:21 -05:00
Dan Davison
f88f0a4eda Fix tests: don't access lazy_static in tests 2021-12-12 00:20:52 -05:00
Dan Davison
9d1b25ac43 Disable line numbers and side-by-side under --word-diff 
We currently have no way of computing correct line numbers: it seems that we would need to identify
wholly added and removed lines from the ANSI color sequences. side-by-side is (I imagine) almost
always used with line numbers, and it doesn't make much sense for word-diff anyway.
 2021-12-12 00:20:52 -05:00
Dan Davison
c1d8867f80 Raw pass-through handling of --word-diff and --color-words output 
The previous implementation (5895cfa) was incorrect.

Fixes #829
 2021-12-12 00:20:52 -05:00
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