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

fix file name

Browse source
This commit is contained in:
Joey Hess 2012-06-27 15:00:26 -04:00
parent abd36ed336
commit 8810e57995
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Command/Sync.hs
View file

@ -202,22 +202,23 @@ resolveMerge' u
where where
go keyUs keyThem go keyUs keyThem
| keyUs == keyThem = do | keyUs == keyThem = do
makelink keyUs (file ++ "." ++ show keyUs) makelink keyUs
return True return True
| otherwise = do | otherwise = do
void $ liftIO $ tryIO $ removeFile file void $ liftIO $ tryIO $ removeFile file
Annex.Queue.addCommand "rm" [Params "--quiet -f --"] [file] Annex.Queue.addCommand "rm" [Params "--quiet -f --"] [file]
makelink keyUs (file ++ "." ++ show keyUs) makelink keyUs
makelink keyThem (file ++ "." ++ show keyThem) makelink keyThem
return True return True
file = LsFiles.unmergedFile u file = LsFiles.unmergedFile u
issymlink select = any (select (LsFiles.unmergedBlobType u) ==) issymlink select = any (select (LsFiles.unmergedBlobType u) ==)
[Just SymlinkBlob, Nothing] [Just SymlinkBlob, Nothing]
makelink (Just key) f = do makelink (Just key) = do
l <- calcGitLink file key let dest = file ++ "." ++ show key
liftIO $ createSymbolicLink l f l <- calcGitLink dest key
Annex.Queue.addCommand "add" [Param "--force", Param "--"] [f] liftIO $ createSymbolicLink l dest
makelink _ _ = noop Annex.Queue.addCommand "add" [Param "--force", Param "--"] [dest]
makelink _ = noop
withKey select a = do withKey select a = do
let msha = select $ LsFiles.unmergedSha u let msha = select $ LsFiles.unmergedSha u
case msha of case msha of