assistant: Fix location log when adding new file in direct mode.

Assistant/Threads/Committer.hs

@@ -18,6 +18,7 @@ import Assistant.DaemonStatus
 import Assistant.Threads.Watcher
 import Assistant.TransferQueue
 import Logs.Transfer
+import Logs.Location
 import qualified Annex.Queue
 import qualified Git.Command
 import qualified Git.HashObject
@@ -204,11 +205,13 @@ handleAdds delayadd cs = returnWhen (null incomplete) $ do
 		liftAnnex showEndFail
 		return Nothing
 	done change file (Just key) = do
-		link <- liftAnnex $ ifM isDirect
+		liftAnnex $ do
+			logStatus key InfoPresent
+			link <- ifM isDirect
 				( calcGitLink file key
 				, Command.Add.link file key True
 				)
-		liftAnnex $ whenM (pure DirWatcher.eventsCoalesce <||> isDirect) $ do
+			whenM (pure DirWatcher.eventsCoalesce <||> isDirect) $ do
 				sha <- inRepo $
 					Git.HashObject.hashObject BlobObject link
 				stageSymlink file sha

Command/Add.hs

@@ -142,8 +142,6 @@ link file key hascontent = handle (undo file key) $ do
 	liftIO $ createSymbolicLink l file
 
 	when hascontent $ do
-		logStatus key InfoPresent
-	
 		-- touch the symlink to have the same mtime as the
 		-- file it points to
 		liftIO $ do
@@ -155,15 +153,15 @@ link file key hascontent = handle (undo file key) $ do
 {- Note: Several other commands call this, and expect it to 
  - create the symlink and add it. -}
 cleanup :: FilePath -> Key -> Bool -> CommandCleanup
-cleanup file key hascontent = ifM (isDirect <&&> pure hascontent)
+cleanup file key hascontent = do
+	when hascontent $
+		logStatus key InfoPresent
+	ifM (isDirect <&&> pure hascontent)
 		( do
 			l <- calcGitLink file key
 			sha <- inRepo $ Git.HashObject.hashObject BlobObject l
 			Annex.Queue.addUpdateIndex =<<
 				inRepo (Git.UpdateIndex.stageSymlink file sha)
-		when hascontent $
-			logStatus key InfoPresent
-		return True
 		, do
 			_ <- link file key hascontent
 			params <- ifM (Annex.getState Annex.force)
@@ -171,5 +169,5 @@ cleanup file key hascontent = ifM (isDirect <&&> pure hascontent)
 				, return []
 				)
 			Annex.Queue.addCommand "add" (params++[Param "--"]) [file]
-		return True
 		)
+	return True

debian/changelog

@@ -8,6 +8,7 @@ git-annex (3.20130125) UNRELEASED; urgency=low
     of changed files by the assistant, while it still does data syncing
     and other tasks.
   * assistant: Ignore .DS_Store on OSX.
+  * assistant: Fix location log when adding new file in direct mode.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 26 Jan 2013 15:48:40 +1100