renaming
This commit is contained in:
parent
4c9ad1de46
commit
7a42a47902
17 changed files with 31 additions and 34 deletions
|
@ -31,8 +31,8 @@ keyFile0 :: Key -> FilePath
|
|||
keyFile0 = Upgrade.V1.keyFile1
|
||||
fileKey0 :: FilePath -> Key
|
||||
fileKey0 = Upgrade.V1.fileKey1
|
||||
lookupFile0 :: FilePath -> Annex (Maybe (Key, Backend))
|
||||
lookupFile0 = Upgrade.V1.lookupFile1
|
||||
lookupKey0 :: FilePath -> Annex (Maybe (Key, Backend))
|
||||
lookupKey0 = Upgrade.V1.lookupKey1
|
||||
|
||||
getKeysPresent0 :: FilePath -> Annex [Key]
|
||||
getKeysPresent0 dir = ifM (liftIO $ doesDirectoryExist dir)
|
||||
|
|
|
@ -90,7 +90,7 @@ updateSymlinks = do
|
|||
void $ liftIO cleanup
|
||||
where
|
||||
fixlink f = do
|
||||
r <- lookupFile1 f
|
||||
r <- lookupKey1 f
|
||||
case r of
|
||||
Nothing -> noop
|
||||
Just (k, _) -> do
|
||||
|
@ -191,8 +191,8 @@ readLog1 :: FilePath -> IO [LogLine]
|
|||
readLog1 file = catchDefaultIO [] $
|
||||
parseLog . encodeBL <$> readFileStrict file
|
||||
|
||||
lookupFile1 :: FilePath -> Annex (Maybe (Key, Backend))
|
||||
lookupFile1 file = do
|
||||
lookupKey1 :: FilePath -> Annex (Maybe (Key, Backend))
|
||||
lookupKey1 file = do
|
||||
tl <- liftIO $ tryIO getsymlink
|
||||
case tl of
|
||||
Left _ -> return Nothing
|
||||
|
|
|
@ -115,7 +115,7 @@ upgradeDirectWorkTree = do
|
|||
void $ liftIO clean
|
||||
where
|
||||
go (f, _sha, mode) | isSymLink mode = do
|
||||
-- Cannot use lookupFile here, as we're in between direct
|
||||
-- Cannot use lookupKey here, as we're in between direct
|
||||
-- mode and v6.
|
||||
mk <- catKeyFile f
|
||||
case mk of
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue