Commit Graph

1861 Commits

Author SHA1 Message Date
dependabot[bot]
fe186677d7
Bump smol_str from 0.1.21 to 0.1.23 (#1058)
Bumps [smol_str](https://github.com/rust-analyzer/smol_str) from 0.1.21 to 0.1.23.
- [Release notes](https://github.com/rust-analyzer/smol_str/releases)
- [Commits](https://github.com/rust-analyzer/smol_str/compare/v0.1.21...v0.1.23)

---
updated-dependencies:
- dependency-name: smol_str
  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>
2022-07-04 11:48:47 -04:00
dependabot[bot]
b2e43935a1
Bump ctrlc from 3.2.1 to 3.2.2 (#1055)
Bumps [ctrlc](https://github.com/Detegr/rust-ctrlc) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/Detegr/rust-ctrlc/releases)
- [Commits](https://github.com/Detegr/rust-ctrlc/compare/3.2.1...3.2.2)

---
updated-dependencies:
- dependency-name: ctrlc
  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>
2022-07-04 11:48:32 -04:00
dependabot[bot]
1472a87f4a
Bump sysinfo from 0.23.0 to 0.24.5 (#1108)
Bumps [sysinfo](https://github.com/GuillaumeGomez/sysinfo) from 0.23.0 to 0.24.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>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-07-04 11:46:39 -04:00
dependabot[bot]
1e008f835a
Bump bytelines from 2.2.2 to 2.4.0 (#1034)
Bumps [bytelines](https://github.com/whitfin/bytelines) from 2.2.2 to 2.4.0.
- [Release notes](https://github.com/whitfin/bytelines/releases)
- [Commits](https://github.com/whitfin/bytelines/compare/v2.2.2...v2.4.0)

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

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-07-04 11:06:36 -04:00
Dan Davison
ab8015e4f7 Don't attempt to process ANSI sequences in non-UTF8 input
Fixes #677
2022-07-02 17:07:29 -04:00
Connor Braa
5f8ac5f717
Update README.md to include git 2.37.0 workaround (#1116)
see https://github.com/dandavison/delta/issues/1114
2022-07-01 15:04:56 -04:00
Dan Davison
1dab1a87ba Fix documentation of DELTA_FEATURES 2022-06-25 11:59:50 -04:00
Dan Davison
88c6a52151 Document DELTA_FEATURES in the manual 2022-06-25 11:51:11 -04:00
Björn Steinbrink
bd54a51205 Fix whole-file changes being attributed to the wrong commit in "git log" output
The pending buffer for whole-file changes is currently only flushed when
encountering a new diff header. This leads to it being carried over
across commit boundaries in cases where multiple commits are shown. To
fix this, we simply need to flush the buffered data on a commit
boundary as well.

Fixes #1089
2022-06-22 08:49:42 -04:00
Björn Steinbrink
e28e97de7a Allow to run tests using "cargo t"
The test_process_calling_cmdline test only allows "cargo test" and
"cargo tarpaulin" for running the testsuite, for "cargo t" is a
built-in alias for "cargo test" and should be allowed, too.
2022-06-22 08:49:42 -04:00
Björn Steinbrink
37ea9521dc
Avoid lockup when running without arguments and stdin is connected to tty (#1112)
Up until commit 55287a8 "Run in diff mode iff two positional arguments
are supplied" diff mode was only supported when stdin is connected to a
tty, which meant that, for example, running `delta a b` in a git hook
would do the wrong thing.

As a fix, the tty check was removed, so now `delta a b` always works,
but the only error condition is now to pass only a single file. When
passing no files at all, we try parse to stdin even when connected to a
tty. Usually that wouldn't be that bad, because the user could press
Ctrl-C or Ctrl-D (EOF) to quit, unfortunately something in the pager
setup breaks this, and the only way to exit `delta` is to kill it.

Running `delta` with stdin connected to a tty would mean that the user
has to manually enter a diff (or paste it), which is not really an
expected scenario, as demonstrated by the error message that's currently
only emitted when running `delta` with only a single file argument. So
we can avoid the lockup by also emitting the error message when running
on a tty and there are no files to be diffed.

Fixes #1039, fixes #1090
2022-06-22 08:37:10 -04:00
Dan Davison
3f527e0d9c
Fix commit hyperlink formatting (#1110) 2022-06-20 16:01:58 -04:00
Dan Davison
4c879ac1af Improve blame format width in chameleon theme
Fixes #1104
2022-06-16 08:36:01 -04:00
Dan Davison
29c9239ea5
Only trigger git show handler if a file extension was parsed (#1106)
Fixes #1105
2022-06-15 17:38:52 -04:00
Yudai Takada
e7dbdd4846
Tweak some words improved representation (#1078)
* Use "overridden" instead of "overriden"

* Use "line_numbers" instead of "linennumbers"

* Use "context" instead of "contexct"

* Use "summary" instead of "sumary"
2022-05-23 10:56:28 +01:00
Michael Floering
427c9aa971
Update color-moved-support.md (#1082) 2022-05-19 14:29:39 -04:00
Dan Davison
03d99a5678 Bump version 2022-05-13 12:32:21 -04:00
Dan Davison
a8c79aa9de Update bat, git2, and syntect 2022-05-13 12:21:16 -04:00
Atul Varma
a53dc02c4a
Add 'light = false' w/ comment in gitconfig (#1073)
* Add 'light = false' w/ comment in gitconfig

As mentioned in #1072, the macOS default terminal is light and it's challenging to find documentation on how to make delta copacetic with it, so this adds an explicit `light = false` in the `.gitconfig` example, with a comment explaining that it can be changed for light terminals.

* Update README.md

fix indentation
2022-05-09 09:38:37 -04:00
Stefan Schnyder
3e58c176c4
Add chameleon theme to themes.gitconfig (#1062) 2022-05-02 09:03:46 -04:00
Dan Davison
0a997fa7b3 Add note that the package is called "git-delta" in the README
Ref #287
2022-05-02 08:51:37 -04:00
Eloy Espinaco
1d01c2c12c
Add link to bat on README (#1052)
For people like me that did not know about that.
2022-04-21 20:07:34 -04:00
Dan Davison
3ccf2bc8d2
Apply hyperlinks to diff stat file paths (#1035) 2022-04-04 20:53:27 -04:00
Dan Davison
fd29606c50 Bump version 2022-04-01 22:02:49 -04:00
William Escande
85a07cd109
Add custom env struct to store env at init (#1025)
This allow to no longer ignore some tests (marked previously as FIXME)
by storing the env at the start of the program (Or creating a custom env
for test purpose)
This centralize almost alls calls to std::env inside one wrapper

Add a test profile to increase speed for testing (5min -> 20sec on my
machine)

clean a few code style like this:
```
if Some(value) = ...
    if value
```
to
```
if Some(true) = ...
```

Co-authored-by: William Escande <wescande@google.com>
2022-03-30 20:35:10 -04:00
William Escande
9c840f6f4c Add support for irreversible-delete
Fix #128

Add support for `git diff -D` (aka irreversible delete)

The patch is adding a title for removed file, even when there is no file content in the diff output
Without the patch, there was no output related to the file at all
2022-03-30 08:41:48 -04:00
Dan Davison
6e242c7699 Fix typo in --help text 2022-03-21 12:05:20 -04:00
Dan Davison
dd19c974ba Apply file-transformation to diff header, in addition to hunk header
Fixes #1010
2022-03-16 09:23:05 -04:00
Martin Sirringhaus
c2de30e5cd Bump regex to fix CVE-2022-24713 2022-03-16 09:18:30 -04:00
Dan Davison
ee09adf81b Tweak wrap-max-lines documentation 2022-03-14 10:44:45 -04:00
Dan Davison
6b06f4c1fc Move wrapping logic and utilities into wrapping module 2022-03-14 10:44:45 -04:00
dependabot[bot]
ef76e9f734 Bump unicode-segmentation from 1.8.0 to 1.9.0
Bumps [unicode-segmentation](https://github.com/unicode-rs/unicode-segmentation) from 1.8.0 to 1.9.0.
- [Release notes](https://github.com/unicode-rs/unicode-segmentation/releases)
- [Commits](https://github.com/unicode-rs/unicode-segmentation/commits)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-08 09:48:39 -05:00
Dan Davison
a7765f8003 Flush minus/plus line buffers in additional code locations
Fixes #1002
2022-03-07 12:58:28 -05:00
Dan Davison
c0bb90c86e Add failing test for #1002 2022-03-07 12:58:28 -05:00
Dan Davison
fd3770875b Update help output in manual 2022-03-07 07:56:51 -05:00
Dan Davison
cf04dbc758 Bump version in files 2022-03-07 07:54:30 -05:00
dependabot[bot]
73ae21d275 Bump git2 from 0.13.23 to 0.14.0
Bumps [git2](https://github.com/rust-lang/git2-rs) from 0.13.23 to 0.14.0.
- [Release notes](https://github.com/rust-lang/git2-rs/releases)
- [Commits](https://github.com/rust-lang/git2-rs/compare/0.13.23...git2-curl-0.14.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-06 14:31:23 -05:00
dependabot[bot]
37000d560c Bump xdg from 2.4.0 to 2.4.1
Bumps [xdg](https://github.com/whitequark/rust-xdg) from 2.4.0 to 2.4.1.
- [Release notes](https://github.com/whitequark/rust-xdg/releases)
- [Commits](https://github.com/whitequark/rust-xdg/compare/v2.4.0...v2.4.1)

---
updated-dependencies:
- dependency-name: xdg
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-06 11:26:15 -05:00
Dan Davison
08ff8dfefe Bump version 2022-03-06 10:28:12 -05:00
Dan Davison
55287a827e Run in diff mode iff two positional arguments are supplied
Fixes #989
2022-03-01 19:01:33 -05:00
Thomas Otto
d13c41c3fe Disable full process scans on Linux
The env var DELTA_CALLING_PROCESS_QUERY_ALL re-enables this
last resort method. However usually this is just an expensive
scan which doesn't find the caller anyhow.
2022-03-01 18:58:55 -05:00
Thomas Otto
d2f5a9077c Also look at grandparent process when determining the caller 2022-03-01 18:58:55 -05:00
Dan Davison
1403fe2b8e
Use assets API from bat library instead of vendored code (#903)
Use assets API from bat library

Fixes #895
Ref https://github.com/sharkdp/bat/issues/2026
Thanks @Enselic
2022-02-27 12:08:23 -05:00
Dan Davison
e44435c8f8 Clippy 2022-02-27 10:31:09 -05:00
katy lavallee
56de497357
Include information about GIT_PAGER in manual (#991)
under configuration instructions
2022-02-26 13:41:12 -05:00
Dan Davison
702bb5c8fd Create separate "Using delta with tmux" manual entry 2022-02-26 09:54:34 -05:00
Thomas Otto
f165f56b84
Fall back to plain diff when process substitution is used (#978)
When detecting input generated by `delta <(echo foo) <(echo bar)`
fall back to plain `diff` instead of `git diff --no-index`.

This does not respect various git settings anymore (the original reason
to switch from `diff` to `git diff`), but is better than just showing
the names of the temporary files.
2022-02-23 20:31:47 -05:00
Johan Wärlander
9572adb744
Enable commit links for GitLab (#972)
* Enable commit links for GitLab
2022-02-21 12:46:37 -05:00
Yoichi NAKAYAMA
6d4a3509ce
Support CSI sequences other than SGR (#976)
* Define Element::Csi_ for non-SGR sequences

* Rename (Csi, Csi_) -> (Sgr, Csi)
2022-02-20 13:04:24 -05:00
Jackson Popkin
10ff766a65
Fix parsing for .properties files with - in path (#975)
Fixes #974.
2022-02-19 12:24:23 -05:00