mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

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

Browse source
This commit is contained in:
Joey Hess 2022-10-07 12:29:32 -04:00
commit e9a1f3f351
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
6 changed files with 134 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

25
doc/bugs/FTBFS_for_the_2nd_day.mdwn Normal file
View file

@ -0,0 +1,25 @@
### Please describe the problem.
Got the report in the past days that failed to build across all platforms. Looked today:
```
[274 of 679] Compiling CmdLine.Usage ( CmdLine/Usage.hs, dist/build/git-annex/git-annex-tmp/CmdLine/Usage.o )
CmdLine/Usage.hs:63:1: error:
Duplicate type signatures for `paramRemote'
at CmdLine/Usage.hs:61:1-11
CmdLine/Usage.hs:63:1-11
|
63 | paramRemote :: String
| ^^^^^^^^^^^
CmdLine/Usage.hs:64:1: error:
Multiple declarations of `paramRemote'
Declared at: CmdLine/Usage.hs:62:1
CmdLine/Usage.hs:64:1
|
64 | paramRemote = "REPOSITORY"
| ^^^^^^^^^^^
```
on Debian, didn't check if other systems are anyhow different, will bounce report with pointers just in case.

29
doc/bugs/FTBFS_for_the_2nd_day/comment_1_b7278de8f98c9fd96219281d61284461._comment Normal file
View file

@ -0,0 +1,29 @@
[[!comment format=mdwn
username="jkniiv"
avatar="http://cdn.libravatar.org/avatar/05fd8b33af7183342153e8013aa3713d"
subject="comment 1"
date="2022-10-06T06:21:40Z"
content="""
That seems to be a simple typo where the latter/duplicate definition should be named `paramRepository` instead.
The following fixes the build:
[[!format diff \"\"\"
diff --git a/CmdLine/Usage.hs b/CmdLine/Usage.hs
index f3434d709..65879f7c3 100644
--- a/CmdLine/Usage.hs
+++ b/CmdLine/Usage.hs
@@ -60,8 +60,8 @@ paramNumRange :: String
paramNumRange = \"NUM|RANGE\"
paramRemote :: String
paramRemote = \"REMOTE\"
-paramRemote :: String
-paramRemote = \"REPOSITORY\"
+paramRepository :: String
+paramRepository = \"REPOSITORY\"
paramField :: String
paramField = \"FIELD\"
paramGlob :: String
\"\"\"]]
Windows tests are A-OK also.
"""]]

8
doc/bugs/FTBFS_for_the_2nd_day/comment_2_05c93396766cb9ac6a596db679519718._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="yarikoptic"
avatar="http://cdn.libravatar.org/avatar/f11e9c84cb18d26a1748c33b48c924b4"
subject="comment 2"
date="2022-10-06T12:50:01Z"
content="""
Thank you jkniiv! If Joey doesn't fix it soon, I will add that patch. FTR: [an example of a patch PR for our datalad/git-annex build](https://github.com/datalad/git-annex/pull/77).
"""]]

15
doc/bugs/FTBFS_for_the_2nd_day/comment_3_0037f0e43383f32b22ee1ba2c98d78f8._comment Normal file
View file

@ -0,0 +1,15 @@
[[!comment format=mdwn
username="jkniiv"
avatar="http://cdn.libravatar.org/avatar/05fd8b33af7183342153e8013aa3713d"
subject="comment 3"
date="2022-10-06T16:04:41Z"
content="""
You're welcome, Yarik! I try to do my part for git-annex although for medical reasons my personal
bandwidth is a bit limited (for instance, I don't pretend to grok Haskell much at all except at
a general functional programming level and I have even trouble with some of the intricacies of git, too).
However, I felt your last sentence was a small hint/suggestion, so with a small leap of faith I made my first
contribution to an outside project in the form of a pull request to datalad/git-annex,
[here](https://github.com/datalad/git-annex/pull/134) . :)
"""]]

15
doc/bugs/android_sync_messes_tree/comment_5_7fda943808cc1b7155c1223fea08e8df._comment Normal file
View file

@ -0,0 +1,15 @@
[[!comment format=mdwn
username="jules@a6ba859eba6f59bd980f294741b1ad9b7624552a"
nickname="jules"
avatar="http://cdn.libravatar.org/avatar/a751e2ef9129dfaf6c68a0d762e5db60"
subject="comment 5"
date="2022-10-04T17:59:53Z"
content="""
Yes, I did change the 'annex-tracking-branch' in the way you described. I was trying various values and I guess I expected git-annex not to keep any state after I interrupted the transfer (a few files were transfered).
I suspect the merge conflicts (on the android/master branch) were a combination of interrupting the process and changing the config back and forth. I think I could see them because my git config (name, email) is temporarily broken if the worktree is changed, which interrupted the committing.
I would expect git-annex to remember what happened only if it completed. In the case of adb, transfer is pretty slow and it's not likely to ever terminate (if I didn't meant to sync that many files, I won't wait days for it to complete).
The impacted files were all the files to be synced, only a fraction of which was actually synced.
"""]]

42
doc/bugs/move.log__58___openFile__58___resource_busy___40__file_is_locked__41__.mdwn Normal file
View file

@ -0,0 +1,42 @@
### Please describe the problem.
From [https://github.com/DanielDent/git-annex-remote-rclone/pull/57](https://github.com/DanielDent/git-annex-remote-rclone/pull/57), where we use that rclone special remote for backup of DANDI data to dropbox
Seems like a test sometimes fails on Mac OS with:
```
+ git-annex copy -J5 --quiet . --to GA-rclone-CI
git-annex: .git/annex/move.log: openFile: resource busy (file is locked)
copy: 1 failed
Error: Process completed with exit code 1.
```
indeed so far seemed to happen only on Mac
```
(git)smaug:/mnt/datasets/datalad/ci/git-annex-remote-rclone[master]2022
$> datalad foreach-dataset git grep 'file is locked'
foreach-dataset(error): /mnt/datasets/datalad/ci/git-annex-remote-rclone (dataset) [CommandError: 'git grep 'file is locked'' failed with exitcode 1 under /mnt/datasets/datalad/ci/git-annex-remote-rclone]
03/cron/20221003T064418/da57e9a/github-Tests-144-failed/9_test (macos-latest, v1.53.3).txt:2022-10-03T06:47:44.4978580Z git-annex: .git/annex/move.log: openFile: resource busy (file is locked)
03/cron/20221003T064418/da57e9a/github-Tests-144-failed/test (macos-latest, v1.53.3)/9_tests.txt:2022-10-03T06:47:44.4978530Z git-annex: .git/annex/move.log: openFile: resource busy (file is locked)
03/push/master/1d0d3ce/github-Tests-146-failed/10_test (macos-latest, v1.33).txt:2022-10-03T23:35:41.8464390Z git-annex: .git/annex/move.log: openFile: resource busy (file is locked)
03/push/master/1d0d3ce/github-Tests-146-failed/9_test (macos-latest, v1.53.3).txt:2022-10-03T23:37:44.0652500Z git-annex: .git/annex/move.log: openFile: resource busy (file is locked)
03/push/master/1d0d3ce/github-Tests-146-failed/test (macos-latest, v1.33)/9_tests.txt:2022-10-03T23:35:41.8463970Z git-annex: .git/annex/move.log: openFile: resource busy (file is locked)
03/push/master/1d0d3ce/github-Tests-146-failed/test (macos-latest, v1.53.3)/9_tests.txt:2022-10-03T23:37:44.0652360Z git-annex: .git/annex/move.log: openFile: resource busy (file is locked)
foreach-dataset(ok): /mnt/datasets/datalad/ci/git-annex-remote-rclone/2022/10 (dataset)
foreach-dataset(error): /mnt/datasets/datalad/ci/git-annex-remote-rclone/2022/06 (dataset) [CommandError: 'git grep 'file is locked'' failed with exitcode 1 under /mnt/datasets/datalad/ci/git-annex-remote-rclone/2022/06]
foreach-dataset(error): /mnt/datasets/datalad/ci/git-annex-remote-rclone/2022/07 (dataset) [CommandError: 'git grep 'file is locked'' failed with exitcode 1 under /mnt/datasets/datalad/ci/git-annex-remote-rclone/2022/07]
foreach-dataset(error): /mnt/datasets/datalad/ci/git-annex-remote-rclone/2022/09 (dataset) [CommandError: 'git grep 'file is locked'' failed with exitcode 1 under /mnt/datasets/datalad/ci/git-annex-remote-rclone/2022/09]
foreach-dataset(error): /mnt/datasets/datalad/ci/git-annex-remote-rclone/2022/08 (dataset) [CommandError: 'git grep 'file is locked'' failed with exitcode 1 under /mnt/datasets/datalad/ci/git-annex-remote-rclone/2022/08]
```
### What steps will reproduce the problem?
no minimal reproducer yet but happens as part of [this test "script"](https://github.com/DanielDent/git-annex-remote-rclone/blob/master/tests/all-in-one.sh)
### What version of git-annex are you using? On what operating system?
git-annex version: 10.20220927
[[!meta author=yoh]]
[[!tag projects/dandi]]