Skip to content

Feat/respect xdg spec on all os #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 39 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
369ea6a
Bump struct-patch from 0.8.7 to 0.9.0 (#2583)
dependabot[bot] Mar 26, 2025
1563811
Bump clap from 4.5.32 to 4.5.34 (#2585)
dependabot[bot] Mar 27, 2025
89f73d2
Disable dotted range commit yanking (#2577)
naseschwarz Apr 4, 2025
7f75307
Resolve core.hooksPath relative to GIT_WORK_TREE (#2571)
naseschwarz Apr 4, 2025
cc90799
fix latest clippy (#2597)
extrawurst Apr 7, 2025
eeebb0a
fix cargo deny advisory warning (#2598)
extrawurst Apr 7, 2025
e299017
crossbeam-channel upgrade
extrawurst Apr 11, 2025
313220a
Fix #315 run brew test in CI (#2596)
peso Apr 11, 2025
7804ce7
Bump anyhow from 1.0.97 to 1.0.98 (#2606)
dependabot[bot] Apr 14, 2025
741de5f
Bump openssl-sys from 0.9.106 to 0.9.107 (#2605)
dependabot[bot] Apr 14, 2025
670b22e
Bump struct-patch from 0.9.0 to 0.9.2 (#2604)
dependabot[bot] Apr 14, 2025
f67eed9
Bump indexmap from 2.8.0 to 2.9.0 (#2602)
dependabot[bot] Apr 14, 2025
aa513b4
Bump ron from 0.9.0 to 0.10.1 (#2601)
dependabot[bot] Apr 14, 2025
44d4a8d
Bump clap from 4.5.34 to 4.5.35 (#2592)
dependabot[bot] Apr 14, 2025
7c41e99
Bump shellexpand from 3.1.0 to 3.1.1 (#2607)
dependabot[bot] Apr 15, 2025
9781608
upgrade dirs (#2569)
extrawurst Apr 15, 2025
711210b
Run git-hooks more correctly (#2483)
Joshix-1 Apr 15, 2025
29c8f48
Bump clap from 4.5.35 to 4.5.36 (#2608)
dependabot[bot] Apr 16, 2025
489918e
Bump env_logger from 0.11.6 to 0.11.8 (#2610)
dependabot[bot] Apr 16, 2025
7f88934
Bump msrv to 1.81 (#2613)
naseschwarz Apr 16, 2025
0e37671
use gix_path::env::shell() to get the shell in git2-hooks (#2612)
Joshix-1 Apr 16, 2025
e08d954
Clean up a few `#[allow]`s (#2614)
naseschwarz Apr 16, 2025
baa1822
Remove some `#[allow]`s II (#2616)
naseschwarz Apr 18, 2025
782ec07
Bump once_cell from 1.21.1 to 1.21.3 (#2588)
dependabot[bot] Apr 18, 2025
9056e5e
Show cursor on panic (#2620)
naseschwarz Apr 18, 2025
9271b41
remove duplicate panic handler
extrawurst Apr 18, 2025
1205cd6
Revert "Show cursor on panic (#2620)"
extrawurst Apr 18, 2025
ae7b7b0
Bump clap from 4.5.36 to 4.5.37 (#2621)
dependabot[bot] Apr 21, 2025
ee5c243
Improve error messages (#2617)
acuteenvy Apr 21, 2025
706cdf9
feat: file and status tab support pageup and pagedown (#2496)
Fatpandac Apr 21, 2025
beb71fb
Initial Implementation: Create a set of potential config locations to…
KlassyKat Apr 27, 2025
8e307d3
Apply the same logic to get_app_cache_path
KlassyKat Apr 28, 2025
fb935b7
Refactor to make logic more reusable and testable
KlassyKat Apr 28, 2025
819b4ca
Realize I don't know how to spell candidates
KlassyKat Apr 28, 2025
cbc388d
refactor to be a little cleaner
KlassyKat Apr 28, 2025
299015a
don't create an empty config folder
KlassyKat Apr 28, 2025
9ea0d0d
Add unit tests
KlassyKat Apr 28, 2025
cde05b1
Update docs to reflect new behavior
KlassyKat Apr 28, 2025
e8440c2
Add changelog item
KlassyKat Apr 29, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .clippy.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
msrv = "1.70.0"
msrv = "1.81.0"
cognitive-complexity-threshold = 18
59 changes: 55 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
rust: [nightly, stable, '1.70']
rust: [nightly, stable, '1.81']
runs-on: ${{ matrix.os }}
continue-on-error: ${{ matrix.rust == 'nightly' }}

Expand All @@ -41,6 +41,9 @@ jobs:
toolchain: ${{ matrix.rust }}
components: clippy

- name: Override rust toolchain
run: rustup override set ${{ matrix.rust }}

- name: Rustup Show
run: rustup show

Expand Down Expand Up @@ -89,7 +92,7 @@ jobs:
strategy:
fail-fast: false
matrix:
rust: [nightly, stable, '1.70']
rust: [nightly, stable, '1.81']
continue-on-error: ${{ matrix.rust == 'nightly' }}
steps:
- uses: actions/checkout@v4
Expand All @@ -112,6 +115,12 @@ jobs:
- name: Manually install target
run: rustup target add x86_64-unknown-linux-musl

- name: Override rust toolchain
run: rustup override set ${{ matrix.rust }}

- name: Rustup Show
run: rustup show

- name: Setup MUSL
run: |
sudo apt-get -qq install musl-tools
Expand All @@ -135,7 +144,7 @@ jobs:
strategy:
fail-fast: false
matrix:
rust: [nightly, stable, '1.70']
rust: [nightly, stable, '1.81']
continue-on-error: ${{ matrix.rust == 'nightly' }}
steps:
- uses: actions/checkout@v4
Expand All @@ -151,6 +160,10 @@ jobs:
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ matrix.rust }}

- name: Override rust toolchain
run: rustup override set ${{ matrix.rust }}

- name: Setup ARM toolchain
run: |
rustup target add aarch64-unknown-linux-gnu
Expand All @@ -166,6 +179,9 @@ jobs:
echo "$GITHUB_WORKSPACE/gcc-arm-8.2-2018.08-x86_64-aarch64-linux-gnu/bin" >> $GITHUB_PATH
echo "$GITHUB_WORKSPACE/gcc-arm-8.2-2018.08-x86_64-arm-linux-gnueabihf/bin" >> $GITHUB_PATH

- name: Rustup Show
run: rustup show

- name: Build Debug
run: |
make build-linux-arm-debug
Expand All @@ -179,7 +195,7 @@ jobs:
strategy:
fail-fast: false
matrix:
rust: [nightly, stable, '1.70']
rust: [nightly, stable, '1.81']
continue-on-error: ${{ matrix.rust == 'nightly' }}
steps:
- uses: actions/checkout@v4
Expand All @@ -195,9 +211,16 @@ jobs:
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ matrix.rust }}

- name: Override rust toolchain
run: rustup override set ${{ matrix.rust }}

- name: Setup target
run: rustup target add x86_64-apple-darwin

- name: Rustup Show
run: rustup show

- name: Build Debug
run: |
make build-apple-x86-debug
Expand Down Expand Up @@ -275,3 +298,31 @@ jobs:
with:
name: release-notes.txt
path: ./release-notes.txt

test-homebrew:
name: Test Homebrew Formula (macOS)
runs-on: macos-latest
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Install stable Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable

- name: Install Homebrew
run: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"

- name: Set up Homebrew in PATH
run: |
echo "$HOMEBREW_PREFIX/bin:$HOMEBREW_PREFIX/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" >> $GITHUB_PATH

- name: Update Homebrew
run: brew update

- name: Let Homebrew build gitui from source
run: brew install --head --build-from-source gitui

- name: Run Homebrew test
run: brew test gitui
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,20 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## Unreleased
* execute git-hooks directly if possible (on *nix) else use sh instead of bash (without reading SHELL variable) [[@Joshix](https://github.com/Joshix-1)] ([#2483](https://github.com/extrawurst/gitui/pull/2483))

### Added
* Files and status tab support pageUp and pageDown [[@fatpandac](https://github.com/fatpandac)] ([#1951](https://github.com/extrawurst/gitui/issues/1951))
* support loading custom syntax highlighting themes from a file [[@acuteenvy](https://github.com/acuteenvy)] ([#2565](https://github.com/gitui-org/gitui/pull/2565))
* Select syntax highlighting theme out of the defaults from syntect [[@vasilismanol](https://github.com/vasilismanol)] ([#1931](https://github.com/extrawurst/gitui/issues/1931))
* new command-line option to override the default log file path (`--logfile`) [[@acuteenvy](https://github.com/acuteenvy)] ([#2539](https://github.com/gitui-org/gitui/pull/2539))
* dx: `make check` checks Cargo.toml dependency ordering using `cargo sort` [[@naseschwarz](https://github.com/naseschwarz)]
* add `use_selection_fg` to theme file to allow customizing selection foreground color [[@Upsylonbare](https://github.com/Upsylonbare)] ([#2515](https://github.com/gitui-org/gitui/pull/2515))

### Changed
* Respect `XDG_CONFIG_HOME` and `XDG_CACHE_HOME` irrespective of OS [[@KlassyKat](https://github.com/KlassyKat)] ([#1498](https://github.com/gitui-org/gitui/issues/1498))
* improve error messages [[@acuteenvy](https://github.com/acuteenvy)] ([#2617](https://github.com/gitui-org/gitui/pull/2617))
* increase MSRV from 1.70 to 1.81 [[@naseschwarz](https://github.com/naseschwarz)] ([#2094](https://github.com/gitui-org/gitui/issues/2094))
* improve syntax highlighting file detection [[@acuteenvy](https://github.com/acuteenvy)] ([#2524](https://github.com/extrawurst/gitui/pull/2524))
* Updated project links to point to `gitui-org` instead of `extrawurst` [[@vasleymus](https://github.com/vasleymus)] ([#2538](https://github.com/gitui-org/gitui/pull/2538))
* After commit: jump back to unstaged area [[@tommady](https://github.com/tommady)] ([#2476](https://github.com/extrawurst/gitui/issues/2476))
Expand All @@ -24,6 +29,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* set the terminal title to `gitui ({repo_path})` [[@acuteenvy](https://github.com/acuteenvy)] ([#2462](https://github.com/gitui-org/gitui/issues/2462))
* respect `.mailmap` [[@acuteenvy](https://github.com/acuteenvy)] ([#2406](https://github.com/gitui-org/gitui/issues/2406))

### Fixes
* resolve `core.hooksPath` relative to `GIT_WORK_TREE` [[@naseschwarz](https://github.com/naseschwarz)] ([#2571](https://github.com/gitui-org/gitui/issues/2571))
* yanking commit ranges no longer generates incorrect dotted range notations, but lists each individual commit [[@naseschwarz](https://github.com/naseschwarz)] (https://github.com/gitui-org/gitui/issues/2576)

## [0.27.0] - 2024-01-14

**new: manage remotes**
Expand Down
Loading
Loading