mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

more OsPath conversion (602/749)

Browse source 
Sponsored-by: Brock Spratlen
This commit is contained in:
Joey Hess 2025-02-07 14:46:11 -04:00
parent 2d1db7986c
commit a5d48edd94
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
25 changed files with 227 additions and 187 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Command/LookupKey.hs
View file

@ -37,7 +37,7 @@ run o _ file
| refOption o = catKey (Ref (toRawFilePath file)) >>= display
| otherwise = do
checkNotBareRepo
seekSingleGitFile file >>= \case
seekSingleGitFile (toOsPath file) >>= \case
Nothing -> return False
Just file' -> catKeyFile file' >>= display
@ -51,13 +51,13 @@ display Nothing = return False
-- To support absolute filenames, pass through git ls-files.
-- But, this plumbing command does not recurse through directories.
seekSingleGitFile :: FilePath -> Annex (Maybe RawFilePath)
seekSingleGitFile :: OsPath -> Annex (Maybe OsPath)
seekSingleGitFile file
| isRelative file = return (Just (toRawFilePath file))
| isRelative file = return (Just file)
| otherwise = do
(l, cleanup) <- inRepo (Git.LsFiles.inRepo [] [toRawFilePath file])
(l, cleanup) <- inRepo (Git.LsFiles.inRepo [] [file])
r <- case l of
(f:[]) | takeFileName (fromRawFilePath f) == takeFileName file ->
(f:[]) | takeFileName f == takeFileName file ->
return (Just f)
_ -> return Nothing
void $ liftIO cleanup