Joey Hess [Wed, 17 Nov 2021 16:48:28 +0000 (12:48 -0400)]
better wording
Joey Hess [Wed, 17 Nov 2021 16:21:07 +0000 (12:21 -0400)]
add news item for git-annex 8.
20211117
Joey Hess [Wed, 17 Nov 2021 16:20:29 +0000 (12:20 -0400)]
releasing package git-annex version 8.
20211117
Joey Hess [Tue, 16 Nov 2021 16:54:29 +0000 (12:54 -0400)]
update git-lfs version to match git-annex.cabal
Joey Hess [Tue, 16 Nov 2021 16:38:41 +0000 (12:38 -0400)]
collapse lists of done items by default
Copying how the datalad page does it. This avoids me missing the header
and thinking these are still open.
Joey Hess [Tue, 16 Nov 2021 16:35:02 +0000 (12:35 -0400)]
tag moreinfo
Joey Hess [Tue, 16 Nov 2021 16:33:36 +0000 (12:33 -0400)]
comment
Joey Hess [Mon, 15 Nov 2021 19:46:16 +0000 (15:46 -0400)]
close
Joey Hess [Mon, 15 Nov 2021 19:35:04 +0000 (15:35 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Mon, 15 Nov 2021 19:31:02 +0000 (15:31 -0400)]
use parseFeedFromFile to avoid mojibake
As mentioned in commit
2bd778a46ed071c2dd534ebe3b7007b7ae60d1c1, there
was mojibake when LANG=C.
Looking at parseFeedFromFile, it is very particular to read the file as
unicode. parseFeedString looks like it will accept any old String,
but a String that was read using the filesystem encoding will not in
fact have the right encoding.
I think this is a bug in the feed library and will file one.
Sponsored-by: Svenne Krap on Patreon
Joey Hess [Mon, 15 Nov 2021 17:32:31 +0000 (13:32 -0400)]
importfeed: Fix a crash when used in a non-unicode locale
See comment for analysis.
At first I thought I'd need to convert all T.unpack in git-annex, but
luckily not -- so long as the Text is read from a file, the filesystem
encoding is applied and T.unpack is fine. It's only when using Feed
that the filesystem encoding is not applied.
While this fixes the crash, it does result in some mojibake, eg:
itemid=http://www.manager-tools.com/2014/01/choosing-a-company-work-chapter-7-���-questions/
Have not tracked that down, but it must be unrelated, because
I've verified that it roundtrips when using encodeUf8:
joey@darkstar:~/src/git-annex>LANG=C ghci Utility/FileSystemEncoding.hs
ghci> useFileSystemEncoding
ghci> Just f <- Text.Feed.Import.parseFeedFromFile "/home/joey/tmp/career_tools_podcasts.xml"
ghci> Just (_, x) = Text.Feed.Query.getItemId (Text.Feed.Query.feedItems f !! 0)
ghci> decodeBS (Data.Text.Encoding.encodeUtf8 x)
"http://www.manager-tools.com/2014/01/choosing-a-company-work-chapter-7-\56546\56448\56467-questions/"
ghci> writeFile "foo" $ decodeBS (Data.Text.Encoding.encodeUtf8 x)
Writes a file containing the ENDASH character.
Sponsored-by: Jochen Bartl on Patreon
Lukey [Sun, 14 Nov 2021 20:11:35 +0000 (20:11 +0000)]
Added a comment
contact@ee563aaec1e9de7a4e8d748992963dba79178e9c [Sun, 14 Nov 2021 18:41:18 +0000 (18:41 +0000)]
Added a comment
contact@ee563aaec1e9de7a4e8d748992963dba79178e9c [Sun, 14 Nov 2021 18:37:05 +0000 (18:37 +0000)]
Added a comment
contact@ee563aaec1e9de7a4e8d748992963dba79178e9c [Sun, 14 Nov 2021 18:35:45 +0000 (18:35 +0000)]
Added a comment
contact@ee563aaec1e9de7a4e8d748992963dba79178e9c [Sun, 14 Nov 2021 18:33:52 +0000 (18:33 +0000)]
Joey Hess [Sat, 13 Nov 2021 13:09:45 +0000 (09:09 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Sat, 13 Nov 2021 13:07:43 +0000 (09:07 -0400)]
display error message if unable to run youtube-dl
This would have made the typo of the command name that was just fixed
obvious earlier, when --no-raw was used to force using it.
Joey Hess [Sat, 13 Nov 2021 12:58:36 +0000 (08:58 -0400)]
Fix a typo in the name of youtube-dl (reversion introduced in version 8.
20210903)
rklett [Sat, 13 Nov 2021 03:59:47 +0000 (03:59 +0000)]
Joey Hess [Fri, 12 Nov 2021 18:07:29 +0000 (14:07 -0400)]
improve docs
I saw a user open a forum post that looked like they had read this man
page, but were unaware of git-annex unlock, and were looking for its
functionality. They later deleted the post, probably when they found
git-annex unlock. Looking at this man page, it was a bit unclear about
the motivation for the command.
Yes, I'm warching... ;-)
Joey Hess [Fri, 12 Nov 2021 17:29:22 +0000 (13:29 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Fri, 12 Nov 2021 16:59:30 +0000 (12:59 -0400)]
migrate: New --remove-size option
While intended for converting URL keys added by addurl --fast to be
as if added by addurl --relaxed, it can also be used to remove size
from other types of keys. Although that is not likely to be useful
for checksummed keys, I suppose it could be used for WORM or other
non-checksum keys.
Specifying the --remove-size option does not prevent other migrations
from taking effect if there's a key upgrade to perform, or if the
backend has changed. So --backend=URL needs to be used to prevent
migrating an URL key to the default backend.
Note that it's not possible to use git-annex migrate to convert from a
non-URL key to an URL key, as URL keys cannot be generated, except by
addurl. So while this can get the same effect as --relaxed would have
when addurl --fast was used, when --fast was not used, it won't work, or
if --backend=URL is not used will remove the size but not prevent
checksum verification, which is not useful. Due to this complexity, I
decided not to mention it in the git-annex addurl man page.
Sponsored-by: Jochen Bartl on Patreon
iimog@2c22a44141070c04b943932b697818a686859677 [Fri, 12 Nov 2021 08:14:33 +0000 (08:14 +0000)]
Added a comment: It works
Joey Hess [Wed, 10 Nov 2021 17:51:11 +0000 (13:51 -0400)]
git-lfs gitlab interoperability fix
git-lfs: Fix interoperability with gitlab's implementation of the git-lfs
protocol, which requests Content-Encoding chunked.
Sponsored-by: Dartmouth College's Datalad project
Joey Hess [Tue, 9 Nov 2021 20:06:41 +0000 (16:06 -0400)]
tag as datalad
Joey Hess [Tue, 9 Nov 2021 20:04:54 +0000 (16:04 -0400)]
comment
Joey Hess [Tue, 9 Nov 2021 19:53:13 +0000 (15:53 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Tue, 9 Nov 2021 17:30:52 +0000 (13:30 -0400)]
new todo
Ilya_Shlyakhter [Tue, 9 Nov 2021 18:28:10 +0000 (18:28 +0000)]
Added a comment: clarification re: smudge filter and annex.supportunlocked
Joey Hess [Tue, 9 Nov 2021 16:29:09 +0000 (12:29 -0400)]
factor out IncrementalHasher from IncrementalVerifier
iimog@2c22a44141070c04b943932b697818a686859677 [Tue, 9 Nov 2021 15:30:42 +0000 (15:30 +0000)]
jkniiv [Tue, 9 Nov 2021 08:48:33 +0000 (08:48 +0000)]
Added a comment
fireboy [Tue, 9 Nov 2021 04:47:41 +0000 (04:47 +0000)]
removed
fireboy [Tue, 9 Nov 2021 01:48:01 +0000 (01:48 +0000)]
Joey Hess [Mon, 8 Nov 2021 20:47:00 +0000 (16:47 -0400)]
uninit edge cases
* uninit: Avoid error message when no commits have been made to the
repository yet.
* uninit: Avoid error message when there is no git-annex branch.
Sponsored-by: Svenne Krap on Patreon
Joey Hess [Mon, 8 Nov 2021 20:28:43 +0000 (16:28 -0400)]
comment
Joey Hess [Mon, 8 Nov 2021 20:23:05 +0000 (16:23 -0400)]
comment
Joey Hess [Mon, 8 Nov 2021 20:20:57 +0000 (16:20 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Mon, 8 Nov 2021 20:20:43 +0000 (16:20 -0400)]
devblog
Joey Hess [Mon, 8 Nov 2021 19:55:27 +0000 (15:55 -0400)]
dynamically disable filter-process in restagePointerFile when it would be slower
Based on my earlier benchmark, I have a rough cost model for how
expensive it is for git-annex smudge to be run on a file, vs
how expensive it is for a gigabyte of a file's content to be read and
piped through to filter-process.
So, using that cost model, it can decide if using filter-process will
be more or less expensive than running the smudge filter on the files to
be restaged.
It turned out to be *really* annoying to temporarily disable
filter-process. I did find a way, but urk, this is horrible. Notice
that, if it's interrupted with it disabled, it will remain disabled
until the next time restagePointerFile runs. Which could be some time
later. If the user runs `git add` or `git checkout` on a lot of small
files before that, they will see slower than expected performance.
(This commit also deletes where I wrote down the benchmark results
earlier.)
Sponsored-by: Noam Kremen on Patreon
Lukey [Mon, 8 Nov 2021 19:38:35 +0000 (19:38 +0000)]
Added a comment
Ilya_Shlyakhter [Mon, 8 Nov 2021 16:34:30 +0000 (16:34 +0000)]
Added a comment
xeruf [Sun, 7 Nov 2021 20:50:03 +0000 (20:50 +0000)]
Suggest description
xeruf [Sun, 7 Nov 2021 19:25:09 +0000 (19:25 +0000)]
Joey Hess [Fri, 5 Nov 2021 17:37:53 +0000 (13:37 -0400)]
benchmarking of filter-process vs smudge/clean
No firm conclusions yet, but it's doing better than I would have
expected.
Sponsored-by: Graham Spencer on Patreon
Joey Hess [Fri, 5 Nov 2021 16:46:56 +0000 (12:46 -0400)]
close
Joey Hess [Fri, 5 Nov 2021 16:46:14 +0000 (12:46 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Fri, 5 Nov 2021 16:43:33 +0000 (12:43 -0400)]
Revert "disable filter.annex.process in restagePointerFile"
This reverts commit
afe327ac4947d6d32ff888e7485509be03d9baaf.
Unfortunately, disabling it by setting it to "" does not work, git
then ignores filter.annex.smudge/clean, and does not pass files through
git-annex at all.
I don't think there is a way to temporarily disable this git config
from the git command line. Which seems like a bug in git.
So, it may be more expensive than anticipated to enable
filter.annex.process, since git checkout etc will pipe all annexed files
being checked out through it.
Joey Hess [Fri, 5 Nov 2021 15:00:45 +0000 (11:00 -0400)]
update
Joey Hess [Fri, 5 Nov 2021 14:53:11 +0000 (10:53 -0400)]
update
jkniiv [Fri, 5 Nov 2021 10:25:32 +0000 (10:25 +0000)]
Added a comment
jkniiv [Fri, 5 Nov 2021 06:02:29 +0000 (06:02 +0000)]
restated: plenty of unit tests fail both under Windows and Ubuntu 18.04
jkniiv [Fri, 5 Nov 2021 03:34:16 +0000 (03:34 +0000)]
plenty of unit tests fail on Windows
Joey Hess [Thu, 4 Nov 2021 19:37:39 +0000 (15:37 -0400)]
add pktLineHeaderLength
Joey Hess [Thu, 4 Nov 2021 19:24:46 +0000 (15:24 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Thu, 4 Nov 2021 19:23:07 +0000 (15:23 -0400)]
add filter.annex.process to bypassSmudgeConfig
Joey Hess [Thu, 4 Nov 2021 19:20:26 +0000 (15:20 -0400)]
disable filter.annex.process in restagePointerFile
This means git will run git-annex smudge --clean once per file that is
restaged, which can be slow. But probably *not* as slow as git feeding
all the content of annexed files you've gotten through a pipe to
git-annex filter-process.
The only time this is probably not ideal is after a drop of a bunch of
files, when filter-process would be faster.
Joey Hess [Thu, 4 Nov 2021 19:11:30 +0000 (15:11 -0400)]
update for git-annex filter-process
Joey Hess [Thu, 4 Nov 2021 19:05:24 +0000 (15:05 -0400)]
mention filter-process as v9 material
Joey Hess [Thu, 4 Nov 2021 19:03:51 +0000 (15:03 -0400)]
update with actual command to run
Joey Hess [Thu, 4 Nov 2021 19:03:28 +0000 (15:03 -0400)]
Merge branch 'master' into long-running-smudge
Joey Hess [Thu, 4 Nov 2021 19:03:12 +0000 (15:03 -0400)]
reorg
Joey Hess [Thu, 4 Nov 2021 19:02:36 +0000 (15:02 -0400)]
add git-annex filter-process
filter-process: New command that can make git add/checkout faster when
there are a lot of unlocked annexed files or non-annexed files, but that
also makes git add of large annexed files slower.
Use it by running: git
config filter.annex.process 'git-annex filter-process'
Fully tested and working, but I have not benchmarked it at all.
And, incremental hashing is not done when git add uses it, so extra work is
done in that case.
Sponsored-by: Mark Reidenbach on Patreon
Joey Hess [Thu, 4 Nov 2021 18:36:48 +0000 (14:36 -0400)]
handle unhandled case
Joey Hess [Thu, 4 Nov 2021 18:33:07 +0000 (14:33 -0400)]
shorten synopsis
This is to avoid the display being too wide.
CandyAngel [Thu, 4 Nov 2021 16:06:17 +0000 (16:06 +0000)]
removed
CandyAngel [Thu, 4 Nov 2021 16:04:07 +0000 (16:04 +0000)]
Added a comment
Joey Hess [Wed, 3 Nov 2021 20:06:49 +0000 (16:06 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Wed, 3 Nov 2021 20:06:32 +0000 (16:06 -0400)]
devblog
Joey Hess [Wed, 3 Nov 2021 19:44:05 +0000 (15:44 -0400)]
long-running-smudge branch started
Joey Hess [Wed, 3 Nov 2021 19:41:26 +0000 (15:41 -0400)]
git long-running filter process implementation
This module is not used yet, but the plan is to use it for smudge/clean
filtering, at least as an option. In some circumstances, using this
interface may perform better than the interface git-annex is currently
using.
Sponsored-by: Brock Spratlen on Patreon
Joey Hess [Wed, 3 Nov 2021 17:29:53 +0000 (13:29 -0400)]
git pkt-line implementation
This module is not used yet, but the plan is to implement
the long running filter process for smudge/clean.
Sponsored-by: Shae Erisson on Patreon
bjornw [Tue, 2 Nov 2021 23:12:33 +0000 (23:12 +0000)]
bjornw [Tue, 2 Nov 2021 23:10:14 +0000 (23:10 +0000)]
Joey Hess [Tue, 2 Nov 2021 19:24:22 +0000 (15:24 -0400)]
comment
Joey Hess [Tue, 2 Nov 2021 19:16:15 +0000 (15:16 -0400)]
comment
Joey Hess [Tue, 2 Nov 2021 19:06:20 +0000 (15:06 -0400)]
investigation results
Also, close dup bug.
Joey Hess [Mon, 1 Nov 2021 18:40:33 +0000 (14:40 -0400)]
tighter --json parsing for metadata
metadata --batch --json: Reject input whose "fields" does not consist of
arrays of strings. Such invalid input used to be silently ignored.
Used to be that parseJSON for a JSONActionItem ran parseJSON separately
for the itemAdded, and if that failed, did not propagate the error. That
allowed different items with differently named fields to be parsed.
But it was actually only used to parse "fields" for metadata, so that
flexability is not needed.
The fix is just to parse "fields" as-is. AddJSONActionItemFields is needed
only because of the wonky way Command.MetaData adds onto the started json
object.
Note that this line got a dummy type signature added,
just because the type checker needs it to be some type.
itemFields = Nothing :: Maybe Bool
Since it's Nothing, it doesn't really matter what type it is,
and the value gets turned into json and is then thrown away.
Sponsored-by: Kevin Mueller on Patreon
Joey Hess [Mon, 1 Nov 2021 17:42:48 +0000 (13:42 -0400)]
comment
Joey Hess [Mon, 1 Nov 2021 17:41:19 +0000 (13:41 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Mon, 1 Nov 2021 17:38:14 +0000 (13:38 -0400)]
metadata --batch: Avoid crashing when a non-annexed file is input
Turns out that CommandStart actions do not have their exceptions caught,
which is why the giveup was causing a crash. Mostly these actions
do not do very much work on their own, but it does seem possible there
are other commands whose CommandStart also throws an exception.
So, my first attempt at a fix was to catch those exceptions. But,
--json-error-messages then causes a difficulty, because in order to output
a json error message, an action needs to have been started; that sets up
the json object that the error message will be included in a field of.
While it would be possible to output an object with just an error field,
this would be json output of a format that the user has no reason to
expect, that happens only in an exceptional circumstance. That is something
I have always wanted to avoid with the json output; while git-annex man
pages don't document what the json looks like, the output has always
been made to be self-describing. Eg, it includes "error-messages":[]
even when there's no errors.
With that ruled out, it doesn't seem a good idea to catch CommandStart
exceptions and display the error to stderr when --json-error-messages
is set. And so I don't know if it makes sense to catch exceptions from that
at all. Maybe I'd have a different opinion if --json-error-messages did not
exist though.
So instead, output a blank line like other batch commands do.
This also leaves open the possibility of implementing support for matching
object with metadata --json, which would also want to output a blank line
when the input didn't match.
Sponsored-by: Dartmouth College's DANDI project
Lukey [Sat, 30 Oct 2021 16:45:52 +0000 (16:45 +0000)]
Added a comment
erewhon [Sat, 30 Oct 2021 03:00:05 +0000 (03:00 +0000)]
Joey Hess [Thu, 28 Oct 2021 16:01:31 +0000 (12:01 -0400)]
add news item for git-annex 8.
20211028
Joey Hess [Thu, 28 Oct 2021 16:00:56 +0000 (12:00 -0400)]
releasing package git-annex version 8.
20211028
Joey Hess [Wed, 27 Oct 2021 20:15:41 +0000 (16:15 -0400)]
fix addurl concurrency issue
addurl: Support adding the same url to multiple files at the same time when
using -J with --batch --with-files.
Implementation was easier than expected, was able to reuse OnlyActionOn.
While it will download the url's content multiple times, that seems like
the best thing to do; see my comment for why.
Sponsored-by: Dartmouth College's DANDI project
Joey Hess [Wed, 27 Oct 2021 18:55:30 +0000 (14:55 -0400)]
add a comment about checkSaneLock
See commit
8c2dd7d8ee814614bf3c871903b5d4d2aba193f4 for original
introduction of it, but needing to spelunk that far back to understand
the code is not good.
Joey Hess [Wed, 27 Oct 2021 18:46:21 +0000 (14:46 -0400)]
move transfer already in progress message to warning
This makes it be displayed in the error-messages field with
--json-error-messages. And with --quiet, it will let it be displayed,
which makes sense because it's telling the user why what they requested
to do has failed to happen.
Joey Hess [Wed, 27 Oct 2021 18:40:41 +0000 (14:40 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Wed, 27 Oct 2021 18:40:02 +0000 (14:40 -0400)]
comment
jwodder [Wed, 27 Oct 2021 18:19:23 +0000 (18:19 +0000)]
Added a comment
Joey Hess [Wed, 27 Oct 2021 18:18:19 +0000 (14:18 -0400)]
comment
Joey Hess [Wed, 27 Oct 2021 18:11:34 +0000 (14:11 -0400)]
avoid redundant freezeContent call
This opens the potential for the object file to be in place but
git-annex is interrupted before it can freeze it. git-annex fsck already
fixes that situation, which can also occur when lockContentForRemoval
thaws content.
Also improve comment to not be Windows-specific.
jwodder [Wed, 27 Oct 2021 18:16:44 +0000 (18:16 +0000)]
Added a comment
Reiko Asakura [Tue, 26 Oct 2021 19:46:38 +0000 (15:46 -0400)]
Call freezeContent after move into annex
This change better supports Windows ACL management using
annex.freezecontent-command and annex.thawcontent-command and matches
the behaviour of adding an unlocked file.
By calling freezeContent after the file has moved into the annex,
the file's delete permission can be denied. If the file's delete
permission is denied before moving into the annex, the file cannot
be moved or deleted. If the file's delete permission is not denied after
moving into the annex, it will likely inherit a grant for the delete
permission which allows it to be deleted irrespective of the permissions
of the parent directory.
Joey Hess [Wed, 27 Oct 2021 17:55:36 +0000 (13:55 -0400)]
comment
Joey Hess [Wed, 27 Oct 2021 16:56:09 +0000 (12:56 -0400)]
comment
Joey Hess [Wed, 27 Oct 2021 16:22:02 +0000 (12:22 -0400)]
update, bugfix also fixed git-annex info