Age | Commit message (Collapse) | Author |
|
|
|
|
|
all (#296)"
This reverts commit ecb2da1e271aa0daa6dd2ed4c6658d59347020e6.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Should fix #460. Thanks @MarcoIeni
|
|
dandavison/309-file-path-in-hunk-header-when-no-frag
Emit file path in hunk header when no frag
|
|
Fixes #463
|
|
Fixes #309
|
|
Ref #309
|
|
|
|
This does not reproduce bug #463 (at least, not reliably).
|
|
ci: run also on push
|
|
|
|
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
|
|
|
|
|
|
Fixes #462
|
|
|
|
|
|
Fixes #461
|
|
* 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
|
|
* automatically publish to crates.io on tag
* Update cd.yml
Add newline
Co-authored-by: Dan Davison <dandavison7@gmail.com>
|
|
|
|
* Bump version in links to executables
* Bump version in private Homebrew formula
* Update README for 0.4.5
|
|
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>
|
|
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>
|
|
Add file path to hunk header
|
|
Fixes #309
|
|
Ref #309
|
|
The text being passed to the draw function has already been painted.
|
|
Ref #447 #307
|
|
|
|
|
|
|
|
Fixes #448
|
|
Bumps [syntect](https://github.com/trishume/syntect) from 4.4.0 to 4.5.0.
- [Release notes](https://github.com/trishume/syntect/releases)
- [Changelog](https://github.com/trishume/syntect/blob/master/CHANGELOG.md)
- [Commits](https://github.com/trishume/syntect/compare/v4.4.0...v4.5.0)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
|
|
Add cd to update brew formula in homebrew core
|
|
|
|
|
|
* Enable hunk header style with syntax when color only
* Add comment
* Add comment about color_only if conditions
|
|
* fix: Replace unmaintained dirs with dirs-next
* fix: Fix compilation error on macos, remove warn
Co-authored-by: Dan Davison <dandavison7@gmail.com>
|
|
* Remove force assing raw to commit style when color_only
* Add test for commit style color when color_only
|
|
#405 (#437)
* Remove force passing raw to hunk header style when color_only
* Handle hunk header color when color_only
* Add test for hunk header style color when color_only
* Delete fixme because it actually is required
* Add comment for condition that keeps structure when color_only and raw mode
|
|
* Add config property of color_only
* Delete force assign raw to file_style when color_only
* Print filemeta in color with rawline when color_only mode
* Cargo fmt
* Add test if file_style with color_only has style
* Add comment about color_only
|
|
Fixes #281
|