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

partial and incomplete automatic merging in direct mode

Browse source 
Handles our file right, but not theirs.
This commit is contained in:
Joey Hess 2012-12-18 17:15:16 -04:00
parent 92bd889e61
commit 05ec4587dd
3 changed files with 38 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Command/Sync.hs
View file

@ -15,6 +15,7 @@ import qualified Annex
import qualified Annex.Branch
import qualified Annex.Queue
import Annex.Content
import Annex.Content.Direct
import Annex.Direct
import Annex.CatFile
import qualified Git.Command
@ -234,7 +235,8 @@ resolveMerge' :: LsFiles.Unmerged -> Annex Bool
resolveMerge' u
| issymlink LsFiles.valUs && issymlink LsFiles.valThem =
withKey LsFiles.valUs $ \keyUs ->
withKey LsFiles.valThem $ \keyThem -> go keyUs keyThem
withKey LsFiles.valThem $ \keyThem -> do
go keyUs keyThem
| otherwise = return False
where
go keyUs keyThem
@ -242,7 +244,10 @@ resolveMerge' u
makelink keyUs
return True
| otherwise = do
liftIO $ nukeFile file
ifM isDirect
( maybe noop (\k -> removeDirect k file) keyUs
, liftIO $ nukeFile file
)
Annex.Queue.addCommand "rm" [Params "--quiet -f --"] [file]
makelink keyUs
makelink keyThem
@ -257,6 +262,8 @@ resolveMerge' u
nukeFile dest
createSymbolicLink l dest
Annex.Queue.addCommand "add" [Param "--force", Param "--"] [dest]
whenM (isDirect) $
toDirect key dest
makelink _ = noop
withKey select a = do
let msha = select $ LsFiles.unmergedSha u