From deff3021ed62fc44e016c8886ff916c66f5565a0 Mon Sep 17 00:00:00 2001 From: "pablo@4f5b00d7b40f0a52e51761da420d6ff8e7c9aca7" Date: Wed, 30 Nov 2016 18:56:32 +0000 Subject: --- doc/bugs/wget_always_shows_progress_bar.mdwn | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 doc/bugs/wget_always_shows_progress_bar.mdwn (limited to 'doc') diff --git a/doc/bugs/wget_always_shows_progress_bar.mdwn b/doc/bugs/wget_always_shows_progress_bar.mdwn new file mode 100644 index 000000000..2829b39b0 --- /dev/null +++ b/doc/bugs/wget_always_shows_progress_bar.mdwn @@ -0,0 +1,24 @@ +### Please describe the problem. + +git annex addurl or importfeed operations were quiet on git-annex versions older than 5.20141219, if +annex.web-options was set to "--quiet". But now the --show-progress option is always passed to wget. + +In some use cases this might be nice, but I'm using GNU Parallel to update multiple podcast feeds +concurrently, and it causes wget to output the ugly "dot" indicator for every feed, which is totally +useless since parallel buffers and groups the output. Adding "--no-show-progress" to web-options +does not help (it does not override --show-progress), nor does redirecting stdout to /dev/null. +Redirecting stderr would hide possible errors. + +### What steps will reproduce the problem? + +parallel git annex importfeed --relaxed --quiet ::: http://feeds.feedburner.com/freakonomicsradio + +### What version of git-annex are you using? On what operating system? + +5.20151208-1~bpo8+1 on Debian. + +### 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) + +I love git annex and use it daily. + + -- cgit v1.2.3 From b11233da2728aa2e4be93c4672553cb0b9271c11 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 30 Nov 2016 17:04:15 -0400 Subject: devblog --- doc/devblog/day_431__p2p_linking.mdwn | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 doc/devblog/day_431__p2p_linking.mdwn (limited to 'doc') diff --git a/doc/devblog/day_431__p2p_linking.mdwn b/doc/devblog/day_431__p2p_linking.mdwn new file mode 100644 index 000000000..1e53ffefc --- /dev/null +++ b/doc/devblog/day_431__p2p_linking.mdwn @@ -0,0 +1,27 @@ +Today I finished the second-to-last big missing peice for tor hidden service +remotes. Networks of these remotes are P2P networks, and there needs to be +a way for peers to find one-another, and to authenticate with one-another. +The `git annex p2p` command sets up links between peers in such a network. + +So far it has only a basic interface that sets up a one way link between +two peers. In the first repository, run `git annex p2p --gen-address`. +That outputs a long address. In the second repository, run +`git annex p2p --link peer1`, and paste the address into it. That sets up a +git remote named "peer1" that connects back to the first repository over tor. + +That is a one-directional link, while a bi-directional link would be +much more convenient to have between peers. Worse, the address can be reused by +anyone who sees it, to link into the repository. And, the address is far +too long to communicate in any way except for pasting it. + +So I want to improve that later. What I'd really like to have is an +interface that displays a one-time-use phrase of five to ten words, that +can be read over the phone or across the room. Exchange phrases with a +friend, and get your repositories securely linked together with tor. + +But, `git annex p2p` is good enough for now. I can move on to the final +keystone of the tor support, which is file transfer over tor. +That should, fingers crossed, be relatively easy, and the `tor` branch is +close to mergeable now. + +Today's work was sponsored by Riku Voipio. -- cgit v1.2.3 From ba0f490d65bf0afb5eb7b2c54276da2310349960 Mon Sep 17 00:00:00 2001 From: spiffytech Date: Wed, 30 Nov 2016 21:58:01 +0000 Subject: --- doc/forum/Extra___38___missing_folders_on_remote.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 doc/forum/Extra___38___missing_folders_on_remote.mdwn (limited to 'doc') diff --git a/doc/forum/Extra___38___missing_folders_on_remote.mdwn b/doc/forum/Extra___38___missing_folders_on_remote.mdwn new file mode 100644 index 000000000..b78961ccc --- /dev/null +++ b/doc/forum/Extra___38___missing_folders_on_remote.mdwn @@ -0,0 +1,9 @@ +I created a local annex directory that's an adjusted branch used with the assistant. On another machine, I initialized an annex directory, then made this into a full-backup ssh remote for my local. + +After the assistant pushes to the remote, and the remote runs `git annex sync`, the remote is missing some directories and has some extra directories. For example, it has the extra directory `Documents/programs/Documents/programs/`, which has different contents than `Documents/programs/`. Both directories are missing the subdirectory `graphing_experiments/`. + +From my local, `git annex whereis Documents/programs/graphing_experiments` says the directory exists on the remote. But it's not there. + +I recreated the remote from scratch and the problem persists. + +The assistant says the remote is caught up, and is keeping up with new content changes. What could cause this? -- cgit v1.2.3 From aa1ef62371e0996aeec8b2e19df3e4c0ed278234 Mon Sep 17 00:00:00 2001 From: "https://anarc.at/openid/" Date: Wed, 30 Nov 2016 22:16:19 +0000 Subject: Added a comment: magic wormhole --- ...ent_1_1d5f809564c25e765f82594af8e174ab._comment | 49 ++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 doc/devblog/day_431__p2p_linking/comment_1_1d5f809564c25e765f82594af8e174ab._comment (limited to 'doc') diff --git a/doc/devblog/day_431__p2p_linking/comment_1_1d5f809564c25e765f82594af8e174ab._comment b/doc/devblog/day_431__p2p_linking/comment_1_1d5f809564c25e765f82594af8e174ab._comment new file mode 100644 index 000000000..9eceb71ed --- /dev/null +++ b/doc/devblog/day_431__p2p_linking/comment_1_1d5f809564c25e765f82594af8e174ab._comment @@ -0,0 +1,49 @@ +[[!comment format=mdwn + username="https://anarc.at/openid/" + nickname="anarcat" + avatar="http://cdn.libravatar.org/avatar/b36dcf65657dd36128161355d8920a99503def9461c1bb212410980fe6f07125" + subject="magic wormhole" + date="2016-11-30T22:16:19Z" + content=""" +> What I'd really like to have is an interface that displays a +> one-time-use phrase of five to ten words, that can be read over the +> phone or across the room. Exchange phrases with a friend, and get +> your repositories securely linked together with tor. + +I already mentionned the project in [[design/assistant/telehash/]], +but [magic-wormhole](https://github.com/warner/magic-wormhole) does +exactly that: + + % wormhole send README.md + Sending 7924 byte file named 'README.md' + On the other computer, please run: wormhole receive + Wormhole code is: 7-crossover-clockwork + + Sending (<-10.0.1.43:58988).. + 100%|=========================| 7.92K/7.92K [00:00<00:00, 6.02MB/s] + File sent.. waiting for confirmation + Confirmation received. Transfer complete. + +Receiver: + + % wormhole receive + Enter receive wormhole code: 7-crossover-clockwork + Receiving file (7924 bytes) into: README.md + ok? (y/n): y + Receiving (->tcp:10.0.1.43:58986).. + 100%|===========================| 7.92K/7.92K [00:00<00:00, 120KB/s] + Received file written to README.md + +While that example shows a file transfer, arbitrary data can be +transfered this way. There's a documented protocol, and it's not +completely peer-to-peer: there are relay servers to deal with NAT'd +machines. But the [PAKE +protocol](https://en.wikipedia.org/wiki/Password-authenticated_key_agreement) +(basically SPAKE2) could be a good inspiration here. + +Otherwise, I must say that, as a user, I don't mind copy-pasting a +hidden service string (if that's what it's about): i can do that over +a secure medium (email + OpenPGP or IM + OTR) easily... But I +understand it can be difficult to do for new users. + +"""]] -- cgit v1.2.3 From cbd34c7f92427244b1a698a71a4728326b78aa28 Mon Sep 17 00:00:00 2001 From: "Yury V. Zaytsev" Date: Wed, 30 Nov 2016 19:37:32 +0100 Subject: Remove obsolete link to Windows build logs --- doc/install/Windows.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/install/Windows.mdwn b/doc/install/Windows.mdwn index c9b60d642..1d9599ac8 100644 --- a/doc/install/Windows.mdwn +++ b/doc/install/Windows.mdwn @@ -24,7 +24,7 @@ important thing is that it should end with "All tests passed". A daily build is also available, thanks to Yury V. Zaytsev and Dartmouth College. -* [download](https://downloads.kitenet.net/git-annex/autobuild/windows/) ([build logs](https://qa.nest-initiative.org/view/msysGit/job/msysgit-git-annex-assistant-test/)) +* [download](https://downloads.kitenet.net/git-annex/autobuild/windows/) ## building it yourself -- cgit v1.2.3 From abf8daf9643c72b09140826840ea3cafe2b8431b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 1 Dec 2016 12:07:21 -0400 Subject: change link to windows autobuild page --- doc/builds.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/builds.mdwn b/doc/builds.mdwn index e6c7c8082..77c9351e3 100644 --- a/doc/builds.mdwn +++ b/doc/builds.mdwn @@ -49,7 +49,7 @@

