Commit graph

43120 commits

Author SHA1 Message Date
Joey Hess
195508fc65
Improve error message when unable to read a sqlite database due to permissions problem
Old message was:

sqlite query crashed: thread blocked indefinitely in an MVar operation

New message is eg:

sqlite worker thread crashed: SQLite3 returned ErrorCan'tOpen while attempting to perform open ".git/annex/keysdb/db".

The worker thread used to throw an exception. But before that
exception was seen by anything waiting on the worker thread to
finish, the takeMVar in queryDb would have crashed with
BlockedIndefinitelyOnMVar.

Sponsored-by: k0ld on Patreon
2023-02-23 15:28:22 -04:00
Joey Hess
338f28f3a6
comment 2023-02-23 15:14:32 -04:00
Joey Hess
595f5b8b1a
comment 2023-02-23 14:46:44 -04:00
Joey Hess
35f37ecb9a
Merge branch 'master' of ssh://git-annex.branchable.com 2023-02-23 14:40:38 -04:00
Joey Hess
d5ad74d14f
add m68k to arch lists for webapp build deps 2023-02-23 14:26:20 -04:00
Joey Hess
f24f96e018
move webapp build deps under Assistant build flag
git-annex.cabal: Move webapp build deps under the Assistant build flag so
git-annex can be built again without yesod etc installed.

Commit 78440ca37d got rid of the webapp build
flag to work around what was apparently a cabal bug. It moved the webapp
build deps to the main build-depends list. But that prevents building
git-annex when yesod etc are not installed.

Putting them under the Assistant build flag seems to not tickle that cabal
bug, and lets git-annex build automatically with the assistant disabled
when the webapp build deps are not installed.

I hypotehesize that the problem may have involved build-depends nested
behind two build flags. Also, cabal clean may need to be run in order
for cabal to find the right solution after this change, when building in
a directory where cabal configure had been run before.

Also moved 3 modules that are needed to build git-annex w/o the assistant
out from under the Assistant build flag.

Sponsored-by: Brock Spratlen on Patreon
2023-02-23 12:25:22 -04:00
Atemu
cfb396becf Added a comment 2023-02-23 08:59:28 +00:00
nobodyinperson
a268dbf401 2023-02-22 21:57:19 +00:00
hurlebouc
5b6202c973 Added a comment 2023-02-21 06:49:27 +00:00
Joey Hess
d1a0f0c7d1
comment 2023-02-20 15:19:31 -04:00
Joey Hess
8f2829e646
Revert "stack.yaml: Update to lts-19.33 and aws-0.24"
This reverts commit 648e59cac2.

Failed to build on windows, because

       In the dependencies for haskeline-0.8.2:
           Win32-2.11.1.0 from Stack configuration does not match >=2.1 && <2.10 || >=2.12 (latest
                          matching version is 2.13.4.0)

jkniiv did find a solution that builds:

-- Win32-2.11.1.0
+- Win32-2.9.0.0
+- Cabal-3.6.3.0
+- directory-1.3.7.1
+- process-1.6.17.0
+- time-1.11.1.2

But that is a quite old version of Win32 and risks bugs from it, and bumping
Cabal and directory to newer than lts-19.33 has seems also likely to be risky.

So, I've given up. aws-0.24 won't be able to be in the stack build until
there's a stackage lts (or nightly) that has filepath (>=1.4.100.0),
which will not happen until sometime after the next ghc release.
2023-02-20 15:15:06 -04:00
Joey Hess
326f01f5a3
response 2023-02-20 15:00:59 -04:00
Joey Hess
75a2fb9441
comment and close 2023-02-20 14:46:47 -04:00
Joey Hess
ab1dd317c0
comment 2023-02-20 14:38:22 -04:00
Joey Hess
16d3097a08
fix reversion in info, and add test case
info: Fix reversion in last release involving handling of unsupported input
by continuing to handle any other inputs, before exiting nonzero at the
end.

Sponsored-by: Dartmouth College's Datalad project
2023-02-20 14:31:37 -04:00
jg123h12jh3y12g3y
4199c457e2 2023-02-20 13:09:45 +00:00
yarikoptic
349f8afecb Added a comment 2023-02-17 21:50:19 +00:00
yarikoptic
36c76040e2 duplicating report here to possibly expedite resolution 2023-02-17 18:15:48 +00:00
arnaud.legrand@e79f5d4cff79116f56388885021e8507bef18e12
804ea016d0 Added a comment: Weird behavior of git archive in combination with largefiles configuration 2023-02-17 09:46:34 +00:00
arnaud.legrand@e79f5d4cff79116f56388885021e8507bef18e12
ff601ddc45 removed 2023-02-17 09:45:14 +00:00
arnaud.legrand@e79f5d4cff79116f56388885021e8507bef18e12
5c4d53be19 Added a comment: Weird behavior of git archive in combination with largefiles configuration 2023-02-17 09:44:35 +00:00
arnaud.legrand@e79f5d4cff79116f56388885021e8507bef18e12
d31e605b02 removed 2023-02-17 09:43:51 +00:00
arnaud.legrand@e79f5d4cff79116f56388885021e8507bef18e12
4e83ff3bbd Added a comment: Weird behavior of git archive in combination with largefiles configuration 2023-02-17 09:43:20 +00:00
sb-beryllium@6e2c477eac63b823bd315ef8aaf5f93173c1f15b
e8297e9cb2 Added a comment 2023-02-17 01:42:58 +00:00
jkniiv
221aa59bfb report on resolver LTS 19 still (!) causing trouble with Win32 for stack builds 2023-02-16 21:44:30 +00:00
Joey Hess
da61d564f1
fix view reversion caused by optimisation
view: Fix a reversion in 10.20230214 that omitted a file from a view when
the file had no metadata set, but the view only used path fields.

Sponsored-by: Jack Hill on Patreon
2023-02-16 15:18:17 -04:00
Joey Hess
1c2e5b4519
close bug as dup and update todo item with implementation plan 2023-02-16 14:51:00 -04:00
jkniiv
5565f6b61b a todo on: explicit metadata needed for view inclusion or not 2023-02-15 19:07:25 +00:00
Joey Hess
cb2f071377
Merge branch 'master' of ssh://git-annex.branchable.com 2023-02-15 14:51:51 -04:00
Joey Hess
648e59cac2
stack.yaml: Update to lts-19.33 and aws-0.24
This enables some new features that need the new aws.

Win32 downgraded from the version in lts-19.33 because git-annex does not build
with that version, and newer versions of Win32 need a newer filepath version,
which can't be upgraded while using lts-19.33.

Sponsored-By: Brett Eisenberg on Patreon
2023-02-15 14:51:41 -04:00
Joey Hess
3048d2f3d7
close bug as submitter cannot reproduce it 2023-02-15 13:53:19 -04:00
jkniiv
33ac9eb02c report on sync not working properly with view branches on top of adjusted branches 2023-02-15 15:23:29 +00:00
Daniel Höxtermann
474ea248e0 Fix typo "intiremote" 2023-02-14 21:21:46 +01:00
anarcat
22fe15c8ce Added a comment 2023-02-14 19:03:24 +00:00
Joey Hess
672258c8f4
Revert "revert recent bug fix temporarily for release"
This reverts commit 16f1e24665.
2023-02-14 14:11:23 -04:00
Joey Hess
dd1a5f4961
add news item for git-annex 10.20230214 2023-02-14 14:09:25 -04:00
Joey Hess
f3019d7e22
releasing package git-annex version 10.20230214 2023-02-14 14:09:10 -04:00
Joey Hess
16f1e24665
revert recent bug fix temporarily for release
Decided this bug is not severe enough to delay the release until
tomorrow, so this will be re-applied after the release.
2023-02-14 14:06:29 -04:00
Joey Hess
c1ef4a7481
Avoid Git.Config.updateLocation adding "/.git" to the end of the repo
path to a bare repo when git config is not allowed to list the configs
due to the CVE-2022-24765 fix.

That resulted in a confusing error message, and prevented the nice
message that explains how to mark the repo as safe to use.

Made isBare a tristate so that the case where core.bare is not returned can
be handled.

The handling in updateLocation is to check if the directory
contains config and objects and if so assume it's bare.
Note that if that heuristic is somehow wrong, it would construct a repo
that thinks it's bare but is not. That could cause follow-on problems,
but since git-annex then checks checkRepoConfigInaccessible, and skips
using the repo anyway, a wrong guess should not be a problem.

Sponsored-by: Luke Shumaker on Patreon
2023-02-14 14:00:36 -04:00
Joey Hess
12b45d3b89
use isBareRepo
The advantage over Git.Config.isBare is that it avoids a string
comparison and a map lookup.

Sponsored-by: Noam Kremen on Patreon
2023-02-14 13:52:05 -04:00
Joey Hess
8077fc9ce7
analysis 2023-02-14 13:31:26 -04:00
Joey Hess
c1f4d536b2
fix comment 2023-02-14 13:28:02 -04:00
Joey Hess
e44716f277
upper case start of warning 2023-02-14 12:34:46 -04:00
Joey Hess
7c69f3a75a
add space after colon in warning message 2023-02-14 12:34:07 -04:00
Joey Hess
4ed539dd40
bug report from forum 2023-02-14 12:30:58 -04:00
Joey Hess
2b73662291
comment 2023-02-14 12:18:00 -04:00
nobodyinperson
2e80d964de Added a comment: 👍 This made it easier for the Thunar plugin! 2023-02-14 09:35:32 +00:00
sb-beryllium@6e2c477eac63b823bd315ef8aaf5f93173c1f15b
e970c4eb99 Added a comment: Resolved 2023-02-13 22:46:48 +00:00
Joey Hess
452b080dba
better handling of multiple repositories with the same name
Used to fail with a bad error message, indicating there was no
repository with the specified name, or something like that. Now, suggest
they use the uuid to disambiguate.

* info, enableremotemote, renameremote: Avoid a confusing message when more
  than one repository matches the user provided name.
* info: Exit nonzero when the input is not supported.

Sponsored-by: Kevin Mueller on Patreon
2023-02-13 14:31:09 -04:00
Joey Hess
826b225ca8
Sped up view branch construction by 50%
A benchmark in my sound repository with `git-annex view feedtitle=*`
took 2:52 wall clock time before and 1:58 after. Though it still only used
130% of CPU.

This is the same kind of optimisation that is in seekFilteredKeys, though
that precaches location logs while this streams the metadata logs direct
to parsing them.

seekFilteredKeys contains more streaming, to find the annexed files, and
this could be further sped up with similar streaming.

Sponsored-by: Nicholas Golder-Manning on Patreon
2023-02-13 13:29:57 -04:00