From 247b7e9e5808b60292ef674ee7e93d352cb54210 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 6 May 2013 12:43:03 -0400
Subject: [PATCH] direct: Fix a bug that could cause some files to be left in
 indirect mode.

It's possible for files in indirect mode to have a direct mode mapping
file. Probably from when they were in direct mode. In this case,
toDirectGen tried to copy the content from the direct mode file that the
mapping said had it. But, being in indirect mode, it didn't really have the
content. So it did nothing. This fix makes it always move the content from
.git/annex/objects/ when it's there.
---
 Annex/Direct.hs  | 38 ++++++++++++++++++++------------------
 debian/changelog |  1 +
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/Annex/Direct.hs b/Annex/Direct.hs
index f8bdaebb30..596c90994a 100644
--- a/Annex/Direct.hs
+++ b/Annex/Direct.hs
@@ -182,25 +182,27 @@ toDirect k f = fromMaybe noop =<< toDirectGen k f
 toDirectGen :: Key -> FilePath -> Annex (Maybe (Annex ()))
 toDirectGen k f = do
 	loc <- calcRepo $ gitAnnexLocation k
-	absf <- liftIO $ absPath f
-	locs <- filter (/= absf) <$> addAssociatedFile k f
-	case locs of
-		[] -> ifM (liftIO $ doesFileExist loc)
-			( return $ Just $ do
-				{- Move content from annex to direct file. -}
-				thawContentDir loc
-				updateInodeCache k loc
-				thawContent loc
-				replaceFile f $ liftIO . moveFile loc
-			, return Nothing
-			)
-		(loc':_) -> ifM (isNothing <$> getAnnexLinkTarget loc')
-			{- Another direct file has the content; copy it. -}
-			( return $ Just $
+	ifM (liftIO $ doesFileExist loc)
+		( fromindirect loc
+		, fromdirect
+		)
+  where
+  	fromindirect loc = return $ Just $ do
+		{- Move content from annex to direct file. -}
+		thawContentDir loc
+		updateInodeCache k loc
+		thawContent loc
+		replaceFile f $ liftIO . moveFile loc
+	fromdirect = do
+		{- Copy content from another direct file. -}
+		absf <- liftIO $ absPath f
+		locs <- filterM (\loc -> isNothing <$> getAnnexLinkTarget loc) =<<
+			(filter (/= absf) <$> addAssociatedFile k f)
+		case locs of
+			(loc:_) -> return $ Just $
 				replaceFile f $
-					liftIO . void . copyFileExternal loc'
-			, return Nothing
-			)
+					liftIO . void . copyFileExternal loc
+			_ -> return Nothing
 
 {- Removes a direct mode file, while retaining its content. -}
 removeDirect :: Key -> FilePath -> Annex ()
diff --git a/debian/changelog b/debian/changelog
index ae559223b3..d1f8fa68e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ git-annex (4.20130502) UNRELEASED; urgency=low
     to link -lHSrts_thr
   * Avoid depending on regex-tdfa on mips, mipsel, and s390, where it fails
     to build.
+  * direct: Fix a bug that could cause some files to be left in indirect mode.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 02 May 2013 20:39:19 -0400