Commit graph

31965 commits

Author SHA1 Message Date
Joey Hess
84a74b80ee
better doc for --json-error-messages
Word so warnings can be included, not only errors.
2018-02-19 15:33:59 -04:00
Joey Hess
39b59c341f
send stderr to json when --json-error-messages enabled 2018-02-19 15:28:38 -04:00
Joey Hess
63ff670cc5
always include error-messages field when --json-error-messages
Always include error-messages field, even if empty,
to make the json be self-documenting.

This was a design requirement for --json-error-messages.

This commit was supported by the NSF-funded DataLad project.
2018-02-19 15:07:00 -04:00
Joey Hess
6583448bab
add --json-error-messages (not yet implemented)
Added --json-error-messages option, which includes error messages in the
json output, rather than outputting them to stderr.

The actual rediretion of errors is not implemented yet, this is only
the docs and option plumbing.

This commit was supported by the NSF-funded DataLad project.
2018-02-19 14:32:15 -04:00
Joey Hess
fa65f1d240
fix --json-progress --json to be same as --json --json-progress
Fix behavior of --json-progress followed by --json, in which
the latter option disabled the former.

This commit was supported by the NSF-funded DataLad project.
2018-02-19 14:12:15 -04:00
olaf
288e1dc77c Added a comment: I can reproduce 2018-02-19 01:05:06 +00:00
Joey Hess
8ccfbd14d0
Split Test.hs and avoid optimising it much, to need less memory to compile.
The ghc options were found by Sean Whitton; the debian arm autobuilders
need those to build w/o OOM, and it seems to involve llvm using too much
memory to optimize Test.

This commit was sponsored by Boyd Stephen Smith Jr. on Patreon.
2018-02-18 11:48:48 -04:00
Joey Hess
bbdfdaa833
git-annex.cabal: Once more try to not build the assistant on the hurd, hopefully hackage finally recognises that OS.
Last try was in 2015 https://github.com/haskell/hackage-server/issues/269
2018-02-18 11:09:16 -04:00
ericm
f5bc4065c4 Added a comment 2018-02-18 13:46:00 +00:00
michalrus
5846c2f466 2018-02-17 14:43:36 +00:00
yarikoptic
fb2c7d180a Added a comment 2018-02-16 18:42:28 +00:00
Joey Hess
b0633931d6
comment 2018-02-16 14:05:26 -04:00
Joey Hess
56711c310c
update 2018-02-16 13:56:05 -04:00
Joey Hess
846208b265
comment 2018-02-16 13:47:10 -04:00
Joey Hess
1758982760
comment 2018-02-16 13:28:13 -04:00
Joey Hess
7e454ee341
--json: multi-line notes
--json: When there are multiple lines of notes about a file, make the note
field multiline, rather than the old behavior of only including the last
line.

Using newlines in the note is perhaps not ideal, but upgrading it to an
array in this case would be an annoying inconsistency to need to deal with.

This commit was sponsored by Ole-Morten Duesund on Patreon.
2018-02-16 13:27:17 -04:00
Joey Hess
b1234135c3
Merge branch 'master' of ssh://git-annex.branchable.com 2018-02-15 12:53:48 -04:00
Joey Hess
aee9adbadc
Add gpg-agent to Build-Depends. Needed to run the test suite.
Merged from Debian.

I think what this actually deals with is the case where gpg is installed,
but gpg-agent is not, since Utility.Gpg.stdParams enables --use-agent
when GPG_BATCH is set, and the test suite enables GPG_BATCH. So, test suite
will work with gpg not installed, or with both gpg and gpg-agent installed,
but not with only gpg.

