Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ but this also allows us now to define colors in the common hex format:
Checkout [THEMES.md](./THEMES.md) for more info.

### Added
* due to github runner changes, the regular mac build is now arm64, so we added support for intel x86 apple build in nightlies and releases (via separat artifact)
* due to github runner changes, the regular mac build is now arm64, so we added support for intel x86 apple build in nightlies and releases (via separate artifact)
* support `BUILD_GIT_COMMIT_ID` enabling builds from `git archive` generated source tarballs or other outside a git repo [[@alerque](https://github.com/alerque)] ([#2187](https://github.com/gitui-org/gitui/pull/2187))

### Fixes
Expand Down Expand Up @@ -908,7 +908,7 @@ Thanks for your interest and support over this year! Read more about the 1 year
- log tab refreshes when head changes ([#78](https://github.com/gitui-org/gitui/issues/78))
- performance optimization of the log tab in big repos
- more readable default color for the commit hash in the log tab
- more error/panic resiliance (`unwrap`/`panic` denied by clippy now) [[@MCord](https://github.com/MCord)](<[#77](https://github.com/gitui-org/gitui/issues/77)>)
- more error/panic resilience (`unwrap`/`panic` denied by clippy now) [[@MCord](https://github.com/MCord)](<[#77](https://github.com/gitui-org/gitui/issues/77)>)

### Fixes

Expand Down
8 changes: 4 additions & 4 deletions asyncgit/src/sync/branch/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -715,13 +715,13 @@ mod tests_branches {
&root.as_os_str().to_str().unwrap().into();

let branch_name = "master";
let upstrem_merge = "refs/heads/master";
let upstream_merge = "refs/heads/master";

let mut config = repo.config().unwrap();
config
.set_str(
&format!("branch.{branch_name}.merge"),
upstrem_merge,
upstream_merge,
)
.expect("fail set branch merge config");

Expand All @@ -732,7 +732,7 @@ mod tests_branches {
.is_ok_and(|v| v.as_ref().is_some()));
assert_eq!(
&upstream_merge_res.unwrap().unwrap(),
upstrem_merge
upstream_merge
);
}
}
Expand Down Expand Up @@ -1017,7 +1017,7 @@ mod test_remote_branches {
}

#[test]
fn test_checkout_remote_branch_hirachical() {
fn test_checkout_remote_branch_hierarchical() {
let (r1_dir, _repo) = repo_init_bare().unwrap();

let (clone1_dir, clone1) =
Expand Down
2 changes: 1 addition & 1 deletion asyncgit/src/sync/remotes/push.rs
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ pub fn push_branch(
)
}

//TODO: clenaup
//TODO: cleanup
#[allow(clippy::too_many_arguments)]
pub fn push_raw(
repo_path: &RepoPath,
Expand Down
6 changes: 3 additions & 3 deletions git2-hooks/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ exit 0
}

#[test]
fn test_other_path_precendence() {
fn test_other_path_precedence() {
let (td, repo) = repo_init();

{
Expand Down Expand Up @@ -493,7 +493,7 @@ exit 1
fn test_pre_commit_py() {
let (_td, repo) = repo_init();

// mirror how python pre-commmit sets itself up
// mirror how python pre-commit sets itself up
#[cfg(not(windows))]
let hook = b"#!/usr/bin/env python
import sys
Expand All @@ -514,7 +514,7 @@ sys.exit(0)
fn test_pre_commit_fail_py() {
let (_td, repo) = repo_init();

// mirror how python pre-commmit sets itself up
// mirror how python pre-commit sets itself up
#[cfg(not(windows))]
let hook = b"#!/usr/bin/env python
import sys
Expand Down
2 changes: 1 addition & 1 deletion src/clipboard.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ fn exec_copy_with_args(
}

// Implementation taken from https://crates.io/crates/wsl.
// Using /proc/sys/kernel/osrelease as an authoratative source
// Using /proc/sys/kernel/osrelease as an authoritative source
// based on this comment: https://github.com/microsoft/WSL/issues/423#issuecomment-221627364
#[cfg(all(target_family = "unix", not(target_os = "macos")))]
fn is_wsl() -> bool {
Expand Down
8 changes: 4 additions & 4 deletions src/input.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use crate::notify_mutex::NotifyableMutex;
use crate::notify_mutex::NotifiableMutex;
use anyhow::Result;
use crossbeam_channel::{unbounded, Receiver, Sender};
use crossterm::event::{self, Event, Event::Key, KeyEventKind};
Expand Down Expand Up @@ -31,7 +31,7 @@ pub enum InputEvent {
///
#[derive(Clone)]
pub struct Input {
desired_state: Arc<NotifyableMutex<bool>>,
desired_state: Arc<NotifiableMutex<bool>>,
current_state: Arc<AtomicBool>,
receiver: Receiver<InputEvent>,
aborted: Arc<AtomicBool>,
Expand All @@ -42,7 +42,7 @@ impl Input {
pub fn new() -> Self {
let (tx, rx) = unbounded();

let desired_state = Arc::new(NotifyableMutex::new(true));
let desired_state = Arc::new(NotifiableMutex::new(true));
let current_state = Arc::new(AtomicBool::new(true));
let aborted = Arc::new(AtomicBool::new(false));

Expand Down Expand Up @@ -100,7 +100,7 @@ impl Input {
}

fn input_loop(
arc_desired: &Arc<NotifyableMutex<bool>>,
arc_desired: &Arc<NotifiableMutex<bool>>,
arc_current: &Arc<AtomicBool>,
tx: &Sender<InputEvent>,
) -> Result<()> {
Expand Down
4 changes: 2 additions & 2 deletions src/notify_mutex.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ use std::sync::{Arc, Condvar, Mutex};

/// combines a `Mutex` and `Condvar` to allow waiting for a change in the variable protected by the `Mutex`
#[derive(Clone, Debug)]
pub struct NotifyableMutex<T>
pub struct NotifiableMutex<T>
where
T: Send + Sync,
{
data: Arc<(Mutex<T>, Condvar)>,
}

impl<T> NotifyableMutex<T>
impl<T> NotifiableMutex<T>
where
T: Send + Sync,
{
Expand Down
4 changes: 2 additions & 2 deletions src/popups/taglist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ impl TagListPopup {
EMPTY_SYMBOL
};

let has_attachement_str = if tag.annotation.is_some() {
let has_attachment_str = if tag.annotation.is_some() {
ATTACHMENT_SYMBOL
} else {
EMPTY_SYMBOL
Expand All @@ -475,7 +475,7 @@ impl TagListPopup {
.style(self.theme.commit_time(false)),
Cell::from(tag.author.clone())
.style(self.theme.commit_author(false)),
Cell::from(has_attachement_str)
Cell::from(has_attachment_str)
.style(self.theme.text_danger()),
Cell::from(tag.message.clone())
.style(self.theme.text(true, false)),
Expand Down
Loading