Fix ambigous typos

This commit is contained in:
Yaroslav Halchenko 2023-03-13 18:55:18 -04:00 committed by Joey Hess
parent 1f124103dc
commit e018ae1125
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
9 changed files with 12 additions and 12 deletions

View file

@ -463,7 +463,7 @@ findAdjustingCommit (AdjBranch b) = go =<< catCommit b
- been propigated to the basis branch, and propigate them to the basis
- branch and from there on to the orig branch.
-
- After propigating the commits back to the basis banch,
- After propigating the commits back to the basis branch,
- rebase the adjusted branch on top of the updated basis branch.
-}
propigateAdjustedCommits :: OrigBranch -> Adjustment -> Annex ()

View file

@ -185,7 +185,7 @@ getNumMinCopiesAttr file =
{- Checks if numcopies are satisfied for a file by running a comparison
- between the number of (not untrusted) copies that are
- belived to exist, and the configured value.
- believed to exist, and the configured value.
-
- This is good enough for everything except dropping the file, which
- requires active verification of the copies.

View file

@ -48,7 +48,7 @@ start o = starting "forget" ai si $ do
perform :: Transitions -> Bool -> CommandPerform
perform ts True = do
recordTransitions (Branch.change (Branch.RegardingUUID [])) ts
-- get branch committed before contining with the transition
-- get branch committed before continuing with the transition
_ <- Branch.update
void $ Branch.performTransitions ts True []
next $ return True

View file

@ -15,7 +15,7 @@ symLinkMode :: FileMode
symLinkMode = 40960
{- Git uses a special file mode to indicate a symlink. This is the case
- even on Windows, so we hard code the valuse here, rather than using
- even on Windows, so we hard code the values here, rather than using
- System.Posix.Files.symbolicLinkMode. -}
isSymLink :: FileMode -> Bool
isSymLink = checkMode symLinkMode

View file

@ -108,9 +108,9 @@ mergeFile info file hashhandle h = case S8.words info of
-}
calcMerge :: [(Ref, [L8.ByteString])] -> Either Ref [L8.ByteString]
calcMerge shacontents
| null reuseable = Right new
| otherwise = Left $ fst $ Prelude.head reuseable
| null reusable = Right new
| otherwise = Left $ fst $ Prelude.head reusable
where
reuseable = filter (\c -> sorteduniq (snd c) == new) shacontents
reusable = filter (\c -> sorteduniq (snd c) == new) shacontents
new = sorteduniq $ concat $ map snd shacontents
sorteduniq = S.toList . S.fromList

4
NEWS
View file

@ -30,7 +30,7 @@ git-annex (8.20200226) upstream; urgency=medium
This version of git-annex uses repository version 8 for all repositories.
Existing repositories will be automatically upgraded by default.
You can prevent this, by runing: git config annex.autoupgraderepository false
You can prevent this, by running: git config annex.autoupgraderepository false
The upgrade process involves regenerating some sqlite databases. There are a
couple consequences of the upgrade to keep in mind:
@ -78,7 +78,7 @@ git-annex (7.20190912) upstream; urgency=medium
This version of git-annex uses repository version 7 for all repositories.
Existing v5 repositories will be automatically upgraded by default.
You can prevent this, by runing: git config annex.autoupgraderepository false
You can prevent this, by running: git config annex.autoupgraderepository false
A v7 repository can can have some files locked while other files are
unlocked, and all git and git-annex commands can be used on both locked and

View file

@ -239,7 +239,7 @@ removeChunks remover u chunkconfig encryptor k = do
- chunkKeys until it finds one where the retriever successfully
- gets the first chunked key.
-
- If retrival of one of the subsequent chunks throws an exception,
- If retrieval of one of the subsequent chunks throws an exception,
- gives up. Note that partial data may have been written to the file
- in this case.
-

View file

@ -706,7 +706,7 @@ test_move_numcopies = intmpclonerepo $ do
annexed_notpresent annexedfile
inmainrepo $ annexed_present annexedfile
git_annex "get" [annexedfile] "get of file"
git_annex_shouldfail "move" ["--from", "origin", annexedfile] "move of file --from remote that violates numcopies setting not allowd"
git_annex_shouldfail "move" ["--from", "origin", annexedfile] "move of file --from remote that violates numcopies setting not allowed"
git_annex_shouldfail "move" ["--to", "origin", annexedfile] "move of file --to remote that violates numcopies setting not allowed"
test_copy :: Assertion

View file

@ -113,7 +113,7 @@ calcNextTime schedule@(Schedule recurrance scheduledtime) lasttime currenttime
(LocalTime endd (TimeOfDay 23 59 0))
findfrom r afterday candidate
| ynum candidate > (ynum (localDay currenttime)) + 100 =
-- avoid possible infinite recusion
-- avoid possible infinite recursion
error $ "bug: calcNextTime did not find a time within 100 years to run " ++
show (schedule, lasttime, currenttime)
| otherwise = findfromChecked r afterday candidate