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/Drop.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/Drop.hs')
| -rw-r--r-- | Annex/Drop.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Annex/Drop.hs b/Annex/Drop.hs index 7e494c374..f02f4f386 100644 --- a/Annex/Drop.hs +++ b/Annex/Drop.hs @@ -19,6 +19,7 @@ import Annex.Wanted import Config import Annex.Content.Direct import qualified Database.Keys +import Git.FilePath import qualified Data.Set as S import System.Log.Logger (debugM) @@ -49,7 +50,7 @@ handleDropsFrom :: [UUID] -> [Remote] -> Reason -> Bool -> Key -> AssociatedFile handleDropsFrom locs rs reason fromhere key afile preverified runner = do l <- ifM isDirect ( associatedFilesRelative key - , Database.Keys.getAssociatedFiles key + , mapM getTopFilePath <$> Database.Keys.getAssociatedFiles key ) let fs = if null l then maybeToList afile else l n <- getcopies fs |