Windows

-here +here (firewalled from most locations; kite can access it)

Debian

-- cgit v1.2.3 From 3f034e60c3bf65d7c85497cc709ecffc53b1c435 Mon Sep 17 00:00:00 2001 From: "https://openid.stackexchange.com/user/3ee5cf54-f022-4a71-8666-3c2b5ee231dd" Date: Thu, 1 Dec 2016 18:54:24 +0000 Subject: --- doc/bugs/ssh___34__Include__34___feature_broke_Android.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 doc/bugs/ssh___34__Include__34___feature_broke_Android.mdwn (limited to 'doc') diff --git a/doc/bugs/ssh___34__Include__34___feature_broke_Android.mdwn b/doc/bugs/ssh___34__Include__34___feature_broke_Android.mdwn new file mode 100644 index 000000000..8cdf8e157 --- /dev/null +++ b/doc/bugs/ssh___34__Include__34___feature_broke_Android.mdwn @@ -0,0 +1,6 @@ +### Please describe the problem. +https://git-annex.branchable.com/bugs/git_annex_init_failed_due_to_unsupported_ssh_option/ deal with Include not being supported by pre 7.3 by using the 6.4+ IgnoreUnknown directive. + +Unfortunately, the Android apk (which I got from https://downloads.kitenet.net/git-annex/android/current/5.0/git-annex.apk) has (according to ssh -v) OpenSSH_6.0p1. + +I had to edit .git/annex/ssh.config to comment out the three offending lines and then append the contents of ~/.ssh/config to get git-annex working again. -- cgit v1.2.3 From 9d7f051195626bf4317574423f398803c48a7842 Mon Sep 17 00:00:00 2001 From: "https://openid.stackexchange.com/user/3ee5cf54-f022-4a71-8666-3c2b5ee231dd" Date: Thu, 1 Dec 2016 18:54:57 +0000 Subject: --- doc/bugs/ssh___34__Include__34___feature_broke_Android.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/bugs/ssh___34__Include__34___feature_broke_Android.mdwn b/doc/bugs/ssh___34__Include__34___feature_broke_Android.mdwn index 8cdf8e157..9be4d4318 100644 --- a/doc/bugs/ssh___34__Include__34___feature_broke_Android.mdwn +++ b/doc/bugs/ssh___34__Include__34___feature_broke_Android.mdwn @@ -4,3 +4,5 @@ https://git-annex.branchable.com/bugs/git_annex_init_failed_due_to_unsupported_s Unfortunately, the Android apk (which I got from https://downloads.kitenet.net/git-annex/android/current/5.0/git-annex.apk) has (according to ssh -v) OpenSSH_6.0p1. I had to edit .git/annex/ssh.config to comment out the three offending lines and then append the contents of ~/.ssh/config to get git-annex working again. + +(This is on a Nexus 10 running stock, though I doubt it matters) -- cgit v1.2.3 From 9e4df1bd89799ac25ae011f0e1f1895cd406111f Mon Sep 17 00:00:00 2001 From: "lorenzo@a77fdbe826df1c175cbd30ed050312ccf7b7fc7b" Date: Sat, 3 Dec 2016 09:04:45 +0000 Subject: --- doc/todo/Long_Running_Filter_Process.mdwn | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 doc/todo/Long_Running_Filter_Process.mdwn (limited to 'doc') diff --git a/doc/todo/Long_Running_Filter_Process.mdwn b/doc/todo/Long_Running_Filter_Process.mdwn new file mode 100644 index 000000000..329abaf45 --- /dev/null +++ b/doc/todo/Long_Running_Filter_Process.mdwn @@ -0,0 +1,22 @@ +Hello, + +while reading the release notes of git 2.11 I noticed a cool new feature has been merged: + +> If the filter command (a string value) is defined via +> `filter..process` then Git can process all blobs with a +> single filter invocation for the entire life of a single Git +> command. + +see the [git documentation][1]. + +This has been developed in the context of git-lfs (see [PR 1382] [2]). + +If I understand correctly how it works this could speed up v6 repos. Looking at the history/website +of git-annex there doesn't seem to be yet any work on this so I though it was worth calling the +attention on the feature. + +Thanks a lot for all the work on git-annex, it's a really amazing project! The more I study it the more cool features I discover :) + + +[1]: https://github.com/git/git/blob/v2.11.0/Documentation/gitattributes.txt#L384 +[2]: https://github.com/git-lfs/git-lfs/pull/1382 -- cgit v1.2.3 From 613c2b1073cdc498ed7fdb8f6f47e7cc7f1d8993 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 3 Dec 2016 16:30:48 -0400 Subject: break out curent list of names into its own file so I can auto-add from patreon and some misc updates --- doc/thanks/list | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 doc/thanks/list (limited to 'doc') diff --git a/doc/thanks/list b/doc/thanks/list new file mode 100644 index 000000000..7b5a19ec1 --- /dev/null +++ b/doc/thanks/list @@ -0,0 +1,44 @@ +martin f. krafft, +John Byrnes, +Aurélien Couderc, +Jeffrey Chiu, +Amitai Schlair, +Andreas, +Anthony DeRobertis, +Baldur Kristinsson, +Boyd Stephen Smith Jr., +Brock Spratlen, +Christian Diller, +Denis Dzyubenko, +Eskild Hustvedt, +Evgeni Kunev, +FBC, +Fernando Jimenez, +Greg Young, +Henrik RIomar, +Ignacio, +Jake Vosloo, +James Valleroy, +Jason Woofenden, +Jeff Goeke-Smith, +Jim, +Jochen Bartl, +Johannes Schlatow, +John Carr, +Josh Taylor, +Josh Triplett, +Kuno Woudt, +Matthias Urlichs, +Mattias J, +Nathan Howell, +Nick Daly, +Nicolas Schodet, +Ole-Morten Duesund, +Remy van Elst, +RémiV, +Thom May, +Thomas Ferris Nicolaisen, +Thomas Hochstein, +Tyler Cipriani, +encryptio, +Øyvind A. Holm, -- cgit v1.2.3 From ea610775847b9d3b4f6e1166f0a89aed3a0323de Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 3 Dec 2016 16:51:16 -0400 Subject: update --- doc/thanks/list | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/thanks/list b/doc/thanks/list index 7b5a19ec1..653466f81 100644 --- a/doc/thanks/list +++ b/doc/thanks/list @@ -41,4 +41,13 @@ Thomas Ferris Nicolaisen, Thomas Hochstein, Tyler Cipriani, encryptio, -Øyvind A. Holm, +Øyvind A. Holm, +Bruno BEAUFILS, +Rémi Vanicat, +Trenton Cronholm, +Francois Marier, +Peter Hogg, +Amitai Schleier, +Brennen Bearnes, +Tim Howes, +Willard Korfhage, -- cgit v1.2.3 From 89c95979c37ffc04f0ae30b1a997f46ef6b59862 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 3 Dec 2016 16:52:18 -0400 Subject: use list --- doc/thanks.mdwn | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) (limited to 'doc') diff --git a/doc/thanks.mdwn b/doc/thanks.mdwn index 645cca732..eec468606 100644 --- a/doc/thanks.mdwn +++ b/doc/thanks.mdwn @@ -1,6 +1,6 @@ The development of git-annex was made possible by the generous donations of many people. I want to say "Thank You!" to each of -you individually, but until I meet all 1500 of you, this page will have to +you individually, but until I meet all 1500+ of you, this page will have to do. You have my most sincere thanks. --[[Joey]] You can support my git-annex development @@ -18,16 +18,8 @@ git-annex development is partially supported by the [NSF](https://www.nsf.gov/awardsearch/showAward?AWD_ID=1429999) as a part of the [DataLad project](http://datalad.org/). -Thanks also to these folks for their support: martin f. krafft, John Byrnes, -Aurélien Couderc, Jeffrey Chiu, Amitai Schlair, Andreas, Anthony DeRobertis, -Baldur Kristinsson, Boyd Stephen Smith Jr., Brock Spratlen, Christian Diller, -Denis Dzyubenko, Eskild Hustvedt, Evgeni Kunev, FBC, Fernando Jimenez, Greg -Young, Henrik RIomar, Ignacio, Jake Vosloo, James Valleroy, Jason Woofenden, -Jeff Goeke-Smith, Jim, Jochen Bartl, Johannes Schlatow, John Carr, Josh -Taylor, Josh Triplett, Kuno Woudt, Matthias Urlichs, Mattias J, Nathan Howell, -Nick Daly, Nicolas Schodet, Ole-Morten Duesund, Remy van Elst, RémiV, Thom -May, Thomas Ferris Nicolaisen, Thomas Hochstein, Tyler Cipriani, encryptio, -Øyvind A. Holm +Thanks also to these folks for their support: +[[!inline raw=yes pages="thanks/list"]] and anonymous supporters. ## 2013-2014 @@ -385,13 +377,11 @@ Tyree, Aaron Whitehouse * Rsync.net, for providing me a free account so I can make sure git-annex works well with it. * LeastAuthority.com, for providing me a free Tahoe-LAFS grid account, - so I can test git-annex with that, and back up the git-annex assistant - screencasts. + so I can test git-annex with that. +* Yury V. Zaytsev for running the Windows autobuilder. +* Kevin McKenzie for providing a OSX account for testing. * Anna and Mark, for the loan of the video camera; as well as the rest of my family, for your support. Even when I couldn't explain what I was working on. -* The Hodges, for providing such a congenial place for me to live and work - on these first world problems, while you're off helping people in the - third world. * And Mom, for stamping and stuffing so many thank you envelopes, and all the rhubarb pies. -- cgit v1.2.3 From 84361b45d676d8112e822ef7d2183f8028de9d9e Mon Sep 17 00:00:00 2001 From: "justin.lebar@7a36fcafc322d9a381e89f08ab6289033c6dde91" Date: Sun, 4 Dec 2016 04:30:38 +0000 Subject: Added a comment --- .../comment_3_5ac676877feaa7cdb9e05d6b71b1a4c3._comment | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/bugs/Nearline_bucket_stopped_working___40__can__39__t_even_HEAD_files__41__/comment_3_5ac676877feaa7cdb9e05d6b71b1a4c3._comment (limited to 'doc') diff --git a/doc/bugs/Nearline_bucket_stopped_working___40__can__39__t_even_HEAD_files__41__/comment_3_5ac676877feaa7cdb9e05d6b71b1a4c3._comment b/doc/bugs/Nearline_bucket_stopped_working___40__can__39__t_even_HEAD_files__41__/comment_3_5ac676877feaa7cdb9e05d6b71b1a4c3._comment new file mode 100644 index 000000000..67b215bc7 --- /dev/null +++ b/doc/bugs/Nearline_bucket_stopped_working___40__can__39__t_even_HEAD_files__41__/comment_3_5ac676877feaa7cdb9e05d6b71b1a4c3._comment @@ -0,0 +1,11 @@ +[[!comment format=mdwn + username="justin.lebar@7a36fcafc322d9a381e89f08ab6289033c6dde91" + nickname="justin.lebar" + avatar="http://cdn.libravatar.org/avatar/9fca4b61a1ab555f231851e7543f9a3e" + subject="comment 3" + date="2016-12-04T04:30:38Z" + content=""" +For a while things were working, but now it's not working again, same problem as before. + +Do you think maybe it's a timestamp bug in the signature or something? That could explain this \"mysteriously works then stops working\" behavior. +"""]] -- cgit v1.2.3 From dcc6ade76ec42196b6a37e8b05170bc51187803b Mon Sep 17 00:00:00 2001 From: "marek@33e8ba4fbc201af14a2badcc0656024401f5c916" Date: Sun, 4 Dec 2016 15:28:41 +0000 Subject: --- doc/forum/more_intelligent_copy_.mdwn | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 doc/forum/more_intelligent_copy_.mdwn (limited to 'doc') diff --git a/doc/forum/more_intelligent_copy_.mdwn b/doc/forum/more_intelligent_copy_.mdwn new file mode 100644 index 000000000..1c9889a74 --- /dev/null +++ b/doc/forum/more_intelligent_copy_.mdwn @@ -0,0 +1,15 @@ +Hi, + +I noticed, that + +git annex copy --to REMOTE FILES + +and + +git annex copy --to REMOTE --not --in REMOTE FILES + +behave differently. The first does not check, whether file contents are already in the remote the latter does that. I realize that this mimics "normal" (UNIX) copy behaviour but I was not entirely certain this was desired. +Depending on the type of the remote and its configuration (encryption) the latter is considerably faster. + +Just my two cents. + -- cgit v1.2.3 From e2437ceed4a68c90d88251a60eeadd2f755ae7af Mon Sep 17 00:00:00 2001 From: "https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4" Date: Sun, 4 Dec 2016 15:52:29 +0000 Subject: initial report --- .../annex_add_ignores_.-prefixed_directories.mdwn | 74 ++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 doc/bugs/annex_add_ignores_.-prefixed_directories.mdwn (limited to 'doc') diff --git a/doc/bugs/annex_add_ignores_.-prefixed_directories.mdwn b/doc/bugs/annex_add_ignores_.-prefixed_directories.mdwn new file mode 100644 index 000000000..f4ebfe6d2 --- /dev/null +++ b/doc/bugs/annex_add_ignores_.-prefixed_directories.mdwn @@ -0,0 +1,74 @@ +### Please describe the problem. + +annex add seems to ignore content under directories having . prefix. + +We thought to unify (across direct/indirect/v6) adding files to annex repository by using 'git annex add' with corresponding setting for largefiles for any addition, but it seems to ignore content under .-prefixed directories, unlike git + +### What version of git-annex are you using? On what operating system? + +6.20161122+gitg9f179ae-1~ndall+1 + +### Please provide any additional information below. + +[[!format sh """ +hopa:/tmp/datalad_temp_test_annex_add_no_dotfilesqMXck8 +$> git status +On branch master + +Initial commit + +nothing to commit (create/copy files and use "git add" to track) + +$> mkdir .dir dir; echo 123 > .dir/123; echo 124 > dir/124 + +$> git status +On branch master + +Initial commit + +Untracked files: + (use "git add ..." to include in what will be committed) + + .dir/ + dir/ + +nothing added to commit but untracked files present (use "git add" to track) + +$> git annex add -c 'annex.largefiles=nothing' . +add dir/124 (non-large file; adding content to git repository) ok +(recording state in git...) + +$> git status +On branch master + +Initial commit + +Changes to be committed: + (use "git rm --cached ..." to unstage) + + new file: dir/124 + +Untracked files: + (use "git add ..." to include in what will be committed) + + .dir/ + + +# and with regular git +$> git -c 'annex.largefiles=nothing' add . + +$> git status +On branch master + +Initial commit + +Changes to be committed: + (use "git rm --cached ..." to unstage) + + new file: .dir/123 + new file: dir/124 + + +"""]] + +Ref: https://github.com/datalad/datalad/issues/1027 -- cgit v1.2.3 From 922a23fe88a8793bdc1887fb8b626600deaee72d Mon Sep 17 00:00:00 2001 From: "https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4" Date: Sun, 4 Dec 2016 15:54:32 +0000 Subject: added forgotten author tag --- doc/bugs/annex_add_ignores_.-prefixed_directories.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/bugs/annex_add_ignores_.-prefixed_directories.mdwn b/doc/bugs/annex_add_ignores_.-prefixed_directories.mdwn index f4ebfe6d2..66f3b654f 100644 --- a/doc/bugs/annex_add_ignores_.-prefixed_directories.mdwn +++ b/doc/bugs/annex_add_ignores_.-prefixed_directories.mdwn @@ -72,3 +72,5 @@ Changes to be committed: """]] Ref: https://github.com/datalad/datalad/issues/1027 + +[[!meta author=yoh]] -- cgit v1.2.3 From c6970ef134cdc376fad48fbd8eb79c562d434e7c Mon Sep 17 00:00:00 2001 From: "https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4" Date: Sun, 4 Dec 2016 16:20:00 +0000 Subject: "fixed" by reading --help --- doc/bugs/annex_add_ignores_.-prefixed_directories.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/bugs/annex_add_ignores_.-prefixed_directories.mdwn b/doc/bugs/annex_add_ignores_.-prefixed_directories.mdwn index 66f3b654f..5db40f4dd 100644 --- a/doc/bugs/annex_add_ignores_.-prefixed_directories.mdwn +++ b/doc/bugs/annex_add_ignores_.-prefixed_directories.mdwn @@ -74,3 +74,5 @@ Changes to be committed: Ref: https://github.com/datalad/datalad/issues/1027 [[!meta author=yoh]] + +[[done]]; oh -- it is RTFM: --include-dotfiles --[[yoh]] -- cgit v1.2.3 From 31bbf7577aa17d4af44714526ab7651c74369a36 Mon Sep 17 00:00:00 2001 From: Daniel Brooks Date: Mon, 5 Dec 2016 09:59:20 -0500 Subject: git-annex fromkey now takes multiple pairs of keys and filenames It also still reads from stdin when none are specified. --- Command/FromKey.hs | 15 +++++++++------ doc/git-annex-fromkey.mdwn | 8 +++++--- 2 files changed, 14 insertions(+), 9 deletions(-) (limited to 'doc') diff --git a/Command/FromKey.hs b/Command/FromKey.hs index 670e9e6a6..0916cf79d 100644 --- a/Command/FromKey.hs +++ b/Command/FromKey.hs @@ -20,16 +20,18 @@ import Network.URI cmd :: Command cmd = notDirect $ notBareRepo $ command "fromkey" SectionPlumbing "adds a file using a specific key" - (paramPair paramKey paramPath) + (paramRepeating (paramPair paramKey paramPath)) (withParams seek) seek :: CmdParams -> CommandSeek +seek [] = do + withNothing startMass [] seek ps = do force <- Annex.getState Annex.force - withWords (start force) ps + withPairs (start force) ps -start :: Bool -> [String] -> CommandStart -start force (keyname:file:[]) = do +start :: Bool -> (String, FilePath) -> CommandStart +start force (keyname, file) = do let key = mkKey keyname unless force $ do inbackend <- inAnnex key @@ -37,10 +39,11 @@ start force (keyname:file:[]) = do "key ("++ keyname ++") is not present in backend (use --force to override this sanity check)" showStart "fromkey" file next $ perform key file -start _ [] = do + +startMass :: CommandStart +startMass = do showStart "fromkey" "stdin" next massAdd -start _ _ = giveup "specify a key and a dest file" massAdd :: CommandPerform massAdd = go True =<< map (separate (== ' ')) . lines <$> liftIO getContents diff --git a/doc/git-annex-fromkey.mdwn b/doc/git-annex-fromkey.mdwn index 461f42eb6..2591e9785 100644 --- a/doc/git-annex-fromkey.mdwn +++ b/doc/git-annex-fromkey.mdwn @@ -4,14 +4,16 @@ git-annex fromkey - adds a file using a specific key # SYNOPSIS -git annex fromkey `[key file]` +git annex fromkey `[key file ...]` # DESCRIPTION This plumbing-level command can be used to manually set up a file in the git repository to link to a specified key. -If the key and file are not specified on the command line, they are +Multiple pairs of file and key can be given in a single command line. + +If no key and file pair are specified on the command line, they are instead read from stdin. Any number of lines can be provided in this mode, each containing a key and filename, separated by a single space. @@ -26,7 +28,7 @@ to do that. * `--force` Allow making a file link to a key whose content is not in the local - repository. The key may not be known to git-annex at all. + repository. The key may not be known to git-annex at all. # SEE ALSO -- cgit v1.2.3 From 10d60a652cd7d374a6e54ef0255bb54f17fafb31 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 5 Dec 2016 12:10:07 -0400 Subject: rmurl: --batch * rmurl: Multiple pairs of files and urls can be provided on the command line. * rmurl: Added --batch mode. This commit was sponsored by Trenton Cronholm on Patreon. --- CHANGELOG | 3 +++ Command/RmUrl.hs | 33 +++++++++++++++++++++++++++------ doc/git-annex-rmurl.mdwn | 14 +++++++++++++- 3 files changed, 43 insertions(+), 7 deletions(-) (limited to 'doc') diff --git a/CHANGELOG b/CHANGELOG index 76da79eaa..384dc3c3b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -8,6 +8,9 @@ git-annex (6.20161119) UNRELEASED; urgency=medium does not support graphical display, while xdot does. * Debian: xdot is a better interactive viewer than dot, so Suggest xdot, rather than graphviz. + * rmurl: Multiple pairs of files and urls can be provided on the + command line. + * rmurl: Added --batch mode. -- Joey Hess Mon, 21 Nov 2016 11:27:50 -0400 diff --git a/Command/RmUrl.hs b/Command/RmUrl.hs index eb78f7ba7..0f33d66b2 100644 --- a/Command/RmUrl.hs +++ b/Command/RmUrl.hs @@ -1,6 +1,6 @@ {- git-annex command - - - Copyright 2013 Joey Hess + - Copyright 2013-2016 Joey Hess - - Licensed under the GNU GPL version 3 or higher. -} @@ -10,18 +10,39 @@ module Command.RmUrl where import Command import Logs.Web import qualified Remote +import CmdLine.Batch cmd :: Command cmd = notBareRepo $ command "rmurl" SectionCommon "record file is not available at url" - (paramPair paramFile paramUrl) - (withParams seek) + (paramRepeating (paramPair paramFile paramUrl)) + (seek <$$> optParser) -seek :: CmdParams -> CommandSeek -seek = withPairs start +data RmUrlOptions = RmUrlOptions + { rmThese :: CmdParams + , batchOption :: BatchMode + } -start :: (FilePath, String) -> CommandStart +optParser :: CmdParamsDesc -> Parser RmUrlOptions +optParser desc = RmUrlOptions + <$> cmdParams desc + <*> parseBatchOption + +seek :: RmUrlOptions -> CommandSeek +seek o = case batchOption o of + Batch -> batchInput batchParser (batchCommandAction . start) + NoBatch -> withPairs start (rmThese o) + +-- Split on the last space, since a FilePath can contain whitespace, +-- but a url should not. +batchParser :: String -> Either String (FilePath, URLString) +batchParser s = case separate (== ' ') (reverse s) of + (ru, rf) + | null ru || null rf -> Left "Expected: \"file url\"" + | otherwise -> Right (reverse rf, reverse ru) + +start :: (FilePath, URLString) -> CommandStart start (file, url) = flip whenAnnexed file $ \_ key -> do showStart "rmurl" file next $ next $ cleanup url key diff --git a/doc/git-annex-rmurl.mdwn b/doc/git-annex-rmurl.mdwn index 5faf9ea39..e971e622e 100644 --- a/doc/git-annex-rmurl.mdwn +++ b/doc/git-annex-rmurl.mdwn @@ -4,12 +4,24 @@ git-annex rmurl - record file is not available at url # SYNOPSIS -git annex rmurl `file url` +git annex rmurl `[file url ..]` # DESCRIPTION Record that the file is no longer available at the url. +If nothing is specified on the command line, they are instead read +from stdin. Any number of lines can be provided in this mode, +each containing a file and and url, separated by a single space. + +# OPTIONS + +* `--batch` + + Enables batch mode, in which lines are read from stdin. + Each line should contain the file, and the url to remove from that file, + separated by a single space. + # SEE ALSO [[git-annex]](1) -- cgit v1.2.3 From 1bbfff4c550c4702443dd560f5ae4e5ace23d0a9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 5 Dec 2016 12:13:25 -0400 Subject: cleanup --- doc/git-annex-rmurl.mdwn | 4 ---- 1 file changed, 4 deletions(-) (limited to 'doc') diff --git a/doc/git-annex-rmurl.mdwn b/doc/git-annex-rmurl.mdwn index e971e622e..504685a58 100644 --- a/doc/git-annex-rmurl.mdwn +++ b/doc/git-annex-rmurl.mdwn @@ -10,10 +10,6 @@ git annex rmurl `[file url ..]` Record that the file is no longer available at the url. -If nothing is specified on the command line, they are instead read -from stdin. Any number of lines can be provided in this mode, -each containing a file and and url, separated by a single space. - # OPTIONS * `--batch` -- cgit v1.2.3 From 41ef0a573bd50bb4c2f984834e7af9f97c596662 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 5 Dec 2016 12:55:50 -0400 Subject: rekey: Added --batch mode. Would have liked to make the Parser parse the file and key pairs, but it seems that optparse-applicative is unable to handle eg: many ((,) <$> argument <*> argument) This commit was sponsored by Thomas Hochstein on Patreon. --- CHANGELOG | 1 + Command/ReKey.hs | 36 ++++++++++++++++++++++++++++++------ Command/RmUrl.hs | 1 - doc/git-annex-rekey.mdwn | 6 ++++++ 4 files changed, 37 insertions(+), 7 deletions(-) (limited to 'doc') diff --git a/CHANGELOG b/CHANGELOG index 215349f4b..c30447f4e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -13,6 +13,7 @@ git-annex (6.20161119) UNRELEASED; urgency=medium * rmurl: Added --batch mode. * fromkey: Accept multiple pairs of files and keys. Thanks, Daniel Brooks. + * rekey: Added --batch mode. -- Joey Hess Mon, 21 Nov 2016 11:27:50 -0400 diff --git a/Command/ReKey.hs b/Command/ReKey.hs index 33734ebe7..4ddbd68b6 100644 --- a/Command/ReKey.hs +++ b/Command/ReKey.hs @@ -25,15 +25,39 @@ cmd = notDirect $ command "rekey" SectionPlumbing "change keys used for files" (paramRepeating $ paramPair paramPath paramKey) - (withParams seek) + (seek <$$> optParser) -seek :: CmdParams -> CommandSeek -seek = withPairs start +data ReKeyOptions = ReKeyOptions + { reKeyThese :: CmdParams + , batchOption :: BatchMode + } -start :: (FilePath, String) -> CommandStart -start (file, keyname) = ifAnnexed file go stop +optParser :: CmdParamsDesc -> Parser ReKeyOptions +optParser desc = ReKeyOptions + <$> cmdParams desc + <*> parseBatchOption + +-- Split on the last space, since a FilePath can contain whitespace, +-- but a Key very rarely does. +batchParser :: String -> Either String (FilePath, Key) +batchParser s = case separate (== ' ') (reverse s) of + (rk, rf) + | null rk || null rf -> Left "Expected: \"file key\"" + | otherwise -> case file2key (reverse rk) of + Nothing -> Left "bad key" + Just k -> Right (reverse rf, k) + +seek :: ReKeyOptions -> CommandSeek +seek o = case batchOption o of + Batch -> batchInput batchParser (batchCommandAction . start) + NoBatch -> withPairs (start . parsekey) (reKeyThese o) + where + parsekey (file, skey) = + (file, fromMaybe (giveup "bad key") (file2key skey)) + +start :: (FilePath, Key) -> CommandStart +start (file, newkey) = ifAnnexed file go stop where - newkey = fromMaybe (giveup "bad key") $ file2key keyname go oldkey | oldkey == newkey = stop | otherwise = do diff --git a/Command/RmUrl.hs b/Command/RmUrl.hs index 0f33d66b2..1a547a71e 100644 --- a/Command/RmUrl.hs +++ b/Command/RmUrl.hs @@ -10,7 +10,6 @@ module Command.RmUrl where import Command import Logs.Web import qualified Remote -import CmdLine.Batch cmd :: Command cmd = notBareRepo $ diff --git a/doc/git-annex-rekey.mdwn b/doc/git-annex-rekey.mdwn index 4ec0b49e8..ce5e43d41 100644 --- a/doc/git-annex-rekey.mdwn +++ b/doc/git-annex-rekey.mdwn @@ -20,6 +20,12 @@ Multiple pairs of file and key can be given in a single command line. Allow rekeying of even files whose content is not currently available. Use with caution. +* `--batch` + + Enables batch mode, in which lines are read from stdin. + Each line should contain the file, and the new key to use for that file, + separated by a single space. + # SEE ALSO [[git-annex]](1) -- cgit v1.2.3 From 6010d99a326e393266e98c25ca942c54badac7a8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 5 Dec 2016 13:52:40 -0400 Subject: fix formatting mdwn2man gets confused as `command` spanning multiple lines.. --- doc/git-annex-add.mdwn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/doc/git-annex-add.mdwn b/doc/git-annex-add.mdwn index b65ed5132..15bb8a6a0 100644 --- a/doc/git-annex-add.mdwn +++ b/doc/git-annex-add.mdwn @@ -15,9 +15,9 @@ If no path is specified, adds files from the current directory and below. Files that are already checked into git and are unmodified, or that git has been configured to ignore will be silently skipped. -If annex.largefiles is configured, and does not match a file, `git annex -add` will behave the same as `git add` and add the non-large file directly -to the git repository, instead of to the annex. +If annex.largefiles is configured, and does not match a file, +`git annex add` will behave the same as `git add` and add the +non-large file directly to the git repository, instead of to the annex. Large files are added to the annex in locked form, which prevents further modification of their content unless unlocked by [[git-annex-unlock]](1). -- cgit v1.2.3 From 20da75dd76a6962d4db9ce5adcfbeae984d7293a Mon Sep 17 00:00:00 2001 From: alpernebbi Date: Mon, 5 Dec 2016 19:34:55 +0000 Subject: --- doc/tips/a_gui_for_metadata_operations.mdwn | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 doc/tips/a_gui_for_metadata_operations.mdwn (limited to 'doc') diff --git a/doc/tips/a_gui_for_metadata_operations.mdwn b/doc/tips/a_gui_for_metadata_operations.mdwn new file mode 100644 index 000000000..1e1180068 --- /dev/null +++ b/doc/tips/a_gui_for_metadata_operations.mdwn @@ -0,0 +1,13 @@ +Hey everyone. + +I wrote a GUI for git-annex metadata in Python: [git-annex-metadata-gui](https://github.com/alpernebbi/git-annex-metadata-gui). +It shows the files that are in the current branch (only those in the annex) in the respective folder hierarchy. +The keys that are in the repository, but not in the current branch are also shown in another tab. +You can view, edit or remove fields for individual files with support for multiple values for fields. +There is a file preview for image and text files as well. +I uploaded some screenshots in the repository to show it in action. + +While making it, I decided to move the git-annex calls into its own Python package, +which became [git-annex-adapter](https://github.com/alpernebbi/git-annex-adapter). + +I hope these can be useful to someone other than myself as well. -- cgit v1.2.3 From 11d3994b9a2a890607495d4fb5f284718ad0c993 Mon Sep 17 00:00:00 2001 From: alpernebbi Date: Mon, 5 Dec 2016 20:46:07 +0000 Subject: Added a comment: UTF-8 problems in some other commands --- ...ent_1_aa6fe46ee76dd8bfa9a56cbd5131cb8b._comment | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 doc/bugs/git-annex_fromkey_barfs_on_utf-8_input/comment_1_aa6fe46ee76dd8bfa9a56cbd5131cb8b._comment (limited to 'doc') diff --git a/doc/bugs/git-annex_fromkey_barfs_on_utf-8_input/comment_1_aa6fe46ee76dd8bfa9a56cbd5131cb8b._comment b/doc/bugs/git-annex_fromkey_barfs_on_utf-8_input/comment_1_aa6fe46ee76dd8bfa9a56cbd5131cb8b._comment new file mode 100644 index 000000000..a0409e281 --- /dev/null +++ b/doc/bugs/git-annex_fromkey_barfs_on_utf-8_input/comment_1_aa6fe46ee76dd8bfa9a56cbd5131cb8b._comment @@ -0,0 +1,55 @@ +[[!comment format=mdwn + username="alpernebbi" + avatar="http://cdn.libravatar.org/avatar/daf2abb14f39e28ad75d5f9a03fcd106" + subject="UTF-8 problems in some other commands" + date="2016-12-05T20:46:07Z" + content=""" +Running the command above gives me the same error on Xubuntu 16.04, using `git-annex-standalone` package from NeuroDebian repositories. + + git-annex version: 6.20161122+gitg9f179ae-1~ndall+1 + build flags: Assistant Webapp Pairing Testsuite S3(multipartupload)(storageclasses) WebDAV Inotify DBus DesktopNotify XMPP ConcurrentOutput TorrentParser MagicMime Feeds Quvi + 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 SHA1E SHA1 MD5E MD5 WORM URL + remote types: git gcrypt 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: linux x86_64 + +I encountered other commands that fail as well: + + $ touch u.txt ü.txt + $ git annex add + + $ git-annex calckey ü.txt + # prints key + + $ git-annex calckey --batch + ü.txt + # dies + + $ git-annex lookupkey ü.txt + # prints key + + $ git-annex lookupkey --batch + ü.txt + # dies + + $ git-annex metadata --batch --json + {\"file\":\"ü.txt\"} + # dies + + $ git-annex metadata --batch --json + {\"file\":\"u.txt\",\"fields\":{\"ü\":[\"b\"]}} + # dies + + $ git-annex metadata --batch --json + {\"file\":\"u.txt\",\"fields\":{\"a\":[\"ü\"]}} + # dies + +All those die without output, all $? are 0. +No values were recorded to metadata. +Also: + + $ git-annex-metadata --json + # entry for \"ü.txt\" has \"file\":\"��.txt\" +"""]] -- cgit v1.2.3 From 3c513125313b359f5879a3561d19ee06ba073b6a Mon Sep 17 00:00:00 2001 From: alpernebbi Date: Mon, 5 Dec 2016 21:55:55 +0000 Subject: --- ...atedly_modified_in_the_same_batch_mode_run.mdwn | 84 ++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 doc/bugs/Metadata_values_get_stuck_when_repeatedly_modified_in_the_same_batch_mode_run.mdwn (limited to 'doc') diff --git a/doc/bugs/Metadata_values_get_stuck_when_repeatedly_modified_in_the_same_batch_mode_run.mdwn b/doc/bugs/Metadata_values_get_stuck_when_repeatedly_modified_in_the_same_batch_mode_run.mdwn new file mode 100644 index 000000000..1ec07dccb --- /dev/null +++ b/doc/bugs/Metadata_values_get_stuck_when_repeatedly_modified_in_the_same_batch_mode_run.mdwn @@ -0,0 +1,84 @@ +### Please describe the problem. + +While running `git-annex metadata --batch --json`, repeatedly assigning a field to the same value in the same run (with different values in between the assignments of the same value) causes a value to get stuck. + +### What steps will reproduce the problem? + + $ touch test.txt + $ git annex add + $ git-annex metadata --batch --json + {"file":"test.txt","fields":{"f":["a"]}} + # prints { ... "f":["a"] ... } + {"file":"test.txt","fields":{"f":["b"]}} + # prints { ... "f":["b"] ... } + {"file":"test.txt","fields":{"f":["c"]}} + # prints { ... "f":["c"] ... } + {"file":"test.txt","fields":{"f":["a"]}} + # prints { ... "f":["a", "c"] ... } + {"file":"test.txt","fields":{"f":["b"]}} + # prints { ... "f":["c"] ... } + +### What version of git-annex are you using? On what operating system? + + git-annex version: 6.20161122+gitg9f179ae-1~ndall+1 + build flags: Assistant Webapp Pairing Testsuite S3(multipartupload)(storageclasses) WebDAV Inotify DBus DesktopNotify XMPP ConcurrentOutput TorrentParser MagicMime Feeds Quvi + 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 SHA1E SHA1 MD5E MD5 WORM URL + remote types: git gcrypt 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: linux x86_64 + +I'm using Xubuntu 16.04, with the `git-annex-standalone` package from NeuroDebian repository. + +### Please provide any additional information below. + +If you keep reassigning the same values, things get very weird. Full inputs/outputs from a sample run: + + {"file":"test.txt","fields":{"f":["a"]}} + {"command":"metadata","note":"f=a\nf-lastchanged=2016-12-05@21-17-39\nlastchanged=2016-12-05@21-17-39\n","success":true,"key":"SHA256E-s0--e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855.txt","file":"test.txt","fields": {"f-lastchanged":["2016-12-05@21-17-39"],"lastchanged":["2016-12-05@21-17-39"],"f":["a"]}} + {"file":"test.txt","fields":{"f":["b"]}} + {"command":"metadata","note":"f=b\nf-lastchanged=2016-12-05@21-17-39\nlastchanged=2016-12-05@21-17-39\n","success":true,"key":"SHA256E-s0--e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855.txt","file":"test.txt","fields":{"f-lastchanged":["2016-12-05@21-17-39"],"lastchanged":["2016-12-05@21-17-39"],"f":["b"]}} + {"file":"test.txt","fields":{"f":["c"]}} + {"command":"metadata","note":"f=c\nf-lastchanged=2016-12-05@21-17-39\nlastchanged=2016-12-05@21-17-39\n","success":true,"key":"SHA256E-s0--e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855.txt","file":"test.txt","fields":{"f-lastchanged":["2016-12-05@21-17-39"],"lastchanged":["2016-12-05@21-17-39"],"f":["c"]}} + {"file":"test.txt","fields":{"f":["a"]}} + {"command":"metadata","note":"f=a\nf=c\nf-lastchanged=2016-12-05@21-17-39\nlastchanged=2016-12-05@21-17-39\n","success":true,"key":"SHA256E-s0--e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855.txt","file":"test.txt","fields":{"f-lastchanged":["2016-12-05@21-17-39"],"lastchanged":["2016-12-05@21-17-39"],"f":["a","c"]}} + {"file":"test.txt","fields":{"f":["b"]}} + {"command":"metadata","note":"f=c\nf-lastchanged=2016-12-05@21-17-39\nlastchanged=2016-12-05@21-17-39\n","success":true,"key":"SHA256E-s0--e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855.txt","file":"test.txt","fields":{"f-lastchanged":["2016-12-05@21-17-39"],"lastchanged":["2016-12-05@21-17-39"],"f":["c"]}} + {"file":"test.txt","fields":{"f":[]}} + {"command":"metadata","note":"lastchanged=2016-12-05@21-17-39\n","success":true,"key":"SHA256E-s0--e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855.txt","file":"test.txt","fields":{"lastchanged":["2016-12-05@21-17-39"]}} + {"file":"test.txt","fields":{"f":["b"]}} + {"command":"metadata","note":"lastchanged=2016-12-05@21-17-39\n","success":true,"key":"SHA256E-s0--e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855.txt","file":"test.txt","fields":{"lastchanged":["2016-12-05@21-17-39"]}} + {"file":"test.txt","fields":{"f":["c"]}} + {"command":"metadata","note":"f=c\nf-lastchanged=2016-12-05@21-17-39\nlastchanged=2016-12-05@21-17-39\n","success":true,"key":"SHA256E-s0--e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855.txt","file":"test.txt","fields":{"f-lastchanged":["2016-12-05@21-17-39"],"lastchanged":["2016-12-05@21-17-39"],"f":["c"]}} + {"file":"test.txt","fields":{"f":["a"]}} + {"command":"metadata","note":"f=a\nf=c\nf-lastchanged=2016-12-05@21-17-39\nlastchanged=2016-12-05@21-17-39\n","success":true,"key":"SHA256E-s0--e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855.txt","file":"test.txt","fields":{"f-lastchanged":["2016-12-05@21-17-39"],"lastchanged":["2016-12-05@21-17-39"],"f":["a","c"]}} + {"file":"test.txt","fields":{"f":["b"]}} + {"command":"metadata","note":"f=c\nf-lastchanged=2016-12-05@21-17-39\nlastchanged=2016-12-05@21-17-39\n","success":true,"key":"SHA256E-s0--e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855.txt","file":"test.txt","fields":{"f-lastchanged":["2016-12-05@21-17-39"],"lastchanged":["2016-12-05@21-17-39"],"f":["c"]}} + {"file":"test.txt","fields":{"f":["c"]}} + {"command":"metadata","note":"f=c\nf-lastchanged=2016-12-05@21-17-39\nlastchanged=2016-12-05@21-17-39\n","success":true,"key":"SHA256E-s0--e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855.txt","file":"test.txt","fields":{"f-lastchanged":["2016-12-05@21-17-39"],"lastchanged":["2016-12-05@21-17-39"],"f":["c"]}} + {"file":"test.txt","fields":{"f":["a"]}} + {"command":"metadata","note":"f=a\nf=c\nf-lastchanged=2016-12-05@21-17-39\nlastchanged=2016-12-05@21-17-39\n","success":true,"key":"SHA256E-s0--e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855.txt","file":"test.txt","fields":{"f-lastchanged":["2016-12-05@21-17-39"],"lastchanged":["2016-12-05@21-17-39"],"f":["a","c"]}} + {"file":"test.txt","fields":{"f":["b"]}} + {"command":"metadata","note":"f=c\nf-lastchanged=2016-12-05@21-17-39\nlastchanged=2016-12-05@21-17-39\n","success":true,"key":"SHA256E-s0--e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855.txt","file":"test.txt","fields":{"f-lastchanged":["2016-12-05@21-17-39"],"lastchanged":["2016-12-05@21-17-39"],"f":["c"]}} + {"file":"test.txt","fields":{"f":["b"]}} + {"command":"metadata","note":"f=b\nf=c\nf-lastchanged=2016-12-05@21-17-39\nlastchanged=2016-12-05@21-17-39\n","success":true,"key":"SHA256E-s0--e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855.txt","file":"test.txt","fields":{"f-lastchanged":["2016-12-05@21-17-39"],"lastchanged":["2016-12-05@21-17-39"],"f":["b","c"]}} + {"file":"test.txt","fields":{"f":["a"]}} + {"command":"metadata","note":"f=a\nf=b\nf=c\nf-lastchanged=2016-12-05@21-17-39\nlastchanged=2016-12-05@21-17-39\n","success":true,"key":"SHA256E-s0--e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855.txt","file":"test.txt","fields":{"f-lastchanged":["2016-12-05@21-17-39"],"lastchanged":["2016-12-05@21-17-39"],"f":["a","b","c"]}} + {"file":"test.txt","fields":{"f":["d"]}} + {"command":"metadata","note":"f=b\nf=c\nf=d\nf-lastchanged=2016-12-05@21-17-39\nlastchanged=2016-12-05@21-17-39\n","success":true,"key":"SHA256E-s0--e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855.txt","file":"test.txt","fields":{"f-lastchanged":["2016-12-05@21-17-39"],"lastchanged":["2016-12-05@21-17-39"],"f":["b","c","d"]}} + {"file":"test.txt","fields":{"f":["a"]}} + {"command":"metadata","note":"f=b\nf=c\nf=d\nf-lastchanged=2016-12-05@21-17-39\nlastchanged=2016-12-05@21-17-39\n","success":true,"key":"SHA256E-s0--e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855.txt","file":"test.txt","fields":{"f-lastchanged":["2016-12-05@21-17-39"],"lastchanged":["2016-12-05@21-17-39"],"f":["b","c","d"]}} + {"file":"test.txt","fields":{"f":["a"]}} + {"command":"metadata","note":"f=b\nf=c\nf=d\nf-lastchanged=2016-12-05@21-17-39\nlastchanged=2016-12-05@21-17-39\n","success":true,"key":"SHA256E-s0--e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855.txt","file":"test.txt","fields":{"f-lastchanged":["2016-12-05@21-17-39"],"lastchanged":["2016-12-05@21-17-39"],"f":["b","c","d"]}} + {"file":"test.txt","fields":{"f":[]}} + {"command":"metadata","note":"f=c\nf-lastchanged=2016-12-05@21-17-39\nlastchanged=2016-12-05@21-17-39\n","success":true,"key":"SHA256E-s0--e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855.txt","file":"test.txt","fields":{"f-lastchanged":["2016-12-05@21-17-39"],"lastchanged":["2016-12-05@21-17-39"],"f":["c"]}} + +Restarting the process solves the issue. + +### 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) + +I love the metadata functionality so much that I wrote [[tips/a_gui_for_metadata_operations]] and discovered this bug. +Metadata driven views are awesome (but I don't like the entire folder hierarchy being appended to the filename). +I haven't used the other commands much since I have not yet organized most of my stuff (and their naively copy-pasted backups), but I am glad I discovered git-annex before I began organizing. + -- cgit v1.2.3 From 25ac45ca13cd300db447e8187e6cf39b457be24a Mon Sep 17 00:00:00 2001 From: "0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730" <0xloem@web> Date: Tue, 6 Dec 2016 13:01:51 +0000 Subject: --- ..._to_decommit_memory__58___Invalid_argument.mdwn | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 doc/bugs/unable_to_decommit_memory__58___Invalid_argument.mdwn (limited to 'doc') diff --git a/doc/bugs/unable_to_decommit_memory__58___Invalid_argument.mdwn b/doc/bugs/unable_to_decommit_memory__58___Invalid_argument.mdwn new file mode 100644 index 000000000..44a6d2d12 --- /dev/null +++ b/doc/bugs/unable_to_decommit_memory__58___Invalid_argument.mdwn @@ -0,0 +1,25 @@ +### Please describe the problem. +Recent builds of git-annex spew out many lines such as: +``` +git-annex: unable to decommit memory: Invalid argument +git-annex: unable to decommit memory: Invalid argument +git-annex: unable to decommit memory: Invalid argument +git-annex: unable to decommit memory: Invalid argument +git-annex: unable to decommit memory: Invalid argument +``` + +### What steps will reproduce the problem? +This happens to me syncing any large repository now. + +### What version of git-annex are you using? On what operating system? +git-annex version: 6.20161118-g0a34f08 +uname -r: 4.4.14-11.pvops.qubes.x86_64 +/etc/system-release: Fedora release 23 (Twenty Three) + +### Please provide any additional information below. + +I found this: https://ghc.haskell.org/trac/ghc/ticket/12495 + +### 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 rocks! -- cgit v1.2.3 From 0f38a5b3cac4e4945723616da0e1664d17e8048d Mon Sep 17 00:00:00 2001 From: "0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730" <0xloem@web> Date: Tue, 6 Dec 2016 13:03:51 +0000 Subject: --- .../unable_to_decommit_memory__58___Invalid_argument.mdwn | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'doc') diff --git a/doc/bugs/unable_to_decommit_memory__58___Invalid_argument.mdwn b/doc/bugs/unable_to_decommit_memory__58___Invalid_argument.mdwn index 44a6d2d12..5d8e55bec 100644 --- a/doc/bugs/unable_to_decommit_memory__58___Invalid_argument.mdwn +++ b/doc/bugs/unable_to_decommit_memory__58___Invalid_argument.mdwn @@ -1,19 +1,20 @@ ### Please describe the problem. Recent builds of git-annex spew out many lines such as: -``` -git-annex: unable to decommit memory: Invalid argument -git-annex: unable to decommit memory: Invalid argument -git-annex: unable to decommit memory: Invalid argument -git-annex: unable to decommit memory: Invalid argument -git-annex: unable to decommit memory: Invalid argument -``` + + git-annex: unable to decommit memory: Invalid argument + git-annex: unable to decommit memory: Invalid argument + git-annex: unable to decommit memory: Invalid argument + git-annex: unable to decommit memory: Invalid argument + git-annex: unable to decommit memory: Invalid argument ### What steps will reproduce the problem? This happens to me syncing any large repository now. ### What version of git-annex are you using? On what operating system? git-annex version: 6.20161118-g0a34f08 + uname -r: 4.4.14-11.pvops.qubes.x86_64 + /etc/system-release: Fedora release 23 (Twenty Three) ### Please provide any additional information below. -- cgit v1.2.3 From 69c8840407a81a4b4ae19ba3bad3698a71bdc6e4 Mon Sep 17 00:00:00 2001 From: "0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730" <0xloem@web> Date: Tue, 6 Dec 2016 13:56:13 +0000 Subject: --- doc/bugs/unable_to_decommit_memory__58___Invalid_argument.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/bugs/unable_to_decommit_memory__58___Invalid_argument.mdwn b/doc/bugs/unable_to_decommit_memory__58___Invalid_argument.mdwn index 5d8e55bec..572e0406a 100644 --- a/doc/bugs/unable_to_decommit_memory__58___Invalid_argument.mdwn +++ b/doc/bugs/unable_to_decommit_memory__58___Invalid_argument.mdwn @@ -21,6 +21,8 @@ uname -r: 4.4.14-11.pvops.qubes.x86_64 I found this: https://ghc.haskell.org/trac/ghc/ticket/12495 +It looks like this is a problem that occurs only on kernels < 4.5, when ghc is built with a newer glibc, I think. + ### 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 rocks! -- cgit v1.2.3 From 6d7b2b59e3d6a16fc7cbd0a77f8e5c5ab4ca3f14 Mon Sep 17 00:00:00 2001 From: "0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730" <0xloem@web> Date: Tue, 6 Dec 2016 14:59:40 +0000 Subject: --- doc/install/fromsource.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/install/fromsource.mdwn b/doc/install/fromsource.mdwn index c46321099..7973e3dc9 100644 --- a/doc/install/fromsource.mdwn +++ b/doc/install/fromsource.mdwn @@ -83,7 +83,7 @@ Get the git-annex source code, and inside the source tree, run: To build with all features enabled, including the assistant and webapp, you will need to install several C libraries and their headers, -including libgnutls, libgsasl, libxml2, libmagic, and zlib. How to do +including libgnutls, libgsasl, libxml2, libmagic, zlib, and chrpath. How to do that for your OS is beyond the scope of this page. Once the C libraries are installed, run inside the source tree: -- cgit v1.2.3 From 3500fa70e016459fcd02cba4d4c3059e7f4555ef Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 6 Dec 2016 17:08:39 -0400 Subject: devbog --- doc/devblog/day_432-433__almost_there.mdwn | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 doc/devblog/day_432-433__almost_there.mdwn (limited to 'doc') diff --git a/doc/devblog/day_432-433__almost_there.mdwn b/doc/devblog/day_432-433__almost_there.mdwn new file mode 100644 index 000000000..b41ce3f70 --- /dev/null +++ b/doc/devblog/day_432-433__almost_there.mdwn @@ -0,0 +1,13 @@ +Friday and today were spent implementing both sides of the P2P protocol for +git-annex content transfers. + +There were some tricky cases to deal with. For example, when a file is being +sent from a direct mode repository, or v6 annex.thin repository, the +content of the file can change as it's being transferred. Including being +appended to or truncated. Had to find a way to deal with that, to avoid +breaking the protocol by not sending the indicated number of bytes of data. + +It all seems to be done now, but it's not been tested at all, and there are +probably some bugs to find. (And progress info is not wired up yet.) + +Today's work was sponsored by Trenton Cronholm on Patreon. -- cgit v1.2.3