rawfilepath conversion

Annex/Branch.hs

@@ -844,7 +844,7 @@ performTransitionsLocked jl ts neednewlocalbranch transitionedrefs = do
 			if L.null content'
 				then do
 					Annex.Queue.addUpdateIndex
-						=<< inRepo (Git.UpdateIndex.unstageFile (fromRawFilePath file))
+						=<< inRepo (Git.UpdateIndex.unstageFile file)
 					-- File is deleted; can't run any other
 					-- transitions on it.
 					return ()

Annex/Link.hs

@@ -138,7 +138,7 @@ hashPointerFile key = hashBlob $ formatPointer key
 stagePointerFile :: RawFilePath -> Maybe FileMode -> Sha -> Annex ()
 stagePointerFile file mode sha =
 	Annex.Queue.addUpdateIndex =<<
-		inRepo (Git.UpdateIndex.stageFile sha treeitemtype $ fromRawFilePath file)
+		inRepo (Git.UpdateIndex.stageFile sha treeitemtype file)
   where
 	treeitemtype
 		| maybe False isExecutable mode = TreeExecutable

Assistant/Threads/Watcher.hs

@@ -341,7 +341,7 @@ onDel' file = do
 	topfile <- inRepo (toTopFilePath (toRawFilePath file))
 	withkey $ flip Database.Keys.removeAssociatedFile topfile
 	Annex.Queue.addUpdateIndex =<<
-		inRepo (Git.UpdateIndex.unstageFile file)
+		inRepo (Git.UpdateIndex.unstageFile (toRawFilePath file))
   where
 	withkey a = maybe noop a =<< catKeyFile (toRawFilePath file)
 

Command/Add.hs

@@ -182,7 +182,7 @@ addFile smallorlarge file s = do
 					=<< withTSDelta (liftIO . genInodeCache file)
 				Large -> noop
 			Annex.Queue.addUpdateIndex =<<
-				inRepo (stageFile sha treetype (fromRawFilePath file))
+				inRepo (stageFile sha treetype file)
 			return True
   where
 	changed a b =

Git/Repair.hs

@@ -433,7 +433,7 @@ rewriteIndex r
 	reinject (file, sha, mode, _) = case toTreeItemType mode of
 		Nothing -> return Nothing
 		Just treeitemtype -> Just <$>
-			UpdateIndex.stageFile sha treeitemtype (fromRawFilePath file) r
+			UpdateIndex.stageFile sha treeitemtype file r
 
 newtype GoodCommits = GoodCommits (S.Set Sha)
 

Git/UpdateIndex.hs

@@ -99,15 +99,15 @@ updateIndexLine sha treeitemtype file = L.fromStrict $
 	<> "\t"
 	<> indexPath file
 
-stageFile :: Sha -> TreeItemType -> FilePath -> Repo -> IO Streamer
+stageFile :: Sha -> TreeItemType -> RawFilePath -> Repo -> IO Streamer
 stageFile sha treeitemtype file repo = do
-	p <- toTopFilePath (toRawFilePath file) repo
+	p <- toTopFilePath file repo
 	return $ pureStreamer $ updateIndexLine sha treeitemtype p
 
 {- A streamer that removes a file from the index. -}
-unstageFile :: FilePath -> Repo -> IO Streamer
+unstageFile :: RawFilePath -> Repo -> IO Streamer
 unstageFile file repo = do
-	p <- toTopFilePath (toRawFilePath file) repo
+	p <- toTopFilePath file repo
 	return $ unstageFile' p
 
 unstageFile' :: TopFilePath -> Streamer