Skip to content

Commit 2bbaa6f

Browse files
extrawurstextrawurst
committed
fix a bunch more typos
1 parent 5dad9f4 commit 2bbaa6f

33 files changed

+97
-87
lines changed

‎CHANGELOG.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ Bugfix followup release - check `0.22.0` notes for more infos!
212212
### Added
213213
* stack popups ([#846](https://github.com/extrawurst/gitui/issues/846))
214214
* file history log [[@cruessler](https://github.com/cruessler)] ([#381](https://github.com/extrawurst/gitui/issues/381))
215-
* termux support on andriod [[@PeroSar](https://github.com/PeroSar)] ([#1139](https://github.com/extrawurst/gitui/issues/1139))
215+
* termux support on android [[@PeroSar](https://github.com/PeroSar)] ([#1139](https://github.com/extrawurst/gitui/issues/1139))
216216
* use `GIT_DIR` and `GIT_WORK_DIR` from environment if set ([#1191](https://github.com/extrawurst/gitui/pull/1191))
217217
* new [FAQ](./FAQ.md)s page
218218
* mention macports in install section [[@fs111](https://github.com/fs111)]([#1237](https://github.com/extrawurst/gitui/pull/1237))
@@ -648,7 +648,7 @@ Thanks for your interest and support over this year! Read more about the 1 year
648648
- min size for relative popups on small terminals ([#179](https://github.com/extrawurst/gitui/issues/179))
649649
- fix crash on resizing terminal to very small width ([#198](https://github.com/extrawurst/gitui/issues/198))
650650
- fix broken tags when using a different internal representation ([#206](https://github.com/extrawurst/gitui/issues/206))
651-
- tags are not cleanly seperated in details view ([#212](https://github.com/extrawurst/gitui/issues/212))
651+
- tags are not cleanly separated in details view ([#212](https://github.com/extrawurst/gitui/issues/212))
652652

653653
## [0.8.1] - 2020-07-07
654654

@@ -814,7 +814,7 @@ Thanks for your interest and support over this year! Read more about the 1 year
814814
### Changed
815815

816816
- show longer commit messages in log view
817-
- introduce propper error handling in `asyncgit` [[@MCord](https://github.com/MCord)]([#53](https://github.com/extrawurst/gitui/issues/53))
817+
- introduce proper error handling in `asyncgit` [[@MCord](https://github.com/MCord)]([#53](https://github.com/extrawurst/gitui/issues/53))
818818
- better error message when trying to run outside of a valid git repo ([#56](https://github.com/extrawurst/gitui/issues/56))
819819
- improve ctrl+c handling so it is checked first and no component needs to worry of blocking it
820820

‎asyncgit/src/asyncjob/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ impl<T: Copy + Send, P: Clone + Send + Sync + PartialEq>
2121
/// send an intermediate update notification.
2222
/// do not confuse this with the return value of `run`.
2323
/// `send` should only be used about progress notifications
24-
/// and not for the final notifcation indicating the end of the async job.
24+
/// and not for the final notification indicating the end of the async job.
2525
/// see `run` for more info
2626
pub fn send(&self, notification: T) -> Result<()> {
2727
self.sender.send(notification)?;
@@ -191,10 +191,10 @@ mod test {
191191
value_to_add: u32,
192192
}
193193

194-
type TestNotificaton = ();
194+
type TestNotification = ();
195195

196196
impl AsyncJob for TestJob {
197-
type Notification = TestNotificaton;
197+
type Notification = TestNotification;
198198
type Progress = ();
199199

200200
fn run(

‎asyncgit/src/remote_progress.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ impl RemoteProgress {
6666
Ok(())
6767
}
6868

69-
/// spawn thread to listen to progress notifcations coming in from blocking remote git method (fetch/push)
69+
/// spawn thread to listen to progress notifications coming in from blocking remote git method (fetch/push)
7070
pub(crate) fn spawn_receiver_thread<
7171
T: 'static + AsyncProgress,
7272
>(

‎asyncgit/src/sync/branch/merge_commit.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ mod test {
263263
)
264264
.unwrap();
265265

266-
//this should not have commited cause we left conflicts behind
266+
//this should not have committed cause we left conflicts behind
267267
assert_eq!(res, None);
268268

269269
let state = crate::sync::repo_state(

‎asyncgit/src/sync/branch/merge_rebase.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use crate::{
1010
use git2::BranchType;
1111
use scopetime::scope_time;
1212

13-
/// trys merging current branch with its upstrema using rebase
13+
/// tries merging current branch with its upstream using rebase
1414
pub fn merge_upstream_rebase(
1515
repo_path: &RepoPath,
1616
branch_name: &str,

‎asyncgit/src/sync/branch/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ pub fn checkout_remote_branch(
384384
if let Err(e) = repo.checkout_head(Some(
385385
git2::build::CheckoutBuilder::new().force(),
386386
)) {
387-
// This is safe beacuse cur_ref was just found
387+
// This is safe because cur_ref was just found
388388
repo.set_head(bytes2string(cur_ref.name_bytes())?.as_str())?;
389389
return Err(Error::Git(e));
390390
}

‎asyncgit/src/sync/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ mod tests {
318318
eprintln!("\n----\n{cmd}");
319319
}
320320

321-
/// helper to fetch commmit details using log walker
321+
/// helper to fetch commit details using log walker
322322
pub fn get_commit_ids(
323323
r: &Repository,
324324
max_count: usize,

‎asyncgit/src/sync/remotes/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ mod tests {
254254
&format!("git remote add origin {remote_path}")[..],
255255
);
256256

257-
//NOTE: aparently remotes are not chronolically sorted but alphabetically
257+
//NOTE: apparently remotes are not chronolically sorted but alphabetically
258258
let remotes = get_remotes(repo_path).unwrap();
259259

260260
assert_eq!(

‎asyncgit/src/sync/reword.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ fn get_current_branch(
4949
/// Changes the commit message of a commit with a specified oid
5050
///
5151
/// While this function is most commonly associated with doing a
52-
/// reword opperation in an interactive rebase, that is not how it
52+
/// reword operation in an interactive rebase, that is not how it
5353
/// is implemented in git2rs
5454
///
5555
/// This is dangerous if it errors, as the head will be detached so this should

‎asyncgit/src/sync/staging/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,13 @@ pub(crate) fn apply_selection(
100100
};
101101

102102
if !first_hunk_encountered {
103-
let any_slection_in_hunk =
103+
let any_selection_in_hunk =
104104
hunk.lines.iter().any(|line| {
105105
let line: DiffLinePosition = line.into();
106106
lines.contains(&line)
107107
});
108108

109-
first_hunk_encountered = any_slection_in_hunk;
109+
first_hunk_encountered = any_selection_in_hunk;
110110
}
111111

112112
if first_hunk_encountered {

‎asyncgit/src/sync/stash.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ mod tests {
213213
}
214214

215215
#[test]
216-
fn test_stash_without_2nd_parent() -> Result<()> {
216+
fn test_stash_without_second_parent() -> Result<()> {
217217
let file_path1 = Path::new("file1.txt");
218218
let (_td, repo) = repo_init()?;
219219
let root = repo.path().parent().unwrap();

‎asyncgit/src/sync/status.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ pub fn is_workdir_clean(
126126
Ok(statuses.is_empty())
127127
}
128128

129-
/// gurantees sorting
129+
/// guarantees sorting
130130
pub fn get_status(
131131
repo_path: &RepoPath,
132132
status_type: StatusType,

‎filetreelist/src/filetreeitems.rs

+16-16
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ mod tests {
590590
assert_eq!(it.next(), None);
591591
}
592592

593-
pub fn get_visibles(tree: &FileTreeItems) -> Vec<bool> {
593+
pub fn get_visible(tree: &FileTreeItems) -> Vec<bool> {
594594
tree.tree_items
595595
.iter()
596596
.map(|e| e.info().is_visible())
@@ -614,7 +614,7 @@ mod tests {
614614

615615
tree.collapse(1, false);
616616

617-
let visibles = get_visibles(&tree);
617+
let visibles = get_visible(&tree);
618618

619619
assert_eq!(
620620
visibles,
@@ -628,7 +628,7 @@ mod tests {
628628

629629
tree.expand(1, false);
630630

631-
let visibles = get_visibles(&tree);
631+
let visibles = get_visible(&tree);
632632

633633
assert_eq!(
634634
visibles,
@@ -661,7 +661,7 @@ mod tests {
661661
tree.collapse(0, false);
662662

663663
assert_eq!(
664-
get_visibles(&tree),
664+
get_visible(&tree),
665665
vec![
666666
true, //
667667
false, //
@@ -674,7 +674,7 @@ mod tests {
674674
tree.expand(0, false);
675675

676676
assert_eq!(
677-
get_visibles(&tree),
677+
get_visible(&tree),
678678
vec![
679679
true, //
680680
true, //
@@ -702,7 +702,7 @@ mod tests {
702702

703703
tree.collapse(0, false);
704704

705-
let visibles = get_visibles(&tree);
705+
let visibles = get_visible(&tree);
706706

707707
assert_eq!(
708708
visibles,
@@ -732,7 +732,7 @@ mod tests {
732732

733733
tree.collapse(1, false);
734734

735-
let visibles = get_visibles(&tree);
735+
let visibles = get_visible(&tree);
736736

737737
assert_eq!(
738738
visibles,
@@ -746,7 +746,7 @@ mod tests {
746746

747747
tree.collapse(0, false);
748748

749-
let visibles = get_visibles(&tree);
749+
let visibles = get_visible(&tree);
750750

751751
assert_eq!(
752752
visibles,
@@ -760,10 +760,10 @@ mod tests {
760760

761761
tree.expand(0, false);
762762

763-
let visibles = get_visibles(&tree);
763+
let visible = get_visible(&tree);
764764

765765
assert_eq!(
766-
visibles,
766+
visible,
767767
vec![
768768
true, //
769769
true, //
@@ -799,7 +799,7 @@ mod tests {
799799
assert!(!tree.tree_items[3].kind().is_path_collapsed());
800800

801801
assert_eq!(
802-
get_visibles(&tree),
802+
get_visible(&tree),
803803
vec![
804804
true, //
805805
true, //
@@ -828,7 +828,7 @@ mod tests {
828828
tree.collapse(0, true);
829829

830830
assert_eq!(
831-
get_visibles(&tree),
831+
get_visible(&tree),
832832
vec![
833833
true, //
834834
false, //
@@ -840,7 +840,7 @@ mod tests {
840840
assert_eq!(res, 2);
841841

842842
assert_eq!(
843-
get_visibles(&tree),
843+
get_visible(&tree),
844844
vec![
845845
true, //
846846
true, //
@@ -872,7 +872,7 @@ mod tests {
872872
assert_eq!(res, 4);
873873

874874
assert_eq!(
875-
get_visibles(&tree),
875+
get_visible(&tree),
876876
vec![
877877
true, //
878878
true, //
@@ -898,7 +898,7 @@ mod tests {
898898
tree.collapse(0, true);
899899

900900
assert_eq!(
901-
get_visibles(&tree),
901+
get_visible(&tree),
902902
vec![
903903
true, //
904904
false, //
@@ -911,7 +911,7 @@ mod tests {
911911
assert!(!tree.tree_items[0].kind().is_path_collapsed());
912912

913913
assert_eq!(
914-
get_visibles(&tree),
914+
get_visible(&tree),
915915
vec![
916916
true, //
917917
true, //

‎src/components/changes.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ impl ChangesComponent {
7272
}
7373

7474
///
75-
pub fn is_file_seleted(&self) -> bool {
76-
self.files.is_file_seleted()
75+
pub fn is_file_selected(&self) -> bool {
76+
self.files.is_file_selected()
7777
}
7878

7979
fn index_add_remove(&mut self) -> Result<bool> {

‎src/components/commit_details/details.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ impl DetailsComponent {
184184
if let Some(ref committer) = data.committer {
185185
res.extend(vec![
186186
Line::from(vec![
187-
style_detail(&self.theme, &Detail::Commiter),
187+
style_detail(&self.theme, &Detail::Committer),
188188
Span::styled(
189189
Cow::from(format!(
190190
"{} <{}>",

‎src/components/commit_details/style.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use std::borrow::Cow;
55
pub enum Detail {
66
Author,
77
Date,
8-
Commiter,
8+
Committer,
99
Sha,
1010
Message,
1111
}
@@ -23,7 +23,7 @@ pub fn style_detail<'a>(
2323
Cow::from(strings::commit::details_date()),
2424
theme.text(false, false),
2525
),
26-
Detail::Commiter => Span::styled(
26+
Detail::Committer => Span::styled(
2727
Cow::from(strings::commit::details_committer()),
2828
theme.text(false, false),
2929
),

‎src/components/status_tree.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ impl StatusTreeComponent {
119119
}
120120

121121
///
122-
pub fn is_file_seleted(&self) -> bool {
122+
pub fn is_file_selected(&self) -> bool {
123123
self.tree.selected_item().map_or(false, |item| {
124124
match item.kind {
125125
FileTreeItemKind::File(_) => true,

‎src/components/utils/logitems.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ impl ItemBatch {
109109
self.items.iter()
110110
}
111111

112-
/// clear curent list of items
112+
/// clear current list of items
113113
pub fn clear(&mut self) {
114114
self.items.clear();
115115
self.index_offset = None;

‎src/components/utils/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ macro_rules! try_or_popup {
2626
};
2727
}
2828

29-
/// helper func to convert unix time since epoch to formated time string in local timezone
29+
/// helper func to convert unix time since epoch to formatted time string in local timezone
3030
pub fn time_to_string(secs: i64, short: bool) -> String {
3131
let time = DateTime::<Local>::from(
3232
DateTime::<Utc>::from_naive_utc_and_offset(

0 commit comments

Comments
 (0)