For this reason, I've also put in an explicit dep on gnupg, although
dpkg-dev recommends it and all debian package builds tend to have it
available implicitly.
2018-02-14 17:32:44 -04:00
https://christian.amsuess.com/chrysn
db0d154f19 add wishlist item "creating importfeed does not work with socks proxy" 2018-02-14 14:12:14 +00:00
ericm
f293890336 Added a comment 2018-02-11 08:59:08 +00:00
yarikoptic
9aaab2019e Added a comment 2018-02-10 02:48:14 +00:00
yarikoptic
ffee889364 2018-02-10 02:46:45 +00:00
Joey Hess
be62234e3f
use Breaks 2018-02-09 11:01:55 -04:00
Yaroslav Halchenko
ddec6a71e7
Adjusted debian/patches/standalone-build for changes in control 2018-02-09 11:00:59 -04:00
achilleas.k@14be77d42a1252fab5ec9dbf4e5ea03c5833e8c8
b64bc454dd 2018-02-09 13:39:36 +00:00
achilleas.k@14be77d42a1252fab5ec9dbf4e5ea03c5833e8c8
43f7a515ec 2018-02-09 13:38:37 +00:00
achilleas.k@14be77d42a1252fab5ec9dbf4e5ea03c5833e8c8
b816cded81 2018-02-09 13:18:03 +00:00
achilleas.k@14be77d42a1252fab5ec9dbf4e5ea03c5833e8c8
0ccd3e4c61 2018-02-09 13:13:03 +00:00
Joey Hess
42ba888875
optimise for case where there are no required contents
Avoid reading location log in this case.
2018-02-08 14:16:00 -04:00
Joey Hess
74c1a5c24b
Merge branch 'master' of ssh://git-annex.branchable.com 2018-02-08 14:09:08 -04:00
Joey Hess
7f5c6a28a6
fsck: Warn when required content is not present in the repository that requires it.
This commit was sponsored by Jack Hill on Patreon.
2018-02-08 14:08:41 -04:00
yarikoptic
36375ca060 Added a comment 2018-02-08 18:06:55 +00:00
Joey Hess
10bb8a860b
rewrap to fix man page format 2018-02-08 13:32:54 -04:00
Joey Hess
5109d406c0
comment 2018-02-08 13:31:36 -04:00
Joey Hess
3e692f7371
comment 2018-02-08 13:25:32 -04:00
Joey Hess
a77f00b3d9
response 2018-02-08 13:16:22 -04:00
Joey Hess
68321be178
comment 2018-02-08 13:12:39 -04:00
Joey Hess
e8c5db3624
devblog 2018-02-07 16:24:20 -04:00
Joey Hess
7f7929939b
Merge branch 'master' of ssh://git-annex.branchable.com 2018-02-07 16:18:14 -04:00
Joey Hess
6f72bd0b47
datalad < 0.9.1 had a problem in its special remote protocol handling which is broken by EXTENSIONS. Make the debian git-annex package conflict with the problem version of datalad. 2018-02-07 16:16:33 -04:00
Joey Hess
ed3b03184f
Merge branch 'EXTENSIONS' 2018-02-07 16:14:07 -04:00
yarikoptic
6b56cd1fcc Added a comment 2018-02-07 20:01:53 +00:00
Joey Hess
1f696ac30c
comment 2018-02-07 15:13:11 -04:00
Joey Hess
d884e5b6fe
Added EXTENSIONS to external special remote protocol.
Allows using new special remote messages when git-annex supports them,
and avoiding using them when git-annex is too old. The new INFO is one
such message.

There's also the possibility, currently unused, for the special remote's
reply to include some kind of extensions of its own.

Merging this is blocked by https://github.com/datalad/datalad/issues/2124
since it seems it will break datalad. I checked all the other special
remotes and they will be ok.

This commit was supported by the NSF-funded DataLad project.
2018-02-07 15:02:12 -04:00
yarikoptic
4abf473b52 Added a comment 2018-02-07 18:31:45 +00:00
Joey Hess
9a35831ac3
response 2018-02-07 12:47:07 -04:00
yarikoptic
8cd0f8b28e 2018-02-06 22:35:41 +00:00
yarikoptic
638032f3aa Added a comment 2018-02-06 20:15:35 +00:00
yarikoptic
08a41730bc Added a comment: protocol message 2018-02-06 20:03:27 +00:00
Joey Hess
6cdcb953be
reviewed all external special remotes for change feasability 2018-02-06 14:05:12 -04:00