diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-01-05 17:22:19 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-01-05 17:22:19 -0400 |
| commit | 903241502a6ad1a4845ac2d131ef7fc2b547400d (patch) | |
| tree | fba85c9751a19aa0873e0f2bd837a1b000588508 /Annex/Content.hs | |
| parent | cf911557bf4bb27768c4fc5ac482e8f827807497 (diff) | |
use TopFilePath for associated files
Fixes several bugs with updates of pointer files. When eg, running
git annex drop --from localremote
it was updating the pointer file in the local repository, not the remote.
Also, fixes drop ../foo when run in a subdir, and probably lots of other
problems. Test suite drops from ~30 to 11 failures now.
TopFilePath is used to force thinking about what the filepath is relative
to.
The data stored in the sqlite db is still just a plain string, and
TopFilePath is a newtype, so there's no overhead involved in using it in
DataBase.Keys.
Diffstat (limited to 'Annex/Content.hs')
| -rw-r--r-- | Annex/Content.hs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Annex/Content.hs b/Annex/Content.hs index 2a8b295d3..9e8da49e9 100644 --- a/Annex/Content.hs +++ b/Annex/Content.hs @@ -65,6 +65,7 @@ import Utility.DataUnits import Utility.CopyFile import Utility.Metered import Config +import Git.FilePath import Git.SharedRepository import Annex.Perms import Annex.Link @@ -471,7 +472,9 @@ moveAnnex key src = withObjectLoc key storeobject storedirect , modifyContent dest $ do freezeContent src liftIO $ moveFile src dest - fs <- Database.Keys.getAssociatedFiles key + g <- Annex.gitRepo + fs <- map (`fromTopFilePath` g) + <$> Database.Keys.getAssociatedFiles key unless (null fs) $ do mapM_ (populatePointerFile key dest) fs Database.Keys.storeInodeCaches key (dest:fs) @@ -722,7 +725,8 @@ removeAnnex (ContentRemovalLock key) = withObjectLoc key remove removedirect remove file = cleanObjectLoc key $ do secureErase file liftIO $ nukeFile file - mapM_ (void . tryIO . resetpointer) + g <- Annex.gitRepo + mapM_ (\f -> void $ tryIO $ resetpointer $ fromTopFilePath f g) =<< Database.Keys.getAssociatedFiles key Database.Keys.removeInodeCaches key Direct.removeInodeCache key |