Joey Hess [Wed, 2 Aug 2023 15:58:07 +0000 (11:58 -0400)]
relocate BLOCK.txt to move convenient location
Joey Hess [Wed, 2 Aug 2023 15:50:12 +0000 (11:50 -0400)]
fix stack build on windows
For whatever reason, putting Win32-2.13.4.0 in stack.yaml results in
stack blowing up with many unrelated dependency problems.
But making git-annex depend on that version lets stack resolve deps.
Joey Hess [Wed, 2 Aug 2023 14:48:23 +0000 (10:48 -0400)]
pin win32 to working version
Joey Hess [Wed, 2 Aug 2023 14:43:20 +0000 (10:43 -0400)]
fix build on windows
Joey Hess [Wed, 2 Aug 2023 14:08:00 +0000 (10:08 -0400)]
avoid cpp failure on windows
Seems that while the module is not imported by anything on windows, it
still gets cpped, and MIN_VERSION_unix is not defined so it failed to
preprocess.
Joey Hess [Wed, 2 Aug 2023 13:47:42 +0000 (09:47 -0400)]
enable TypeOperators
more warnings about ~ needing it in a future ghc release
Joey Hess [Wed, 2 Aug 2023 13:29:23 +0000 (09:29 -0400)]
add back utf8-string to setup build deps
Needed on Windows since Utility.FileSystemEncoding uses it
Joey Hess [Wed, 2 Aug 2023 00:17:29 +0000 (20:17 -0400)]
fix hang when built with unix-2.8
git-annex test hang when running git-annex add in an adjusted unlocked
branch. I couldn't seem to reproduce the hang outside the test suite.
Seems that the code added in
26a9ea12d11f85b43987d863449c790f7320d9d1
was buggy, and as that commit was made without testing it, building with
unix-2.8 exposed the bug.
I don't fully understand the bug, which involves fdToHandle
and then closing the fd, vs closing the handle. May somehow involve
laziness or forcing around the S.hGet? Using hClose solved it
in any case.
(Also eliminated checkcontentfollowssymlinks to fix a build warning
when it's not used.)
Joey Hess [Tue, 1 Aug 2023 22:53:26 +0000 (18:53 -0400)]
stack.yaml: Update to build with ghc-9.6.2 and aws-0.24
This enables some new features that need the new aws.
Use http-client-restricted-0.1.0 because it uses the crypton side of the
cryptonite/crypton fork, which seems to be needed for ghc-9.6.2.
Dependency on connection removed because of the cryptonite/crypton fork.
This avoids needing a build flag. It was only used to throw a typed
exception in Utility.Url, which nothing depended on.
Used a fork of bloomfilter because it's not being maintained and no longer
builds as-of this ghc version. (I have been trying to contact its
maintainer about it, and emailed him today suggesting I take over the
package.)
Sponsored-by: Brock Spratlen on Patreon
Joey Hess [Tue, 1 Aug 2023 22:41:27 +0000 (18:41 -0400)]
fix build with unix-2.8.0
Changed the parameters to openFd. So needed to add a small wrapper
library to keep supporting older versions as well.
Joey Hess [Tue, 1 Aug 2023 22:39:01 +0000 (18:39 -0400)]
enable TypeOperators
Joey Hess [Tue, 1 Aug 2023 22:36:54 +0000 (18:36 -0400)]
fix whitespace
Thanks to a compile warning from new ghc
Joey Hess [Tue, 1 Aug 2023 22:33:39 +0000 (18:33 -0400)]
enable TypeOperators
The use of ‘~’ without TypeOperators
will become an error in a future GHC release.
says new ghc
Joey Hess [Tue, 1 Aug 2023 22:27:12 +0000 (18:27 -0400)]
fix build with unix-2.8.0
got the arguments the wrong way around when I wrote this
also squelch a build warning
Joey Hess [Tue, 1 Aug 2023 21:47:30 +0000 (17:47 -0400)]
fix build with unix-2.8.0
It made UserInfo into a pattern to discourage manually constructing
them, so just to use UserInfo in a type signature of a function that
consumes them, have to import the new ByteString module.
Joey Hess [Tue, 1 Aug 2023 21:38:59 +0000 (17:38 -0400)]
fix build on windows
Joey Hess [Tue, 1 Aug 2023 19:47:05 +0000 (15:47 -0400)]
rewrap
Joey Hess [Tue, 1 Aug 2023 19:17:43 +0000 (15:17 -0400)]
support building with unix-compat 0.7
It removed System.PosixCompat.User.
Joey Hess [Tue, 1 Aug 2023 19:17:07 +0000 (15:17 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Tue, 1 Aug 2023 19:08:56 +0000 (15:08 -0400)]
Setup.hs: Stop installing man pages, desktop files, and the git-annex-shell and git-remote-tor-annex symlinks
Anything still relying on that, eg via cabal v1-install will need to
change to using make install-home. Which was added back in 2019 in
6491b626140a9e5cc8e99fff4a1434d7c0e9bc39 because cabal new-build
(now the default) already didn't use Setup in a way that let its
installation of those things work.
Notably this means Setup does not need to depend on unix-compat, which is
useful because in 0.7 it removed System.PosixCompat.User, which Setup
needed to determine where to install the desktop files. See
https://github.com/haskell-pkg-janitors/unix-compat/issues/3
xvorsx@a3fc1a0cf228782f624e5eb21ba8a664227b6c60 [Tue, 1 Aug 2023 06:36:50 +0000 (06:36 +0000)]
nobodyinperson [Tue, 1 Aug 2023 05:32:19 +0000 (05:32 +0000)]
Add missing formatting backtick
Joey Hess [Mon, 31 Jul 2023 18:43:58 +0000 (14:43 -0400)]
onlyingroup
* Support "onlyingroup=" in preferred content expressions.
* Support --onlyingroup= matching option.
Sponsored-by: Jack Hill on Patreon
Joey Hess [Mon, 31 Jul 2023 18:03:18 +0000 (14:03 -0400)]
foo
Joey Hess [Mon, 31 Jul 2023 18:01:33 +0000 (14:01 -0400)]
comment
Joey Hess [Mon, 31 Jul 2023 17:50:12 +0000 (13:50 -0400)]
comment
Joey Hess [Mon, 31 Jul 2023 17:28:02 +0000 (13:28 -0400)]
mention --explain
Sponsored-by: Dartmouth College's DANDI project
Joey Hess [Mon, 31 Jul 2023 17:06:40 +0000 (13:06 -0400)]
display explanations in --debug too
When --explain is not enabled. This can be useful debugging information
as well.
Sponsored-by: Dartmouth College's DANDI project
Joey Hess [Mon, 31 Jul 2023 16:36:13 +0000 (12:36 -0400)]
--explain for numcopies checks
And closed the todo as completed.
Sponsored-by: Dartmouth College's DANDI project
nobodyinperson [Mon, 31 Jul 2023 04:40:43 +0000 (04:40 +0000)]
Added a comment: onlyingroup also useful for offline backup drives
nobodyinperson [Sun, 30 Jul 2023 06:53:58 +0000 (06:53 +0000)]
Added a comment
branch [Sat, 29 Jul 2023 21:35:16 +0000 (21:35 +0000)]
nobodyinperson [Sat, 29 Jul 2023 17:43:41 +0000 (17:43 +0000)]
Added a comment: No built-in way for dropping all old versions of a file AFAIK
nobodyinperson [Sat, 29 Jul 2023 17:07:22 +0000 (17:07 +0000)]
Suggest that git annex diffdriver fetches content to diff
mario [Sat, 29 Jul 2023 12:57:03 +0000 (12:57 +0000)]
Added a comment: Dropping all older versions of a file
aragilar [Fri, 28 Jul 2023 02:47:42 +0000 (02:47 +0000)]
Added a comment
nobodyinperson [Thu, 27 Jul 2023 15:22:47 +0000 (15:22 +0000)]
Added a comment: --explain is very helpful 👍
Joey Hess [Wed, 26 Jul 2023 19:44:47 +0000 (15:44 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Wed, 26 Jul 2023 19:29:23 +0000 (15:29 -0400)]
improve match explanations
Using == and != proved too hard to read, so went with [TRUE] and [FALSE]
after the term. I would kind of liked to have used emojis for a green
check and red X, but probably that is too fancy to be a good idea.
Make --explain output be inside [ ] with whitespace around them, to
avoid it ending with eg "[FALSE]]" and to make it easier to visually
find the start of it.
Sponsored-by: Dartmouth College's DANDI project
Joey Hess [Wed, 26 Jul 2023 19:28:57 +0000 (15:28 -0400)]
improve match result display simplifier
Sponsored-by: Dartmouth College's DANDI project
Joey Hess [Wed, 26 Jul 2023 19:07:29 +0000 (15:07 -0400)]
fix bug in match result display simplifier
Sponsored-by: Dartmouth College's DANDI project
Joey Hess [Wed, 26 Jul 2023 18:34:21 +0000 (14:34 -0400)]
--explain for preferred/required content matching
And annex.largefiles and annex.addunlocked.
Also git-annex matchexpression --explain explains why its input
expression matches or fails to match.
When there is no limit, avoid explaining why the lack of limit
matches. This is also done when no preferred content expression is set,
although in a few cases it defaults to a non-empty matcher, which will
be explained.
Sponsored-by: Dartmouth College's DANDI project
nobodyinperson [Wed, 26 Jul 2023 17:40:56 +0000 (17:40 +0000)]
Added a comment: Workaround for listing dead remotes
aragilar [Wed, 26 Jul 2023 12:56:21 +0000 (12:56 +0000)]
Joey Hess [Tue, 25 Jul 2023 21:02:18 +0000 (17:02 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Tue, 25 Jul 2023 20:11:06 +0000 (16:11 -0400)]
initial implementation of --explain
Currently it only displays explanations of options like --in and --copies.
In the future, it should explain preferred content expression evaluation
and other decisions.
The explanations of a few things could be better. In particular,
"standard" will just appear as-is (or as "!standard" if it doesn't
match), rather than explaining why the standard preferred content expression
for the group matches or not.
Currently as implemented, it goes to stdout, and so commands like
git-annex find that have custom output will not display --explain
information. Perhaps that should change, dunno.
Sponsored-by: Dartmouth College's DANDI project
Joey Hess [Tue, 25 Jul 2023 19:53:50 +0000 (15:53 -0400)]
Revert "use existing debug machinery for explain"
This reverts commit
409572c9e4c0c77814a5b448d26cf87054b07874.
Joey Hess [Tue, 25 Jul 2023 19:47:58 +0000 (15:47 -0400)]
use existing debug machinery for explain
explain is a kind of debug message, but not formatted in the same way.
So it makes sense to reuse the debug machinery for it, since that is
already quite optimised.
Sponsored-by: Dartmouth College's DANDI project
Joey Hess [Tue, 25 Jul 2023 17:55:01 +0000 (13:55 -0400)]
remove excess doubled parens in match description
Sponsored-by: Dartmouth College's DANDI project
Joey Hess [Tue, 25 Jul 2023 17:39:40 +0000 (13:39 -0400)]
parenthesize match description as needed to avoid ambiguity
While avoiding most unncessary parens.
Once case where unncessary parens are not avoided is:
not ( ( not foo and baz ) )
It would be good eventually to remove doubled parens like these.
Sponsored-by: Dartmouth College's DANDI project
Joey Hess [Tue, 25 Jul 2023 16:54:44 +0000 (12:54 -0400)]
list some Utility/ modules that are AGPL
Joey Hess [Tue, 25 Jul 2023 16:41:59 +0000 (12:41 -0400)]
accumulate description while matching
This is to be used to explain why something did or didn't match.
Note that this reimplements match in terms of matchMrun.
Implementing match' as a Writer and matchMrun' as a MonadWriter
resulted in nearly identical implementations, which collapsed into the
same thing thanks to Writer being WriterT Identity.
MAnd and MOr implement short circuiting. So an expression
like "not (foo and bar)" will be explained as [MatchedNot, MatchOperation "foo"]
when foo does not match; whether bar matches is irrelevant. Similarly
"foo or bar" will be explained as [MatchedOperation "foo"] when foo
matches. It seems like that will keep the explanations more
understandable. But also, matchMrun already did short circuiting, and it
could be considerably more work to check if bar matches in these cases.
Note that the type signature of matchMrun changed, but it was
over-generic before.
Note that these changes are licensed under the AGPL. Changed module
license accordingly.
Sponsored-by: Dartmouth College's DANDI project
Joey Hess [Tue, 25 Jul 2023 15:08:33 +0000 (11:08 -0400)]
tag option_to_explain dandi
See comment, this is a continuation of the other todo that was tagged
dandi and which I didn't fully address at the time.
hurlebouc [Mon, 24 Jul 2023 13:10:09 +0000 (13:10 +0000)]
Added a comment
Joey Hess [Fri, 21 Jul 2023 20:04:11 +0000 (16:04 -0400)]
gcrypt: Remove empty hash directories when dropping content
As was recently done with the directory special remote.
Note that the top directory passed to removeDirGeneric was changed to
avoid deleting .git/annex or .git/annex/objects if they ended up empty.
Sponsored-by: Brett Eisenberg on Patreon
Joey Hess [Fri, 21 Jul 2023 19:36:01 +0000 (15:36 -0400)]
typo
Joey Hess [Fri, 21 Jul 2023 19:33:59 +0000 (15:33 -0400)]
comment
Joey Hess [Fri, 21 Jul 2023 19:15:11 +0000 (15:15 -0400)]
remove spam
Joey Hess [Fri, 21 Jul 2023 19:14:36 +0000 (15:14 -0400)]
comment
Joey Hess [Fri, 21 Jul 2023 18:57:29 +0000 (14:57 -0400)]
directory: Remove empty hash directories when dropping content
Failure to remove is not treated as a problem, and no permissions
modifications are done, to avoid unexpected states.
Sponsored-by: Luke Shumaker on Patreon
Joey Hess [Fri, 21 Jul 2023 18:03:34 +0000 (14:03 -0400)]
dropunused: Support --jobs
Sponsored-by: Kevin Mueller on Patreon
Joey Hess [Fri, 21 Jul 2023 17:48:49 +0000 (13:48 -0400)]
deal with Amazon S3 breaking change for public=yes
* S3: Amazon S3 buckets created after April 2023 do not support ACLs,
so public=yes cannot be used with them. Existing buckets configured
with public=yes will keep working.
* S3: Allow setting publicurl=yes without public=yes, to support
buckets that are configured with a Bucket Policy that allows public
access.
Sponsored-by: Joshua Antonishen on Patreon
Joey Hess [Fri, 21 Jul 2023 17:01:46 +0000 (13:01 -0400)]
comment
hipohaha [Fri, 21 Jul 2023 10:08:15 +0000 (10:08 +0000)]
Added a comment: thank
tomdhunt [Wed, 19 Jul 2023 02:49:48 +0000 (02:49 +0000)]
nobodyinperson [Mon, 17 Jul 2023 10:56:08 +0000 (10:56 +0000)]
bug report
nobodyinperson [Mon, 17 Jul 2023 06:19:46 +0000 (06:19 +0000)]
add PeerTube link to Yann's Git Annex talk @Tübix2023
nobodyinperson [Mon, 17 Jul 2023 06:12:27 +0000 (06:12 +0000)]
Added a comment
ewen [Mon, 17 Jul 2023 00:50:09 +0000 (00:50 +0000)]
Added a comment: unspecified default preferred content = present
alex [Sun, 16 Jul 2023 06:51:33 +0000 (06:51 +0000)]
nobodyinperson [Sat, 15 Jul 2023 17:04:38 +0000 (17:04 +0000)]
Added a comment
Joey Hess [Sat, 15 Jul 2023 16:28:32 +0000 (12:28 -0400)]
comment
nobodyinperson [Sat, 15 Jul 2023 11:19:27 +0000 (11:19 +0000)]
Suggest onlyingroup preferred content expression
nobodyinperson [Sat, 15 Jul 2023 05:53:43 +0000 (05:53 +0000)]
Added a comment: git annex drop --unused --jobs=cpus works
agot [Fri, 14 Jul 2023 22:31:05 +0000 (22:31 +0000)]
agot [Fri, 14 Jul 2023 19:14:34 +0000 (19:14 +0000)]
Joey Hess [Fri, 14 Jul 2023 00:02:41 +0000 (20:02 -0400)]
comment
Joey Hess [Thu, 13 Jul 2023 23:58:36 +0000 (19:58 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Thu, 13 Jul 2023 23:57:34 +0000 (19:57 -0400)]
add a warning and a related todo
arising from a conversation at FOSSY
Joey Hess [Thu, 13 Jul 2023 23:55:38 +0000 (19:55 -0400)]
fix formatting of \ continued shell examples in man pages
doc/git-annex-filter-branch.mdwn and one other file have these, and no
other files have \ at the end of line, so this should be safe
ewen [Thu, 13 Jul 2023 01:12:34 +0000 (01:12 +0000)]
Added a comment: git mv to temporary name, commit, git mv back, commit, can resolve duplicates
ewen [Thu, 13 Jul 2023 00:54:35 +0000 (00:54 +0000)]
Added a comment
ewen [Thu, 13 Jul 2023 00:26:20 +0000 (00:26 +0000)]
Added a comment: Plumbing commands vs Porcelain commands
Joey Hess [Wed, 12 Jul 2023 17:55:10 +0000 (13:55 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Wed, 12 Jul 2023 17:54:59 +0000 (13:54 -0400)]
comment
jkniiv [Wed, 12 Jul 2023 17:30:52 +0000 (17:30 +0000)]
Added a comment
Joey Hess [Wed, 12 Jul 2023 17:27:33 +0000 (13:27 -0400)]
comment
Joey Hess [Wed, 12 Jul 2023 16:57:46 +0000 (12:57 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
jkniiv [Wed, 12 Jul 2023 16:25:49 +0000 (16:25 +0000)]
Added a comment
nobodyinperson [Wed, 12 Jul 2023 13:10:26 +0000 (13:10 +0000)]
Added a comment
ewen [Wed, 12 Jul 2023 12:48:04 +0000 (12:48 +0000)]
Added a comment: Alternative proposal for better backwards compatibility
nobodyinperson [Wed, 12 Jul 2023 11:29:41 +0000 (11:29 +0000)]
Added a comment: Clarification
nobodyinperson [Wed, 12 Jul 2023 11:15:26 +0000 (11:15 +0000)]
Added a comment: There is already something like fullsync: `git annex assist`, suggestion: new `metasync` command
ewen [Wed, 12 Jul 2023 10:53:41 +0000 (10:53 +0000)]
Added a comment: Preferred content settings not really an alternative
ewen [Wed, 12 Jul 2023 10:27:43 +0000 (10:27 +0000)]
Added a comment: History of change
ewen [Wed, 12 Jul 2023 10:21:04 +0000 (10:21 +0000)]
Added a comment: Breaking change to "sync"
nobodyinperson [Wed, 12 Jul 2023 09:21:56 +0000 (09:21 +0000)]
Added a comment
jkniiv [Wed, 12 Jul 2023 07:33:16 +0000 (07:33 +0000)]
Added a comment
jkniiv [Wed, 12 Jul 2023 07:18:54 +0000 (07:18 +0000)]
Added a comment: I have to agree that this change to `sync` is annoying