Commit graph

43753 commits

Author SHA1 Message Date
Joey Hess
9286769d2c
let Remote.availability return Unavilable
This is groundwork for making special remotes like borg be skipped by
sync when on an offline drive.

Added AVAILABILITY UNAVAILABLE reponse and the UNAVAILABLERESPONSE extension
to the external special remote protocol. The extension is needed because
old git-annex, if it sees that response, will display a warning
message. (It does continue as if the remote is globally available, which
is acceptable, and the warning is only displayed at initremote due to
remote.name.annex-availability caching, but still it seemed best to make
this a protocol extension.)

The remote.name.annex-availability git config is no longer used any
more, and is documented as such. It was only used by external special
remotes to cache the availability, to avoid needing to start the
external process every time. Now that availability is queried as an
Annex action, the external is only started by sync (and the assistant),
when they actually check availability.

Sponsored-by: Nicholas Golder-Manning on Patreon
2023-08-16 14:31:31 -04:00
Joey Hess
7f7c95b771
move comment 2023-08-16 13:19:17 -04:00
Joey Hess
5126f6d002
comment 2023-08-16 13:16:49 -04:00
anarcat
4c7e2b167e 2023-08-16 14:40:17 +00:00
Joey Hess
75275ed41f
update
Last commit also removed curl from linux standalone tarball.
Which may or may not have been a mistake.. I'm inclined to go ahead and
simplify it.
2023-08-15 14:22:30 -04:00
Joey Hess
571a516ed2
Stop bundling curl in the OSX dmg
New curl binary links to libldap with a @loader_path that prevents using
the binary when the dmg is used elsewhere.
See https://github.com/datalad/git-annex/issues/170

git-annex doesn't use curl by default anyway, so it doesn't really need to
be included in the dmg.
2023-08-15 14:21:53 -04:00
Joey Hess
9fffa85a9e
comment 2023-08-15 13:21:28 -04:00
Joey Hess
10b5f79e2d
fix empty tree import when directory does not exist
Fix behavior when importing a tree from a directory remote when the
directory does not exist. An empty tree was imported, rather than the
import failing. Merging that tree would delete every file in the
branch, if those files had been exported to the directory before.

The problem was that dirContentsRecursive returned [] when the directory
did not exist. Better for it to throw an exception. But in commit
74f0d67aa3 back in 2012, I made it never
theow exceptions, because exceptions throw inside unsafeInterleaveIO become
untrappable when the list is being traversed.

So, changed it to list the contents of the directory before entering
unsafeInterleaveIO. So exceptions are thrown for the directory. But still
not if it's unable to list the contents of a subdirectory. That's less of a
problem, because the subdirectory does exist (or if not, it got removed
after being listed, and it's ok to not include it in the list). A
subdirectory that has permissions that don't allow listing it will have its
contents omitted from the list still.

(Might be better to have it return a type that includes indications of
errors listing contents of subdirectories?)

The rest of the changes are making callers of dirContentsRecursive
use emptyWhenDoesNotExist when they relied on the behavior of it not
throwing an exception when the directory does not exist. Note that
it's possible some callers of dirContentsRecursive that used to ignore
permissions problems listing a directory will now start throwing exceptions
on them.

The fix to the directory special remote consisted of not making its
call in listImportableContentsM use emptyWhenDoesNotExist. So it will
throw an exception as desired.

Sponsored-by: Joshua Antonishen on Patreon
2023-08-15 12:57:41 -04:00
Joey Hess
9aac41f86c
remove unused imports 2023-08-15 12:43:26 -04:00
Joey Hess
d467c70ef7
change sync content transition plan and fine tune warning
Only display warning when git-annex sync (without --content or
--no-content) is used with repositories that have preferred content
configured.

Sponsored-by: Leon Schuermann on Patreon
2023-08-14 13:51:35 -04:00
Joey Hess
afb7703c9f
Merge branch 'master' of ssh://git-annex.branchable.com 2023-08-14 12:29:53 -04:00
Joey Hess
be028f10e5
split out Utility.Url.Parse
This is mostly for git-repair which can't include all of Utility.Url
without adding many dependencies that are not really necessary.
2023-08-14 12:28:10 -04:00
aurtzy
d8602aace0 include system that i forgot in report 2023-08-13 19:48:46 +00:00
aurtzy
1c621f24d8 2023-08-11 01:22:30 +00:00
nobodyinperson
1613f7caae Added a comment 2023-08-10 01:08:16 +00:00
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