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 2018-05-31 11:49:35 -04:00
commit f09a235c87
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
6 changed files with 132 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
doc/bugs/OSX_Assistant_will_not_automatically_drop/comment_5_47aa5de003b409d3d2a4c58a0f08a14a._comment Normal file
View file

@ -0,0 +1,45 @@
[[!comment format=mdwn
username="jhnichol@cce81d2a480707652a3340ea2f24b3dc4b1f808c"
nickname="jhnichol"
avatar="http://cdn.libravatar.org/avatar/2d05fd7e681bf4838bba8bab538ac65d"
subject="comment 5"
date="2018-05-30T17:36:30Z"
content="""
I started over, making new repos with the webapp & version: 6.20180527-gc3064edac .
I still get an error in the webapp when adding the USB repo .
The USB repo `/Volumes/SeagateBlack/annex` was not in `~/.config/git-annex/autostart` , so I added it .
I enabled debugging in the webapp, shutdown the webapp and assistants, and used the terminal:
JamesMac:annex jhnichol$ cd /Volumes/SeagateBlack/annex
JamesMac:annex jhnichol$ git-annex assistant --autostart
git-annex: You cannot run this command in a bare repository.
JamesMac:annex jhnichol$ cd /Users/jhnichol/Desktop/annex
JamesMac:annex jhnichol$ git-annex assistant --autostart
git-annex autostart in /Users/jhnichol/Desktop/annex
[2018-05-30 20:13:45.005716] call: /Applications/git-annex.app/Contents/MacOS/bundle/git-annex [\"assistant\",\"--stop\"]
[2018-05-30 20:13:45.064878] process done ExitSuccess
[2018-05-30 20:13:45.065006] call: /Applications/git-annex.app/Contents/MacOS/bundle/git-annex [\"assistant\",\"--startdelay=5s\"]
[2018-05-30 20:13:45.117653] logging to .git/annex/daemon.log
[2018-05-30 20:13:45.507796] read: git [\"--git-dir=.git\",\"--work-tree=.\",\"--literal-pathspecs\",\"-c\",\"core.bare=false\",\"show-ref\",\"git-annex\"]
[2018-05-30 20:13:45.520686] process done ExitSuccess
[2018-05-30 20:13:45.520806] read: git [\"--git-dir=.git\",\"--work-tree=.\",\"--literal-pathspecs\",\"-c\",\"core.bare=false\",\"show-ref\",\"--hash\",\"refs/heads/git-annex\"]
[2018-05-30 20:13:45.526297] process done ExitSuccess
[2018-05-30 20:13:45.526857] read: git [\"--git-dir=.git\",\"--work-tree=.\",\"--literal-pathspecs\",\"-c\",\"core.bare=false\",\"log\",\"refs/heads/git-annex..2f0d4e1b6fe058a5cc899012ef99870cd2877d2c\",\"--pretty=%H\",\"-n1\"]
[2018-05-30 20:13:45.537446] process done ExitSuccess
[2018-05-30 20:13:45.537572] read: git [\"--git-dir=.git\",\"--work-tree=.\",\"--literal-pathspecs\",\"-c\",\"core.bare=false\",\"log\",\"refs/heads/git-annex..31d29d92a8a48146cdf9dd4517f5a034daf4a467\",\"--pretty=%H\",\"-n1\"]
[2018-05-30 20:13:45.543984] process done ExitSuccess
[2018-05-30 20:13:45.544626] chat: git [\"--git-dir=.git\",\"--work-tree=.\",\"--literal-pathspecs\",\"-c\",\"core.bare=false\",\"cat-file\",\"--batch\"]
[2018-05-30 20:13:45.546186] chat: git [\"--git-dir=.git\",\"--work-tree=.\",\"--literal-pathspecs\",\"-c\",\"core.bare=false\",\"cat-file\",\"--batch-check=%(objectname) %(objecttype) %(objectsize)\"]
[2018-05-30 20:13:45.550793] read: git [\"config\",\"--null\",\"--list\"]
[2018-05-30 20:13:45.556288] process done ExitSuccess
[2018-05-30 20:13:45.557233] logging to .git/annex/daemon.log
[2018-05-30 20:13:45.565149] process done ExitSuccess
ok
git-annex autostart in /Volumes/SeagateBlack/annex
failed
so you see I got the \"You cannot run this command in a bare repository\" error from the assistant.
Also, the assistant for the USB drive just fails with no error details.
Thank you so much for your comments! I feel so close to having working software!
"""]]

17
doc/bugs/OSX_Assistant_will_not_automatically_drop/comment_6_69781b2f00afe6150bc5997335b8af90._comment Normal file
View file

@ -0,0 +1,17 @@
[[!comment format=mdwn
username="andrew"
avatar="http://cdn.libravatar.org/avatar/acc0ece1eedf07dd9631e7d7d343c435"
subject="bare remotes, workflow"
date="2018-05-31T12:50:55Z"
content="""
Aaah.
So although git-annex does support storing files in bare repositories it treats them in much the same way as git in general. Namely, they are meant to be added as remotes from other full repositories. Assistant is responsible for monitoring a working directory for changes and automatically committing and syncing those changes. Bare repositories don't actually need assistant monitoring them because they don't have a working directory where users are adding and removing files from.
In your case, you want assistant monitoring `~/Desktop/annex` which it now is. If you then add `/Volumes/SeagateBlack/annex` as a remote to `~/Desktop/annex` then assistant, by watching just `~/Desktop/annex` will sync with all remotes whenever you add remove files in `~/Desktop/annex`. I imagine you already have your USB drive correctly setup as a remote. Just run `git annex info` from your `~/Desktop/annex` directory to see what remotes it knows about.
Once USB is a remote of `~/Desktop/annex`, then if you launch the webapp from your `~/Desktop/annex` directory,`git-annex webapp` you should actually see both `~/Desktop/annex` and `/Volumes/SeagateBlack/annex` listed. The webapp automatically lists all remotes your repo knows about.
In terms of workflow, I am not actually sure that using a bare repo is what you want on your USB drive. I always setup normal full git repositories on USB drives (not bare repos). That way I can use Finder to actually browse out to the files on the USB drive, add files when I am on the go, copy files etc… If you use a bare repo, then the files won't actually be listed in a usable form. But, if you don't actually want to ever look at the files on your USB drive (from Finder) then using a bare remote on a USB drive has the advantage that you don't need assistant monitoring it, and is probably marginally faster in some extreme cases since there is no working tree to update.
"""]]

