add generalized linkAnnex'

Annex/Content.hs

@@ -25,6 +25,7 @@ module Annex.Content (
 	checkDiskSpace,
 	moveAnnex,
 	linkAnnex,
+	linkAnnex',
 	LinkAnnexResult(..),
 	sendAnnex,
 	prepSendAnnex,
@@ -514,15 +515,21 @@ populatePointerFile k obj f = go =<< isPointerFile f
 linkAnnex :: Key -> FilePath -> Annex LinkAnnexResult
 linkAnnex key src = do
 	dest <- calcRepo (gitAnnexLocation key)
+	modifyContent dest $ linkAnnex' key src dest
+
+{- Hard links (or copies) src to dest, one of which should be the
+ - annex object. -}
+linkAnnex' :: Key -> FilePath -> FilePath -> Annex LinkAnnexResult
+linkAnnex' key src dest = 
 	ifM (liftIO $ doesFileExist dest)
 		( return LinkAnnexNoop
-		, modifyContent dest $
+		, ifM (liftIO $ createLinkOrCopy src dest)
-			ifM (liftIO $ createLinkOrCopy src dest)
+			( do
-				( do
+				thawContent dest
-					Database.Keys.storeInodeCaches key [dest, src]
+				Database.Keys.storeInodeCaches key [dest, src]
-					return LinkAnnexOk
+				return LinkAnnexOk
-				, return LinkAnnexFailed
+			, return LinkAnnexFailed
-				)
+			)
 		)
 
 data LinkAnnexResult = LinkAnnexOk | LinkAnnexFailed | LinkAnnexNoop

doc/todo/smudge.mdwn

@@ -325,6 +325,8 @@ files to be unlocked, while the indirect upgrades don't touch the files.
 
 #### implementation todo list
 
+* linkAnnex should check disk reserve when it falls back to copying the
+  file.
 * Reconcile staged changes into the associated files database, whenever
   the database is queried.
 * See if the cases where the Keys database is not used can be