mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

avoid unncessary db queries when exported directory can't be empty

Browse source 
In rename foo/bar to foo/baz, foo can't be empty.

In delete zxyyz, there's no exported directory (top doesn't count).
This commit is contained in:
Joey Hess 2017-09-15 16:30:49 -04:00
parent af82b2229c
commit e54a05612e
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 24 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Types/Remote.hs
View file

@ -27,8 +27,8 @@ module Types.Remote
where
import qualified Data.Map as M
import Data.Ord
import qualified System.FilePath.Posix as Posix
import Data.Ord
import qualified Git
import Types.Key
@ -201,13 +201,14 @@ data ExportActions a = ExportActions
, renameExport :: Key -> ExportLocation -> ExportLocation -> a Bool
}
-- | All directories down to the ExportLocation, with the deepest ones
-- last.
-- | All subdirectories down to the ExportLocation, with the deepest ones
-- last. Does not include the top of the export.
exportedDirectories :: ExportLocation -> [ExportDirectory]
exportedDirectories (ExportLocation f) =
map (ExportDirectory . Posix.joinPath . reverse) $
subs [] $ map Posix.dropTrailingPathSeparator $
Posix.splitPath $ Posix.takeDirectory f
map (ExportDirectory . Posix.joinPath . reverse) (subs [] dirs)
where
subs _ [] = []
subs ps (d:ds) = (d:ps) : subs (d:ps) ds
dirs = map Posix.dropTrailingPathSeparator $
reverse $ drop 1 $ reverse $ Posix.splitPath f