19
doc/forum/Migrate_from_one_connection_mechanism_for_special_remote_to_another/comment_2_db4b772371ee49c743605c728e23c91a._comment Normal file
View file

@ -0,0 +1,19 @@
[[!comment format=mdwn
username="marek@33e8ba4fbc201af14a2badcc0656024401f5c916"
nickname="marek"
avatar="http://cdn.libravatar.org/avatar/65a60e8f5183feeeef8cef815bf73e61"
subject="Fixed a first problem and then ran into bigger problems"
date="2018-05-31T09:29:30Z"
content="""
By using
git show git-annex:remote.log
one can extract the cipher from the old remote and set it with
git annex enableremote $newremote cipher=$CIPHER
However, then I ran into a new problem. The git-annex-remote-hubic special remote created files with leading slashes (/GPGHMACSHA1--00021a41c3143f1e52f16af93625d1072e861543).
Rclone, and I don`t even mean git-annex-remote-rclone, cannot access these files. It interprets the slash as directory separator which leads to those files not being found.
I guess I will just reupload to fix the slash error in the first place. Or find a Hubic client that can deal with slashes and rename the objects remotely.
"""]]

10
doc/forum/done_bugs_are_missing/comment_1_400c15824ec84bd67583102a023edcf8._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="andrew"
avatar="http://cdn.libravatar.org/avatar/acc0ece1eedf07dd9631e7d7d343c435"
subject="comment 1"
date="2018-05-31T03:15:37Z"
content="""
Ooops. Hit post, before I finished.
…but I couldn't find the bug report. I was pleasantly surprised when I did discover you had fixed this, so quickly! But the fix was only mentioned in the release notes. I think it is great to see the entire list of bugs you have fixed on the website, it shows how much effort you put into this project and how actively maintained it is.
"""]]

8
doc/forum/git-annex_webapp_launch_behavior_is_confusing.mdwn Normal file
View file

@ -0,0 +1,8 @@
After first installing git-annex if I run `git-annex webapp` on Ubuntu 16.04.4 LTS (annex version 6.20180528-g5300386c2) then the process does not go to the background, but instead stays a foreground process. I can add files to a repo that assistant is watching and it will see them. But, if I then close the web browser and then kill the foreground process that launched the webapp, then all annex processes go away, and git-annex assistant is no longer running anywhere. IE if I then add a file to an assistant repo it won't be seen.
If I reboot, then a bunch of annex processes are automatically started as daemons. Now my repos are watched again. If I launch git-annex webapp, this time the process immediately forks to the background which is different behavior.
The behavior I would expect is that calling `git-annex webapp` should launch, the webapp dameon, load the page in a browser and call something like `git-annex assistant --autostart` as well.
—[Andrew](http://git-annex.branchable.com/users/andrew/)

33
doc/forum/git_status_typechange_in_v5_direct_false.mdwn Normal file
View file

@ -0,0 +1,33 @@
Should I see a typechange from `git status` when using direct mode = false?
I'm using digiKam to manage photos in a git-annex repository. digiKam will only write XMP sidecar files for real files, not symlinks, so I need to unlock every file in order to sync metadata to XMP files.
Is it possible to suppress typechange in some way?
Thanks.
On branch master
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
typechange: photographers/jboxman/2004/06/16/20040616-004528.jpg
.......
typechange: photographers/jboxman/2004/06/17/20040617-010127.jpg
[annex]
uuid = 56e0d203-7898-xxxx-xxxx-1b04cec6597c
version = 5
largefiles = largerthan=20kb and not (include=*.xmp or include=*.thor or include=bin/*)
direct = false
git-annex version: 6.20171124
build flags: Assistant Webapp Pairing Testsuite S3(multipartupload)(storageclasses) WebDAV FsEvents TorrentParser MagicMime Feeds Quvi
dependency versions: aws-0.17.1 bloomfilter-2.0.1.0 cryptonite-0.24 DAV-1.3.1 feed-1.0.0.0 ghc-8.2.2 http-client-0.5.7.1 persistent-sqlite-2.6.3.1torrent-10000.1.1 uuid-1.3.13 yesod-1.4.5
key/value backends: SHA256E SHA256 SHA512E SHA512 SHA224E SHA224 SHA384E SHA384 SHA3_256E SHA3_256 SHA3_512E SHA3_512 SHA3_224E SHA3_224 SHA3_384ESHA3_384 SKEIN256E SKEIN256 SKEIN512E SKEIN512 SHA1E SHA1 MD5E MD5 WORM URL
remote types: git gcrypt p2p S3 bup directory rsync web bittorrent webdav tahoe glacier ddar hook external
local repository version: 5
supported repository versions: 3 5 6
upgrade supported from repository versions: 0 1 2 3 4 5
operating system: darwin x86_64