ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

style: fix typos found by codespell

Browse source
This commit is contained in:
Samuel Tardieu 2023-01-28 08:35:45 +01:00 committed by Martin von Zweigbergk
parent 567a05d7ec
commit a7aed0171d
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/config.md
View file

@ -276,7 +276,7 @@ for both of these files to exist.
[XDG specification]: https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
The location of the `jj` config file can also be overriden with the
The location of the `jj` config file can also be overridden with the
`JJ_CONFIG` environment variable. If it is not empty, it should contain the path
to a TOML file that will be used instead of any configuration file in the
default locations. For example,

2
docs/github.md
View file

@ -121,7 +121,7 @@ Log all revisions which you authored, across all branches which aren't on any
remote
`jj log -r 'author(your@email.com) & branches() & ~remote_branches()'`
Log all remote branches, which you authored or committed to
`jj log -r 'remote_branches() & (comitter(your@email.com) | author(your@email.com))'`
`jj log -r 'remote_branches() & (committer(your@email.com) | author(your@email.com))'`
Log all descendants of the current working copy, which aren't on a remote
`jj log -r ':@ & ~remote_branches()'`

2
docs/revsets.md
View file

@ -91,7 +91,7 @@ revsets (expressions) as arguments.
the branch `main`. If a branch is in a conflicted state, all its possible
targets are included.
* `remote_branches([branch_needle[, remote_needle]])`: All remote branch
targets across all remotes. If just the `branch_needle` is specificed,
targets across all remotes. If just the `branch_needle` is specified,
branches whose name contains the given string across all remotes are
selected. If both `branch_needle` and `remote_needle` are specified, the
selection is further restricted to just the remotes whose name contains

2
docs/tutorial.md
View file

@ -31,7 +31,7 @@ The working copy is clean
We can see from the output above that our working copy has a commit ID
(`265ecf5cab2d` in the example).
Let's check out a particular commit, so we get more predicable output:
Let's check out a particular commit, so we get more predictable output:
```shell script
$ jj co 080a9b37ff7e
Working copy now at: 608c179a60df

8
lib/src/revset.rs
View file

@ -618,7 +618,7 @@ impl RevsetAliasDeclaration {
.into_inner()
.map(|pair| match pair.as_rule() {
Rule::identifier => pair.as_str().to_owned(),
r => panic!("unxpected formal parameter rule {r:?}"),
r => panic!("unexpected formal parameter rule {r:?}"),
})
.collect_vec();
if params.iter().all_unique() {
@ -630,7 +630,7 @@ impl RevsetAliasDeclaration {
))
}
}
r => panic!("unxpected alias declaration rule {r:?}"),
r => panic!("unexpected alias declaration rule {r:?}"),
}
}
}
@ -795,7 +795,7 @@ fn parse_primary_rule(
}
Rule::symbol => parse_symbol_rule(first.into_inner(), state),
_ => {
panic!("unxpected revset parse rule: {:?}", first.as_str());
panic!("unexpected revset parse rule: {:?}", first.as_str());
}
}
}
@ -831,7 +831,7 @@ fn parse_symbol_rule(
));
}
_ => {
panic!("unxpected symbol parse rule: {:?}", first.as_str());
panic!("unexpected symbol parse rule: {:?}", first.as_str());
}
}
}

2
lib/src/working_copy.rs
View file

@ -74,7 +74,7 @@ impl FileState {
fn for_symlink(metadata: &Metadata) -> Self {
// When using fscrypt, the reported size is not the content size. So if
// we were to record the content size here (like we do for regular files), we
// would end up thinking the file has changed everytime we snapshot.
// would end up thinking the file has changed every time we snapshot.
FileState {
file_type: FileType::Symlink,
mtime: mtime_from_metadata(metadata),