summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2021-10-26Ignore "RUSTSEC-2020-0159"Dan Davison
It appears to be inevitable at the moment due to the dependency chain syntect -> plist -> chrono See https://github.com/trishume/syntect/issues/385
2021-10-26Remove chrono dependencyDan Davison
Should have been included in #746
2021-10-26Revert git blame handling (#746)Dan Davison
* Security bug: time-rs/time#293 https://rustsec.org/advisories/RUSTSEC-2020-0159.html https://github.com/dandavison/delta/runs/4003260368?check_suite_focus=true * No fix available in the chrono crate: https://github.com/chronotope/chrono/issues/602
2021-10-25Bump structopt from 0.3.23 to 0.3.25 (#744)dependabot[bot]
Bumps [structopt](https://github.com/TeXitoi/structopt) from 0.3.23 to 0.3.25. - [Release notes](https://github.com/TeXitoi/structopt/releases) - [Changelog](https://github.com/TeXitoi/structopt/blob/master/CHANGELOG.md) - [Commits](https://github.com/TeXitoi/structopt/compare/v0.3.23...v0.3.25) --- updated-dependencies: - dependency-name: structopt 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-10-25Document side-by-side line wrapping in READMEDan Davison
2021-10-25Bump version for releaseDan Davison
2021-10-25Re-enable ANSI fill by equalizing panel sizesThomas Otto
Make the two panels in side-by-side use the full terminal width by inserting an extra space in the center between the panels if the width is odd and ANSI filling is enabled. Fall back to spaces when the output is not to a terminal.
2021-10-25Remember if stdout is to an interactive terminalThomas Otto
Adapted `set_widths` because that's where there's a Term instance already.
2021-10-25Linenumber test helper addedThomas Otto
2021-10-25Wrap linenumber configs in MinusPlus or LeftRightThomas Otto
2021-10-18Use fatal() to exit with errorcode 2 (#739)Thomas Otto
* Fix two typos * Dismantle two Pyramids of Doom Use question mark operator instead * Use fatal() to exit with errorcode 2
2021-10-18Convert Align and Placeholder into enumsThomas Otto
Also move number and style logic out of `format_and_paint_line_numbers()` and into a separate `linenumbers_and_styles()` function.
2021-10-18Store line number prefix/suffix as SmolStrThomas Otto
2021-10-18Width can be an offset from the terminal width (#727)Thomas Otto
No longer subtract 1 from the terminal width to accommodate e.g. `less --status-columns`, instead set `--width -1` explicitly.
2021-10-16Bump xdg from 2.3.0 to 2.4.0 (#737)dependabot[bot]
Bumps [xdg](https://github.com/whitequark/rust-xdg) from 2.3.0 to 2.4.0. - [Release notes](https://github.com/whitequark/rust-xdg/releases) - [Commits](https://github.com/whitequark/rust-xdg/compare/v2.3.0...v2.4.0) --- updated-dependencies: - dependency-name: xdg 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>
2021-10-16Bump console from 0.14.1 to 0.15.0 (#738)dependabot[bot]
Bumps [console](https://github.com/mitsuhiko/console) from 0.14.1 to 0.15.0. - [Release notes](https://github.com/mitsuhiko/console/releases) - [Changelog](https://github.com/mitsuhiko/console/blob/master/CHANGELOG.md) - [Commits](https://github.com/mitsuhiko/console/compare/0.14.1...v0.15.0) --- updated-dependencies: - dependency-name: console 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>
2021-10-16Merge pull request #515 from th1000s/wrapDan Davison
Add side-by-side line wrapping mode
2021-10-16Change PlusMinus to the correct MinusPlus, add documentationThomas Otto
2021-10-16Tests: store length of skipped header separatelyThomas Otto
2021-10-16Fix clippy warning needless_option_as_derefThomas Otto
2021-10-16Add inline-hint-style option and use for side-by-side wrap symbolsDan Davison
2021-10-16Rename syntect moduleDan Davison
2021-10-16Add side-by-side line wrappingThomas Otto
If the current line does not fit into the panel, then it is not truncated but split into multiple lines. A wrapping symbol is placed at the end of the line. If the new line is short enough, it is right-aligned. Wrapping is limited to a certain number of lines (--wrap-max-lines), if this is exceeded the line is truncated by a now highlighted truncation symbol. To disable wrapping set this value to 0.
2021-10-16Add line number width calculationThomas Otto
2021-10-16Left/Right converted into a simple typedefThomas Otto
2021-10-16StructOpt without DefaultThomas Otto
This does not use the values provided by default_value, so validation will fail.
2021-10-16Add fatal() function to handle exiting on errorsThomas Otto
Panic when testing or exit with return value 2.
2021-10-13Use bullet as default hunk marker in navigate modeDan Davison
Ref 130b0b6a #684
2021-10-12Bump xdg from 2.2.0 to 2.3.0 (#734)dependabot[bot]
Bumps [xdg](https://github.com/whitequark/rust-xdg) from 2.2.0 to 2.3.0. - [Release notes](https://github.com/whitequark/rust-xdg/releases) - [Commits](https://github.com/whitequark/rust-xdg/compare/v2.2.0...v2.3.0) --- updated-dependencies: - dependency-name: xdg 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>
2021-10-12Bump ctrlc from 3.2.0 to 3.2.1 (#733)dependabot[bot]
Bumps [ctrlc](https://github.com/Detegr/rust-ctrlc) from 3.2.0 to 3.2.1. - [Release notes](https://github.com/Detegr/rust-ctrlc/releases) - [Commits](https://github.com/Detegr/rust-ctrlc/compare/3.2.0...3.2.1) --- 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>
2021-10-12Bump git2 from 0.13.22 to 0.13.23 (#730)dependabot[bot]
Bumps [git2](https://github.com/rust-lang/git2-rs) from 0.13.22 to 0.13.23. - [Release notes](https://github.com/rust-lang/git2-rs/releases) - [Commits](https://github.com/rust-lang/git2-rs/compare/0.13.22...0.13.23) --- updated-dependencies: - dependency-name: git2 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-09-30Update diagnostics scriptDan Davison
2021-09-28Bump pathdiff from 0.2.0 to 0.2.1 (#723)dependabot[bot]
Bumps [pathdiff](https://github.com/Manishearth/pathdiff) from 0.2.0 to 0.2.1. - [Release notes](https://github.com/Manishearth/pathdiff/releases) - [Commits](https://github.com/Manishearth/pathdiff/commits) --- updated-dependencies: - dependency-name: pathdiff 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-09-27Fix TOC charactersDan Davison
2021-09-27README simplificationDan Davison
2021-09-19Option to set the background extension mode to ANSI or spacesThomas Otto
In side-by-side mode, if `background_color_extends_to_terminal_width` is set, the left panel color is extended via spaces, but the right one via an ANSI sequence which instructs the terminal emulator to fill the background color rightwards. The command line option --line-fill-method ansi|spaces can change how the right panel background is filled. Add enums `BgShouldFill` and `BgFillMethod` to better distinguish if the background should be filled, and if so, how.
2021-09-19General PlusMinus data structureThomas Otto
Can be indexed with Minus/Plus or in a side-by-side context with Left/Right to represent the left/right Panels.
2021-09-19Bump unicode-width from 0.1.8 to 0.1.9 (#719)dependabot[bot]
2021-09-15Remove superfluous lowercasing of feature names. (#718)Levi Bard
Fixes #716
2021-09-15Display removed file name in file deletion case (#717)Dan Davison
2021-09-09Bump git2 from 0.13.21 to 0.13.22 (#712)dependabot[bot]
Bumps [git2](https://github.com/rust-lang/git2-rs) from 0.13.21 to 0.13.22. - [Release notes](https://github.com/rust-lang/git2-rs/releases) - [Commits](https://github.com/rust-lang/git2-rs/compare/0.13.21...0.13.22) --- updated-dependencies: - dependency-name: git2 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-09-02Fix interaction between navigate and (hunk-header-style without "line-number")Dan Davison
Prior to this commit we were emitting a spurious colon when hunk-header-style was set to a value such as "syntax" (i.e. not including "line-number") and navigate was enabled. Fixes #672
2021-09-02Add failing test of navigate with (hunk-header-style without "line-number")Dan Davison
Ref #672
2021-08-31Bump structopt from 0.3.22 to 0.3.23 (#709)dependabot[bot]
Bumps [structopt](https://github.com/TeXitoi/structopt) from 0.3.22 to 0.3.23. - [Release notes](https://github.com/TeXitoi/structopt/releases) - [Changelog](https://github.com/TeXitoi/structopt/blob/master/CHANGELOG.md) - [Commits](https://github.com/TeXitoi/structopt/compare/v0.3.22...v0.3.23) --- updated-dependencies: - dependency-name: structopt 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-08-30Clean upDan Davison
2021-08-30Rename functionDan Davison
2021-08-30Rename functionDan Davison
2021-08-30Refactor: more cleanup of main state machine loopDan Davison
2021-08-29Refactor: subcommands moduleDan Davison
2021-08-29Refactor: state machine handlers moduleDan Davison