summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2020-12-30Update READMEDan Davison
2020-12-30Update release MakefileDan Davison
2020-12-29refactor main in order to call process::exit once (#480)0.5.0Marco Ieni
* refactor main in order to call process::exit once Co-authored-by: tl-marco-ieni <marco.ieni@truelayer.com> Co-authored-by: Dan Davison <dandavison7@gmail.com>
2020-12-29Hyperlink file and line number (#479)Dan Davison
Hyperlinks seem to be rendering with just the file path underlined, at least in iTerm2, whereas the intention was for the file and line-number to be rendered jointly (both underlined) as a hyperlink. The link structure is ␛]8;;file-line-column:///Users/dan/src/delta/src/hunk_header.rs:114␛\␛[38;5;1msrc/hunk_header.rs␛[0m:␛[38;5;4m114␛[0m␛]8;;␛\:
2020-12-29Bump git2 from 0.13.14 to 0.13.15 (#478)dependabot-preview[bot]
Bumps [git2](https://github.com/rust-lang/git2-rs) from 0.13.14 to 0.13.15. - [Release notes](https://github.com/rust-lang/git2-rs/releases) - [Commits](https://github.com/rust-lang/git2-rs/compare/0.13.14...0.13.15) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-12-29Bump console from 0.13.0 to 0.14.0 (#476)dependabot-preview[bot]
Bumps [console](https://github.com/mitsuhiko/console) from 0.13.0 to 0.14.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.13.0...0.14.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-12-29Bump itertools from 0.9.0 to 0.10.0 (#475)dependabot-preview[bot]
Bumps [itertools](https://github.com/bluss/rust-itertools) from 0.9.0 to 0.10.0. - [Release notes](https://github.com/bluss/rust-itertools/releases) - [Changelog](https://github.com/rust-itertools/itertools/blob/master/CHANGELOG.md) - [Commits](https://github.com/bluss/rust-itertools/compare/v0.9.0...v0.10.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-12-28State machine refactor (#477)Dan Davison
2020-12-28Bump git2 from 0.13.13 to 0.13.14 (#455)dependabot-preview[bot]
Bumps [git2](https://github.com/rust-lang/git2-rs) from 0.13.13 to 0.13.14. - [Release notes](https://github.com/rust-lang/git2-rs/releases) - [Commits](https://github.com/rust-lang/git2-rs/compare/0.13.13...0.13.14) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-12-28Bump structopt from 0.3.20 to 0.3.21 (#414)dependabot-preview[bot]
Bumps [structopt](https://github.com/TeXitoi/structopt) from 0.3.20 to 0.3.21. - [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.20...v0.3.21) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-12-28Move line number refactoring (#474)Dan Davison
* Move handle_hunk_header_line back into delta.rs * Clean up draw_function API * Clippy
2020-12-28Merge pull request #473 from dandavison/move-line-numberDan Davison
Move line number into hunk header
2020-12-28Merge pull request #472 from dandavison/handle-hunk-header-refactorDan Davison
handle hunk header refactor
2020-12-28Cargo.toml: remove "readme" field (#471)Marco Ieni
2020-12-27Add tests of hunk-header-style special attributesDan Davison
2020-12-27Include file and line number under diff-so-fancy emulationDan Davison
2020-12-27Use special style attribute to control line-number in hunk-headerDan Davison
2020-12-27Revert "Interpret `line-numbers = false` in gitconfig as no line numbers at ↵Dan Davison
all (#296)" This reverts commit ecb2da1e271aa0daa6dd2ed4c6658d59347020e6.
2020-12-27Fix testsDan Davison
2020-12-27Emit line numbers by defaultDan Davison
2020-12-27Fix testsDan Davison
2020-12-27Move line number into hunk headerDan Davison
2020-12-27Simplify preparation of hunk header code fragmentDan Davison
2020-12-27Refactor: handle_hunk_header_lineDan Davison
2020-12-27Reference correct token in bump-homebrew-formula workflowDan Davison
Should fix #460. Thanks @MarcoIeni
2020-12-27Merge pull request #470 from ↵Dan Davison
dandavison/309-file-path-in-hunk-header-when-no-frag Emit file path in hunk header when no frag
2020-12-26Wait for pager process before exiting (#469)Dan Davison
Fixes #463
2020-12-26Emit file in hunk header even when there is no fragDan Davison
Fixes #309
2020-12-26Add failing test of hunk header with file and no fragDan Davison
Ref #309
2020-12-26Strengthen testDan Davison
2020-12-26Refactor and strengthen tests of `delta file_a file_b`Dan Davison
This does not reproduce bug #463 (at least, not reliably).
2020-12-26Merge pull request #467 from MarcoIeni/patch-2Dan Davison
ci: run also on push
2020-12-26CI on push-to-master and pull_request, per @MarcoIeniDan Davison
2020-12-26cd: set MACOSX_DEPLOYMENT_TARGET to 10.7 (#468)Philippe Blain
The binary release of delta 0.4.5 for macOS created by the "Continuous Deployment" GitHub Actions workflow does not run on older macOS, like 10.11 (El Capitan) [1]. The Rust compiler, rustc, by default, will build macOS binaries compatible with macOS 10.7 or newer [2], [3], but some *-sys crates invoke a C compiler and thus will target the macOS version the C compiler is running on [4], thus limiting the compatibility of the resulting binary. The macOS virtual machines used on GitHub Actions run macOS 10.15.7, and since delta depends on some *-sys crates, the delta binary built by cargo targets macOS 10.15, as can be verified by using the following command: $ otool -l ./target/x86_64-apple-darwin/release/delta | grep LC_BUILD_VERSION -A4 cmd LC_BUILD_VERSION cmdsize 32 platform 1 sdk 10.15.6 minos 10.15 or, if building locally on an older macOS versions, (here 10.11): $ otool -l ./target/debug/delta | grep LC_VERSION_MIN_MACOSX -A2 cmd LC_VERSION_MIN_MACOSX cmdsize 16 version 10.11 To restore compatibility with older macOS version, explicitely set the environment variable `MACOSX_DEPLOYMENT_TARGET` to the default for rustc, "10.7". This will make the `clang` C compiler invoked by *-sys crates also target 10.7, thus restoring the compatibility of the delta binary. For simplicity, add this variable to the environment for all platforms, which should not have any effect on non-macOS platforms. [1] https://github.com/dandavison/delta/issues/462 [2] https://github.com/rust-lang/rust/blob/65d053ab74d8c8c9c502b678acc265f3d7e2ac49/compiler/rustc_target/src/spec/apple_base.rs#L15-L17 [3] https://github.com/rust-lang/rust/blob/65d053ab74d8c8c9c502b678acc265f3d7e2ac49/compiler/rustc_target/src/spec/apple_base.rs#L53-L61 [4] https://users.rust-lang.org/t/compile-rust-binary-for-older-versions-of-mac-osx/38695/5
2020-12-26ci: run also on pushMarco Ieni
2020-12-24Install less in DockerfileDan Davison
2020-12-24Note that MacOS binaries do not work on older OS versionsDan Davison
Fixes #462
2020-12-24Dockerfile to install Delta under UbuntuDan Davison
2020-12-23Bump dev version numberDan Davison
2020-12-23Link to jftuga/less-Windows/releases in Windows README sectionDan Davison
Fixes #461
2020-12-23308 side by side tabs (#459)Dan Davison
* Add #308 bug reproduction delta --no-gitconfig --diff-highlight --side-by-side < etc/examples/308-side-by-side-tabs.diff * Expand tabs under diff-highlight and diff-so-fancy Fixes #308
2020-12-23automatically publish to crates.io on tag (#419)Marco Ieni
* automatically publish to crates.io on tag * Update cd.yml Add newline Co-authored-by: Dan Davison <dandavison7@gmail.com>
2020-12-23Add link to repologyDan Davison
2020-12-230.4.5 release (#457)Dan Davison
* Bump version in links to executables * Bump version in private Homebrew formula * Update README for 0.4.5
2020-12-21Bump unicode-segmentation from 1.7.0 to 1.7.1 (#408)0.4.5dependabot-preview[bot]
Bumps [unicode-segmentation](https://github.com/unicode-rs/unicode-segmentation) from 1.7.0 to 1.7.1. - [Release notes](https://github.com/unicode-rs/unicode-segmentation/releases) - [Commits](https://github.com/unicode-rs/unicode-segmentation/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-12-21Bump git2 from 0.13.12 to 0.13.13 (#454)dependabot-preview[bot]
Bumps [git2](https://github.com/rust-lang/git2-rs) from 0.13.12 to 0.13.13. - [Release notes](https://github.com/rust-lang/git2-rs/releases) - [Commits](https://github.com/rust-lang/git2-rs/compare/0.13.12...0.13.13) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-12-21Merge pull request #453 from dandavison/309-file-path-in-hunk-headerDan Davison
Add file path to hunk header
2020-12-19Implement hunk-header-style 'file' attributeDan Davison
Fixes #309
2020-12-19Add failing test of hunk-header-style 'file' attributeDan Davison
Ref #309
2020-12-19Do not paint hunk header twiceDan Davison
The text being passed to the draw function has already been painted.
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 21:38:40 +0000