add SeekInput (not yet used)
No behavior changes (hopefully), just adding SeekInput and plumbing it through to the JSON display code for later use. Over the course of 2 grueling days. withFilesNotInGit reimplemented in terms of seekHelper should be the only possible behavior change. It seems to test as behaving the same. Note that seekHelper dummies up the SeekInput in the case where segmentPaths' gives up on sorting the expanded paths because there are too many input paths. When SeekInput later gets exposed as a json field, that will result in it being a little bit wrong in the case where 100 or more paths are passed to a git-annex command. I think this is a subtle enough problem to not matter. If it does turn out to be a problem, fixing it would require splitting up the input parameters into groups of < 100, which would make git ls-files run perhaps more than is necessary. May want to revisit this, because that fix seems fairly low-impact.
This commit is contained in:
parent
a1accac084
commit
3a05d53761
88 changed files with 561 additions and 405 deletions
|
@ -16,6 +16,7 @@ import Annex.Drop (handleDropsFrom, Reason)
|
|||
import Logs.Location
|
||||
import CmdLine.Action
|
||||
import Types.NumCopies
|
||||
import Types.Command
|
||||
|
||||
{- Drop from local and/or remote when allowed by the preferred content and
|
||||
- numcopies settings. -}
|
||||
|
@ -23,4 +24,7 @@ handleDrops :: Reason -> Bool -> Key -> AssociatedFile -> [VerifiedCopy] -> Assi
|
|||
handleDrops reason fromhere key f preverified = do
|
||||
syncrs <- syncDataRemotes <$> getDaemonStatus
|
||||
locs <- liftAnnex $ loggedLocations key
|
||||
liftAnnex $ handleDropsFrom locs syncrs reason fromhere key f preverified callCommandAction
|
||||
liftAnnex $ handleDropsFrom
|
||||
locs syncrs reason fromhere key f
|
||||
(SeekInput [])
|
||||
preverified callCommandAction
|
||||
|
|
|
@ -30,6 +30,7 @@ import Annex.WorkTree
|
|||
import Annex.Content
|
||||
import Annex.Wanted
|
||||
import CmdLine.Action
|
||||
import Types.Command
|
||||
|
||||
import qualified Data.Set as S
|
||||
import Control.Concurrent
|
||||
|
@ -168,7 +169,7 @@ expensiveScan urlrenderer rs = batch <~> do
|
|||
|
||||
liftAnnex $ handleDropsFrom locs syncrs
|
||||
"expensive scan found too many copies of object"
|
||||
present key af [] callCommandAction
|
||||
present key af (SeekInput []) [] callCommandAction
|
||||
ts <- if present
|
||||
then liftAnnex . filterM (wantSend True (Just key) af . Remote.uuid . fst)
|
||||
=<< use syncDataRemotes (genTransfer Upload False)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue