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

move check for if direct mode is supported to the right place

Browse source 
Need to run that check inside a annex repo.
This commit is contained in:
Joey Hess 2015-12-29 17:48:25 -04:00
parent f34c0b1319
commit 0475411f2f
Failed to extract signature
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Test.hs
View file

@ -1082,7 +1082,6 @@ test_nonannexed_file_conflict_resolution :: Assertion
test_nonannexed_file_conflict_resolution = do
check True False
check False False
whenM (annexeval Annex.Version.versionSupportsDirectMode) $ do
check True True
check False True
where
@ -1103,6 +1102,7 @@ test_nonannexed_file_conflict_resolution = do
let l = if inr1 then [r1, r2] else [r2, r1]
forM_ l $ \r -> indir r $ do
when switchdirect $
whenM (annexeval Annex.Version.versionSupportsDirectMode) $
git_annex "direct" [] @? "failed switching to direct mode"
git_annex "sync" [] @? "sync failed"
checkmerge ("r1" ++ show switchdirect) r1
@ -1133,7 +1133,6 @@ test_nonannexed_symlink_conflict_resolution :: Assertion
test_nonannexed_symlink_conflict_resolution = do
check True False
check False False
whenM (annexeval Annex.Version.versionSupportsDirectMode) $ do
check True True
check False True
where
@ -1155,6 +1154,7 @@ test_nonannexed_symlink_conflict_resolution = do
let l = if inr1 then [r1, r2] else [r2, r1]
forM_ l $ \r -> indir r $ do
when switchdirect $
whenM (annexeval Annex.Version.versionSupportsDirectMode) $ do
git_annex "direct" [] @? "failed switching to direct mode"
git_annex "sync" [] @? "sync failed"
checkmerge ("r1" ++ show switchdirect) r1