mirror of
https://github.com/gitui-org/gitui
synced 2026-05-22 16:38:28 +00:00
fix: fix typos (#2092)
This commit is contained in:
parent
5cff3221a1
commit
c629070ea5
13 changed files with 15 additions and 15 deletions
2
.github/PULL_REQUEST_TEMPLATE.md
vendored
2
.github/PULL_REQUEST_TEMPLATE.md
vendored
|
|
@ -1,6 +1,6 @@
|
|||
<!---
|
||||
Thank you for contributing to GitUI! Please fill out the template below, and remove or add any
|
||||
information as you feel neccesary.
|
||||
information as you feel necessary.
|
||||
--->
|
||||
|
||||
This Pull Request fixes/closes #{issue_num}.
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ These defaults require some adoption from existing users but feel more natural t
|
|||
|
||||
#### key binding bitflags
|
||||
|
||||
Modfiers like `SHIFT` or `CONTROL` are no longer configured via magic bitflags but via strings thanks to changes in the [bitflags crate](https://github.com/bitflags/bitflags/blob/main/CHANGELOG.md#changes-to-serde-serialization) we depend on. Please see [KEY_CONFIG.md](./KEY_CONFIG.md) or [vim_style_key_config.ron](./vim_style_key_config.ron) for more info and examples.
|
||||
Modifiers like `SHIFT` or `CONTROL` are no longer configured via magic bitflags but via strings thanks to changes in the [bitflags crate](https://github.com/bitflags/bitflags/blob/main/CHANGELOG.md#changes-to-serde-serialization) we depend on. Please see [KEY_CONFIG.md](./KEY_CONFIG.md) or [vim_style_key_config.ron](./vim_style_key_config.ron) for more info and examples.
|
||||
|
||||
### Added
|
||||
* support for new-line in text-input (e.g. commit message editor) [[@pm100]](https://github/pm100) ([#1662](https://github.com/extrawurst/gitui/issues/1662)).
|
||||
|
|
|
|||
|
|
@ -223,7 +223,7 @@ All contain a single binary file
|
|||
- perl >= 5.12 (strawberry perl works for windows https://strawberryperl.com/)
|
||||
- a c compiler (msvc, gcc or clang, cargo will find it)
|
||||
|
||||
- To run the complete test suite python is required (and it must be invokable as `python`)
|
||||
- To run the complete test suite python is required (and it must be invocable as `python`)
|
||||
|
||||
### Cargo Install
|
||||
|
||||
|
|
@ -233,7 +233,7 @@ The simplest way to start playing around with `gitui` is to have `cargo` build a
|
|||
#### trace-libgit
|
||||
enable `libgit2` tracing
|
||||
|
||||
works if `libgit2` builded with `-DENABLE_TRACE=ON`
|
||||
works if `libgit2` built with `-DENABLE_TRACE=ON`
|
||||
|
||||
this feature enabled by default, to disable: `cargo install --no-default-features`
|
||||
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ pub struct FileBlame {
|
|||
pub lines: Vec<(Option<BlameHunk>, String)>,
|
||||
}
|
||||
|
||||
/// fixup `\` windows path seperators to git compatible `/`
|
||||
/// fixup `\` windows path separators to git compatible `/`
|
||||
fn fixup_windows_path(path: &str) -> String {
|
||||
#[cfg(windows)]
|
||||
{
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ pub fn get_config_string_repo(
|
|||
|
||||
let cfg = repo.config()?;
|
||||
|
||||
// this code doesnt match what the doc says regarding what
|
||||
// this code doesn't match what the doc says regarding what
|
||||
// gets returned when but it actually works
|
||||
let entry_res = cfg.get_entry(key);
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ const CONFIG_HOOKS_PATH: &str = "core.hooksPath";
|
|||
const DEFAULT_HOOKS_PATH: &str = "hooks";
|
||||
|
||||
impl HookPaths {
|
||||
/// `core.hooksPath` always takes precendence.
|
||||
/// `core.hooksPath` always takes precedence.
|
||||
/// If its defined and there is no hook `hook` this is not considered
|
||||
/// an error or a reason to search in other paths.
|
||||
/// If the config is not set we go into search mode and
|
||||
|
|
|
|||
|
|
@ -2,4 +2,4 @@
|
|||
|
||||
*just for testing invalid string data*
|
||||
|
||||
This crate is part of the [gitui](http://gitui.org) project. We need this to be a seperate crate so that `asyncgit` can remain forbidding `unsafe`.
|
||||
This crate is part of the [gitui](http://gitui.org) project. We need this to be a separate crate so that `asyncgit` can remain forbidding `unsafe`.
|
||||
|
|
@ -19,7 +19,7 @@ fn foo(){
|
|||
}
|
||||
```
|
||||
|
||||
the resulting log looks someting like this:
|
||||
the resulting log looks something like this:
|
||||
```
|
||||
19:45:00 [TRACE] (7) scopetime: [scopetime/src/lib.rs:34] scopetime: 2 ms [my_crate::foo] @my_crate/src/bar.rs:5
|
||||
```
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ impl ChangesComponent {
|
|||
let config =
|
||||
self.options.borrow().status_show_untracked();
|
||||
|
||||
//TODO: check if we can handle the one file case with it aswell
|
||||
//TODO: check if we can handle the one file case with it as well
|
||||
sync::stage_add_all(
|
||||
&self.repo.borrow(),
|
||||
tree_item.info.full_path.as_str(),
|
||||
|
|
|
|||
|
|
@ -568,7 +568,7 @@ impl DiffComponent {
|
|||
|
||||
fn stage_lines(&self) {
|
||||
if let Some(diff) = &self.diff {
|
||||
//TODO: support untracked files aswell
|
||||
//TODO: support untracked files as well
|
||||
if !diff.untracked {
|
||||
let selected_lines = self.selected_lines();
|
||||
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ impl SyntaxTextComponent {
|
|||
.is_some_and(|(current_file, _)| current_file == &path);
|
||||
|
||||
if !already_loaded {
|
||||
//TODO: fetch file content async aswell
|
||||
//TODO: fetch file content async as well
|
||||
match sync::tree_file_content(&self.repo.borrow(), item) {
|
||||
Ok(content) => {
|
||||
let content = tabs_to_spaces(content);
|
||||
|
|
|
|||
|
|
@ -370,7 +370,7 @@ fn start_terminal(buf: Stdout) -> io::Result<Terminal> {
|
|||
Ok(terminal)
|
||||
}
|
||||
|
||||
// do log::error! and eprintln! in one line, pass sting, error and backtrace
|
||||
// do log::error! and eprintln! in one line, pass string, error and backtrace
|
||||
macro_rules! log_eprintln {
|
||||
($string:expr, $e:expr, $bt:expr) => {
|
||||
log::error!($string, $e, $bt);
|
||||
|
|
|
|||
|
|
@ -42,8 +42,8 @@ impl DrawableComponent for MsgPopup {
|
|||
if max > std::u16::MAX as usize {
|
||||
max = std::u16::MAX as usize;
|
||||
}
|
||||
let mut width =
|
||||
u16::try_from(max).expect("cant fail due to check above");
|
||||
let mut width = u16::try_from(max)
|
||||
.expect("can't fail due to check above");
|
||||
// dont overflow screen, and dont get too narrow
|
||||
if width > f.size().width {
|
||||
width = f.size().width;
|
||||
|
|
|
|||
Loading…
Reference in a new issue