sped up the --all option by 2x to 16x by using git cat-file --buffer
This assumes that no location log files will have a newline or carriage
return in their name. catObjectStream skips any such files due to
cat-file not supporting them.
Keys have been prevented from containing newlines since 2011,
commit 480495beb4
. If some old repo
had a key with a newline in it, --all will just skip processing that key.
Other things, like .git/annex/unused files certianly assume no newlines in
keys too, and AFAICR, such keys never actually worked.
Carriage return is escaped by preSanitizeKeyName since 2013. WORM keys
generated before that point could perhaps contain a CR. (URL probably not,
http probably doesn't support an URL with a raw CR in it.) So, added
a warning in fsck about such keys. Although, fsck --all will naturally
skip them, so won't be able to warn about them. Not entirely
satisfactory, but I'll bet there are not really any such keys in
existence.
Thanks to Lukey for finding this optimisation.
This commit is contained in:
parent
98e2e3cb9c
commit
d010ab04be
5 changed files with 162 additions and 24 deletions
|
@ -27,7 +27,7 @@ backend = Backend
|
|||
, getKey = Just keyValue
|
||||
, verifyKeyContent = Nothing
|
||||
, canUpgradeKey = Just needsUpgrade
|
||||
, fastMigrate = Just removeSpaces
|
||||
, fastMigrate = Just removeProblemChars
|
||||
, isStableKey = const True
|
||||
}
|
||||
|
||||
|
@ -48,12 +48,13 @@ keyValue source _ = do
|
|||
, keyMtime = Just $ modificationTime stat
|
||||
}
|
||||
|
||||
{- Old WORM keys could contain spaces, and can be upgraded to remove them. -}
|
||||
{- Old WORM keys could contain spaces and carriage returns,
|
||||
- and can be upgraded to remove them. -}
|
||||
needsUpgrade :: Key -> Bool
|
||||
needsUpgrade key = ' ' `S8.elem` fromKey keyName key
|
||||
needsUpgrade key = any (`S8.elem` fromKey keyName key) [' ', '\r']
|
||||
|
||||
removeSpaces :: Key -> Backend -> AssociatedFile -> Annex (Maybe Key)
|
||||
removeSpaces oldkey newbackend _
|
||||
removeProblemChars :: Key -> Backend -> AssociatedFile -> Annex (Maybe Key)
|
||||
removeProblemChars oldkey newbackend _
|
||||
| migratable = return $ Just $ alterKey oldkey $ \d -> d
|
||||
{ keyName = encodeBS $ reSanitizeKeyName $ decodeBS $ keyName d }
|
||||
| otherwise = return Nothing
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue