Merge branch 'master' of ssh://git-annex.branchable.com

2024-01-18 11:53:20 -04:00 · 2024-01-18 11:53:20 -04:00 · 517904b770
commit 517904b770
parent 285073712a 38e79ba1d7
4 changed files with 128 additions and 0 deletions
--- a/doc/bugs/Option_--from-anywhere_not_recognized_in_copy.mdwn
+++ b/doc/bugs/Option_--from-anywhere_not_recognized_in_copy.mdwn
@ -0,0 +1,48 @@
+### Please describe the problem.
+The `--from-anywhere` option is not recognized.
+
+### What steps will reproduce the problem?
+Create a repo, add a file to it, clone it, then try to copy the files with `git annex copy $FILE --from-anywhere --to=here`
+```sh
+$ mkdir a && cd a
+$ git init
+$ git annex init
+$ touch somefile
+$ git annex add somefile
+$ git commit -m "blub"
+$ cd ..
+$ git clone a b
+$ cd b
+$ git annex init
+$ git annex copy somefile --from-anywhere --to=here
+```
+The last command fails with
+`Invalid option `--from-anywhere'`
+
+### What version of git-annex are you using? On what operating system?
+Output from `git annex version`
+```
+git-annex version: 10.20231129-gbacd781c4fe05126219c4b5f2963677a6de01481
+build flags: Assistant Webapp Pairing Inotify DBus DesktopNotify TorrentParser MagicMime Benchmark Feeds Testsuite S3 WebDAV
+dependency versions: aws-0.24 bloomfilter-2.0.1.2 crypton-0.34 DAV-1.3.4 feed-1.3.2.1 ghc-9.0.2 http-client-0.7.15 persistent-sqlite-2.13.1.0 torrent-10000.1.3 uuid-1.3.15 yesod-1.6.2.1
+key/value backends: SHA256E SHA256 SHA512E SHA512 SHA224E SHA224 SHA384E SHA384 SHA3_256E SHA3_256 SHA3_512E SHA3_512 SHA3_224E SHA3_224 SHA3_384E SHA3_384 SKEIN256E SKEIN256 SKEIN512E SKEIN512 BLAKE2B256E BLAKE2B256 BLAKE2B512E BLAKE2B512 BLAKE2B160E BLAKE2B160 BLAKE2B224E BLAKE2B224 BLAKE2B384E BLAKE2B384 BLAKE2BP512E BLAKE2BP512 BLAKE2S256E BLAKE2S256 BLAKE2S160E BLAKE2S160 BLAKE2S224E BLAKE2S224 BLAKE2SP256E BLAKE2SP256 BLAKE2SP224E BLAKE2SP224 SHA1E SHA1 MD5E MD5 WORM URL X*
+remote types: git gcrypt p2p S3 bup directory rsync web bittorrent webdav adb tahoe glacier ddar git-lfs httpalso borg hook external
+operating system: linux x86_64
+supported repository versions: 8 9 10
+upgrade supported from repository versions: 0 1 2 3 4 5 6 7 8 9 10
+local repository version: 10
+```
+
+I'm experiencing this issue on EndeavourOS
+```
+$ uname -r
+6.6.10-arch1-1
+```
+
+### Please provide any additional information below.
+
+
+### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
+git annex does everything I was looking for when I found it and then some. Thank you for creating and maintaining it!
+
+
--- a/doc/bugs/windows_started_to_FTBFS/comment_1_094012512e6c267f05d3d61c0ed638a0._comment
+++ b/doc/bugs/windows_started_to_FTBFS/comment_1_094012512e6c267f05d3d61c0ed638a0._comment
@ -0,0 +1,52 @@
+[[!comment format=mdwn
+ username="jkniiv"
+ avatar="http://cdn.libravatar.org/avatar/05fd8b33af7183342153e8013aa3713d"
+ subject="I can confirm"
+ date="2024-01-16T22:28:21Z"
+ content="""
+but the true point of error seems to be this (line 1167 in the log):
+
+```
+[605 of 696] Compiling Test
+D:\a\git-annex\git-annex\Test.hs:1850:1: error:
+[606 of 696] Compiling Assistant.Pairing
+    The type signature for `test_gpg_crypto'
+      lacks an accompanying binding
+[607 of 696] Compiling Assistant.Types.DaemonStatus
+      Perhaps you meant one of these:
+[608 of 696] Compiling Assistant.Monad
+        `test_sop_crypto' (Defined at Test.hs:1833:1),
+[609 of 696] Compiling Assistant.Types.NamedThread
+        `test_crypto' (Defined at Test.hs:1944:1)
+```
+
+In fact if you do a non-parallelbuild, stack bails out already @ Test.hs:
+
+```
+[603 of 696] Compiling CmdLine.GitAnnexShell
+[604 of 696] Compiling Utility.Verifiable
+[605 of 696] Compiling Test
+
+C:\Users\jkniiv\Projektit\git-annex.branchable.com\git-annex--BUILD-240116-c15fa1763\Test.hs:1850:1: error:
+    The type signature for `test_gpg_crypto'
+      lacks an accompanying binding
+      Perhaps you meant one of these:
+        `test_sop_crypto' (Defined at Test.hs:1833:1),
+        `test_crypto' (Defined at Test.hs:1944:1)
+     |
+1850 | test_gpg_crypto :: Assertion
+     | ^^^^^^^^^^^^^^^
+
+Error: [S-7282]
+       Stack failed to execute the build plan.
+
+       While executing the build plan, Stack encountered the error:
+
+       [S-7011]
+       While building package git-annex-10.20231227 (scroll up to its section to see the error)
+       using:
+       C:\Users\jkniiv\Projektit\git-annex.branchable.com\git-annex--BUILD-240116-c15fa1763\.stack-work\dist\ed8db9df\setup\setup --verbose=1 --builddir=.stack-work\dist\ed8db9df build exe:git-annex --ghc-options \"\"
+       Process exited with code: ExitFailure 1
+```
+
+"""]]
--- a/doc/bugs/windows_started_to_FTBFS/comment_2_1ad4a7da4dd4353838fd5c1f9610ee32._comment
+++ b/doc/bugs/windows_started_to_FTBFS/comment_2_1ad4a7da4dd4353838fd5c1f9610ee32._comment
@ -0,0 +1,26 @@
+[[!comment format=mdwn
+ username="jkniiv"
+ avatar="http://cdn.libravatar.org/avatar/05fd8b33af7183342153e8013aa3713d"
+ subject="comment 2"
+ date="2024-01-16T23:23:27Z"
+ content="""
+The compilation error turned out to be a typo / small neglect. The following quick fix makes it go away
+(at least with build flag `--flag 'git-annex:-ParallelBuild'`):
+
+[[!format diff \"\"\"
+diff --git a/Test.hs b/Test.hs
+index c8db8147a4..b752d4dc22 100644
+--- a/Test.hs
+++ b/Test.hs
+@@ -1941,7 +1941,7 @@ test_gpg_crypto = do
+                        Annex.Locations.keyPaths .
+                        Crypto.encryptKey Types.Crypto.HmacSha1 cipher
+ #else
+-test_crypto = putStrLn \"gpg testing not implemented on Windows\"
+test_gpg_crypto = putStrLn \"gpg testing not implemented on Windows\"
+ #endif
+
+ test_add_subdirs :: Assertion
+\"\"\"]]
+
+"""]]
--- a/doc/users/nobodyinperson.mdwn
+++ b/doc/users/nobodyinperson.mdwn
@ -8,4 +8,6 @@ I use git-annex to:

 I made a [Thunar plugin](https://gitlab.com/nobodyinperson/thunar-plugins) for git-annex, here's a [📹 screencast](https://fosstodon.org/@nobodyinperson/109836827575976439).

+In an attempt to [#gitAnnexAllTheThings](https://fosstodon.org/tags/gitAnnexAllTheThings), I used git annex as a backend for a cli time tracker [annextimelog](https://pypi.org/project/annextimelog/). It has similarities with timewarrior but adresses many of its inconveniences.
+
 At the [Tübix 2023](https://www.tuebix.org/) I gave a (German) git annex workshop, of which you can find a recording of the initial talk [📹 here in the fediverse](https://tube.tchncs.de/w/db1ec5ca-94ad-4f49-a507-2124fd699ff1) and [📹 here on Odysee](https://odysee.com/@nobodyinperson:6/T%C3%BCbix2023-Yann-B%C3%BCchau-git-annex:6).