Commit graph

44038 commits

Author SHA1 Message Date
anarcat
5d7eec4402 2023-08-10 00:37:15 +00:00
anarcat
6561f0049f 2023-08-10 00:36:56 +00:00
Joey Hess
adda6c1088
Add git-annex remote refs that are not newer to the merged refs list
Significant startup speed increase by avoiding repeatedly checking if some
remote git-annex branch refs need to be merged when it is not newer.

One way this could happen is when there are 2 remotes that are themselves
connected. The git-annex branch on the first remote gets updated. Then the
second remote pulls from the first, and merges in its git-annex branch.
Then the local repo pulls from the second remote, and merges its git-annex
branch. At this point, a pull from the first remote will get a git-annex
branch that is not newer, but is not on the merged refs list.

In my big repo, git-annex startup time dropped from 4 seconds to 0.1 seconds.
There were 5 to 10 such remote refs out of 18 remotes.

Sponsored-by: Graham Spencer on Patreon
2023-08-09 13:31:36 -04:00
Joey Hess
a86521a396
Merge branch 'master' of ssh://git-annex.branchable.com 2023-08-09 12:43:56 -04:00
Joey Hess
3efad7f5f4
info: Added --dead-repositories option
I considered a more wide-ranging config option to make other commands
also show dead repositories. But it would be difficult to implement that
because Remote.keyLocations is used to get locations, filtering out dead
repos, and commands like get then try to use those locations. So a config
setting would make dead repos sometimes be acted on by commands.

Sponsored-by: unqueued on Patreon
2023-08-09 12:43:48 -04:00
nobodyinperson
09b894cc8f Added a comment 2023-08-09 05:31:26 +00:00
Joey Hess
27a9915a67
closing dup 2023-08-08 13:45:37 -04:00
Joey Hess
3f6c762a3d
comment 2023-08-08 13:43:04 -04:00
Joey Hess
dfc126d29f
Merge branch 'master' of ssh://git-annex.branchable.com 2023-08-08 13:11:07 -04:00
Joey Hess
0c2e885796
fix link 2023-08-08 13:11:00 -04:00
Joey Hess
1e754dd10c
link 2023-08-08 13:08:56 -04:00
jkniiv
e9ad2d83f4 Added a comment 2023-08-08 16:38:53 +00:00
Joey Hess
6d83bcff0f
Fix behavior of onlyingroup
Sponsored-by: k0ld on Patreon
2023-08-07 13:05:11 -04:00
xvorsx@a3fc1a0cf228782f624e5eb21ba8a664227b6c60
389b8726fc removed 2023-08-07 07:20:55 +00:00
xvorsx@a3fc1a0cf228782f624e5eb21ba8a664227b6c60
db79935bc4 removed 2023-08-07 07:20:40 +00:00
xvorsx@a3fc1a0cf228782f624e5eb21ba8a664227b6c60
26ff1bd11b removed 2023-08-07 07:20:25 +00:00
xvorsx@a3fc1a0cf228782f624e5eb21ba8a664227b6c60
f3709afb6d Added a comment 2023-08-07 07:19:57 +00:00
xvorsx@a3fc1a0cf228782f624e5eb21ba8a664227b6c60
bfae7171be Added a comment 2023-08-07 07:19:46 +00:00
xvorsx@a3fc1a0cf228782f624e5eb21ba8a664227b6c60
22af5b1467 Added a comment 2023-08-07 07:19:35 +00:00
xvorsx@a3fc1a0cf228782f624e5eb21ba8a664227b6c60
b25e871903 Added a comment 2023-08-07 07:19:25 +00:00
jkniiv
b4d1591283 report on --onlyingroup only partially working 2023-08-05 11:15:30 +00:00
Joey Hess
e48829a5bf
use new bloomfilter release
Build with new ghc and also fixes a bug on 32 bit
2023-08-04 17:14:04 -04:00
Joey Hess
f2d2b4c46b
comment 2023-08-04 12:31:51 -04:00
Joey Hess
720e096bd8
update 2023-08-03 12:42:08 -04:00
Joey Hess
f773a89ee7
add news item for git-annex 10.20230802 2023-08-02 16:09:26 -04:00
Joey Hess
d19139a10d
releasing package git-annex version 10.20230802 2023-08-02 16:09:14 -04:00
Joey Hess
85aadcfa1e
windows back to lts-18.13 temporarily
I can't seem to get stack to resolve dependencies with Win32-2.13.4.0,
no matter what I try. Why it blows up, I don't know.

And allow-newer: true actually causes it to downgrade Win32 to the one
version that won't build. Unbelivable that allows downgrades.

So just gonna have to wait for that to get into stackage nightly, and
then stack.yaml can be updated to use that, and the changes in this
commit reverted.
2023-08-02 12:49:38 -04:00
Joey Hess
461330c585
remove support for building with older Win32
No need to preserve this since the cabal file depends on the newer one.
2023-08-02 11:59:57 -04:00
Joey Hess
9e2e5bc79b
relocate BLOCK.txt to move convenient location 2023-08-02 11:58:07 -04:00
Joey Hess
f1842b616a
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.
2023-08-02 11:50:12 -04:00
Joey Hess
7d81b3b0d9
pin win32 to working version 2023-08-02 10:48:23 -04:00
Joey Hess
9a60f5b65f
fix build on windows 2023-08-02 10:43:20 -04:00
Joey Hess
8adafdd013
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.
2023-08-02 10:08:00 -04:00
Joey Hess
19d95c9bb8
enable TypeOperators
more warnings about ~ needing it in a future ghc release
2023-08-02 09:47:42 -04:00
Joey Hess
28864f0bb2
add back utf8-string to setup build deps
Needed on Windows since Utility.FileSystemEncoding uses it
2023-08-02 09:29:23 -04:00
Joey Hess
3a52b4c4c3
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 26a9ea12d1
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.)
2023-08-01 20:22:28 -04:00
Joey Hess
6da6449fff
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
2023-08-01 18:53:26 -04:00
Joey Hess
68c9b08faf
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.
2023-08-01 18:41:27 -04:00
Joey Hess
4ef16f53ed
enable TypeOperators 2023-08-01 18:39:01 -04:00
Joey Hess
aa5e333cb7
fix whitespace
Thanks to a compile warning from new ghc
2023-08-01 18:36:54 -04:00
Joey Hess
11db986781
enable TypeOperators
The use of ‘~’ without TypeOperators
    will become an error in a future GHC release.

says new ghc
2023-08-01 18:33:39 -04:00
Joey Hess
eb8e30a2f1
fix build with unix-2.8.0
got the arguments the wrong way around when I wrote this

also squelch a build warning
2023-08-01 18:27:12 -04:00
Joey Hess
63f76d0ac3
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.
2023-08-01 17:47:30 -04:00
Joey Hess
d76f088dc4
fix build on windows 2023-08-01 17:39:24 -04:00
Joey Hess
3b825eb7a6
rewrap 2023-08-01 15:47:05 -04:00
Joey Hess
fb640bc2f4
support building with unix-compat 0.7
It removed System.PosixCompat.User.
2023-08-01 15:17:43 -04:00
Joey Hess
1bc7792101
Merge branch 'master' of ssh://git-annex.branchable.com 2023-08-01 15:17:07 -04:00
Joey Hess
393275c105
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
6491b62614 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
2023-08-01 15:08:56 -04:00
xvorsx@a3fc1a0cf228782f624e5eb21ba8a664227b6c60
e9b8e09b2c 2023-08-01 06:36:50 +00:00
nobodyinperson
8740a46f02 Add missing formatting backtick 2023-08-01 05:32:19 +00:00