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

Fix a bug in find --batch in the previous version.

Browse source
This commit is contained in:
Joey Hess 2020-07-20 19:39:05 -04:00
parent 8499c6d65a
commit abd56fb019
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
5 changed files with 20 additions and 3 deletions

6
CHANGELOG
View file

@ -1,3 +1,9 @@
git-annex (8.20200720.1) UNRELEASED; urgency=medium
* Fix a bug in find --batch in the previous version.
-- Joey Hess <id@joeyh.name> Mon, 20 Jul 2020 19:37:40 -0400
git-annex (8.20200720) upstream; urgency=medium git-annex (8.20200720) upstream; urgency=medium
* import: Added --no-content option, which avoids downloading files * import: Added --no-content option, which avoids downloading files

4
Command/Find.hs
View file

@ -18,6 +18,7 @@ import Types.Key
import Git.FilePath import Git.FilePath
import qualified Utility.Format import qualified Utility.Format
import Utility.DataUnits import Utility.DataUnits
import Annex.Content
cmd :: Command cmd :: Command
cmd = notBareRepo $ withGlobalOptions [annexedMatchingOptions] $ mkCommand $ cmd = notBareRepo $ withGlobalOptions [annexedMatchingOptions] $ mkCommand $
@ -70,9 +71,10 @@ seek o = case batchOption o of
(withFilesInGitAnnex ww seeker) (withFilesInGitAnnex ww seeker)
=<< workTreeItems ww (findThese o) =<< workTreeItems ww (findThese o)
Batch fmt -> batchFilesMatching fmt Batch fmt -> batchFilesMatching fmt
(whenAnnexed go . toRawFilePath) (whenAnnexed gobatch . toRawFilePath)
where where
go = start o go = start o
gobatch f k = stopUnless (limited <||> inAnnex k) (go f k)
ww = WarnUnmatchLsFiles ww = WarnUnmatchLsFiles
start :: FindOptions -> RawFilePath -> Key -> CommandStart start :: FindOptions -> RawFilePath -> Key -> CommandStart

5
doc/bugs/find_--batch_reports_files_that_have_no_content.mdwn
View file

@ -61,3 +61,8 @@ local repository version: 8
[[!meta author=kyle]] [[!meta author=kyle]]
[[!tag projects/datalad]] [[!tag projects/datalad]]
> [[fixed|done]], and audited for any other similar reversions.
>
> Unfortunately did not see this bug before the release,
> so I should make a point release for it. --[[Joey]]

6
doc/todo/precache_logs_for_speed_with_cat-file_--buffer.mdwn
View file

@ -37,8 +37,12 @@ and precache them.
> > > Still todo: > > > Still todo:
> > > > > >
> > > * move, copy, drop, and mirror were left not using the location log caching yet > > > * move, copy, drop, and mirror were left not using the location log caching yet
> > > * find has a bit of ugliness around batch mode, and this shows it
> > > would be worth making the batch mode take the same AnnexedFileSeeker,
> > > to reunify the batch and non-batch code
> > > * get is left with an unncessary inAnnex check so could be sped up > > > * get is left with an unncessary inAnnex check so could be sped up
> > > a little bit more > > > a little bit more. Above improvements to batch mode would allow
> > > fixing this.
> > > > > >
Another thing that the same cat-file --buffer approach could be used with Another thing that the same cat-file --buffer approach could be used with

2
git-annex.cabal
View file

@ -1,5 +1,5 @@
Name: git-annex Name: git-annex
Version: 8.20200720 Version: 8.20200720.1
Cabal-Version: >= 1.10 Cabal-Version: >= 1.10
License: AGPL-3 License: AGPL-3
Maintainer: Joey Hess <id@joeyh.name> Maintainer: Joey Hess <id@joeyh.name>