Commit graph

28473 commits

Author SHA1 Message Date
Joey Hess
78505c8a21
remove unused import 2016-07-27 11:35:10 -04:00
Joey Hess
bf3327ff25
Added metadata --batch option, which allows getting, setting, deleting, and modifying metadata for multiple files/keys. 2016-07-27 10:46:25 -04:00
Joey Hess
e5225f08fc
When built with ut uid-1.3.12, generate more random UUIDs than before
Use nextRandom to generate the random UUID, rather than using randomIO.
This gets fixes for the following two bugs in the uuid library.

However, this did not impact git-annex much, so a hard depedency has
not been added on uuid-1.3.12.

https://github.com/aslatter/uuid/issues/15
	"v4 UUIDs are not that random"

	This doesn't greatly affect git-annex, because even with only
	2^64 possible UUIDs, the chance that two git-annex repositories
	that are clones of the same git repo get the same UUID is miniscule.

	And, git-annex generates only one UUID per run, so preducting
	subsequent UUIDs is not a problem.

https://github.com/aslatter/uuid/issues/16
	"Remove Random instance for UUID, or mark it as deprecated"

	git-annex was using that instance; let's stop before it gets
	deprecated or removed.
2016-07-27 07:46:08 -04:00
Joey Hess
5235fb1185
avoid using Strings for JSON output; keep it ByteString throughout 2016-07-26 21:43:05 -04:00
Joey Hess
a79736d80d
update 2016-07-26 19:53:14 -04:00
Joey Hess
928fbb162d
improved use of Aeson for JSONActionItem 2016-07-26 19:50:02 -04:00
Joey Hess
870873bdaa
Removed dependency on json library; all JSON is now handled by aeson.
I've eyeballed all --json commands, and the only difference should be
that some fields are re-ordered.
2016-07-26 19:15:34 -04:00
Joey Hess
eabef6efce
Merge branch 'master' of ssh://git-annex.branchable.com 2016-07-26 15:55:00 -04:00
Joey Hess
97dc1e8d59
devblog 2016-07-26 15:54:35 -04:00
Joey Hess
8bc8469c38
saner format for metadata --json
metadata --json output format has changed, adding a inner json object
named "fields" which contains only the fields and their values.

This should be easier to parse than the old format, which mixed up
metadata fields with other keys in the json object.

Any consumers of the old format will need to be updated.

This adds a dependency on unordered-containers for parsing MetaData
from JSON, but it's a free dependency; aeson pulls in that library.
2016-07-26 15:41:04 -04:00
Joey Hess
5c92b8e034
unused import 2016-07-26 14:52:07 -04:00
Joey Hess
880674020f
aeson parser for --json output lines 2016-07-26 14:10:29 -04:00
Joey Hess
a030d0a8b7
allow using Aeson for streaming JSON output
Keeping Text.JSON use for now, because it seems a better fit for most of
the commands, which don't use very structured JSON objects, but just output
whatever fields suites them. But this lets Aeson be used when a more
structured data type is available to serialize to JSON.
2016-07-26 13:30:07 -04:00
anarcat
105f07090b magic wormhole seems like a nice alternative for arbitrary data sharing here 2016-07-26 01:33:15 +00:00
jgoerzen
2fa9e02223 Added a comment 2016-07-25 19:09:09 +00:00
pot
31692acee4 Added a comment: Same issue 2016-07-25 18:23:13 +00:00
Joey Hess
fdd87d8e55
design 2016-07-25 13:51:03 -04:00
pot
6307f9fd33 2016-07-24 23:35:21 +00:00
Joey Hess
d344f04d09
cabal constraints for aws and esqueleto
closes https://github.com/joeyh/git-annex/pull/55

* git-annex.cabal: Temporarily limit to http-conduit <2.2.0
  since aws 0.14.0 is not compatible with the newer version.
* git-annex.cabal: Temporarily limit to persistent <2.5
  since esqueleto 2.4.3 is not compatible with the newer version.
2016-07-22 12:41:28 -04:00
ilovezfs
18e458db10
cabal constraints for aws and esqueleto
aws 0.14.0 is incompatible with http-conduit 2.2.0
https://github.com/aristidb/aws/issues/206

esqueleto 2.4.3 is incompatible with persistent 2.5
https://github.com/prowdsponsor/esqueleto/issues/137
https://github.com/prowdsponsor/esqueleto/pull/141
https://github.com/prowdsponsor/esqueleto/pull/139

Solver needs these hints when building git-annex with +S3 and +Webapp.
2016-07-22 12:41:00 -04:00
ilovezfs
075836f4d2 2016-07-22 15:15:04 +00:00
moird
7c4c5b99ae 2016-07-21 17:54:09 +00:00
Richard Hartmann
96f295214b Update 2016-07-21 09:10:56 +02:00
Joey Hess
4c8b75a603
devblog 2016-07-20 15:59:25 -04:00
Joey Hess
db323d2837
fix implicit --all in bare repo
Using the many combinator resulted in Just (WantBranchKeys []) which
bypassed the defualt used for Nothing.
2016-07-20 15:52:32 -04:00
Joey Hess
d13194b230
--branch, stage 2
Show branch:file that is being operated on.

I had to make ActionItem a type and not a type class because
withKeyOptions' passed two different types of values when using the type
class, and I could not get the type checker to accept that.
2016-07-20 15:23:43 -04:00
Joey Hess
847944e6b1
more generic showStart' 2016-07-20 14:03:54 -04:00
Joey Hess
4236dc83a8
propigate error 2016-07-20 13:44:50 -04:00
Joey Hess
857d3c3180
mention --branch 2016-07-20 13:39:13 -04:00
Joey Hess
ceeef5495d
Merge branch 'master' of ssh://git-annex.branchable.com 2016-07-20 12:08:07 -04:00
Joey Hess
bf8bf14e8e
--branch, stage 1
Added --branch option to copy, drop, fsck, get, metadata, mirror, move, and
whereis commands. This option makes git-annex operate on files that are
included in a specified branch (or other treeish).

The names of the files from the branch that are being operated on are not
displayed yet; only the keys. Displaying the filenames will need changes
to every affected command.

Also, note that --branch can be specified repeatedly. This is not really
documented, but seemed worth supporting, especially since we may later want
the ability to operate on all branches matching a refspec. However, when
operating on two branches that contain the same key, that key will be
operated on twice.
2016-07-20 12:05:26 -04:00
Richard Hartmann
9f0428e771 Add comment 2016-07-20 07:48:07 +02:00
Richard Hartmann
2aa0841940 Add comment 2016-07-20 07:43:09 +02:00
Joey Hess
948bcf3125
close 2016-07-19 16:29:07 -04:00
ilovezfs
680318be3f 2016-07-19 20:20:06 +00:00
Joey Hess
bebae46847
devblog 2016-07-19 16:19:39 -04:00
Joey Hess
07fa34729d
response 2016-07-19 15:09:42 -04:00
Joey Hess
62dc236173
response 2016-07-19 15:07:56 -04:00
Joey Hess
0fdbf639dc
followup; open bug 2016-07-19 15:04:41 -04:00
Joey Hess
ddc44e22a0
add news item for git-annex 6.20160619 2016-07-19 14:44:42 -04:00
Joey Hess
63242549ed
fix lintian pedantry 2016-07-19 14:43:32 -04:00
Joey Hess
626e628417
fix clean of Build/MakeMans 2016-07-19 14:42:11 -04:00
Joey Hess
4ca83054e5
comment 2016-07-19 14:41:27 -04:00
Joey Hess
1bd750dd13
update instructions to work around https://github.com/commercialhaskell/stack/issues/2371
Also don't recommend using cabal unpack to get the source, since the git
clone has a more extensive source tree.
2016-07-19 14:40:51 -04:00
Joey Hess
2cbd1afdb6
prep release 2016-07-19 14:18:16 -04:00
Joey Hess
3110185092
further thoughts 2016-07-19 14:07:31 -04:00
Joey Hess
e34046de38
slightly more efficient checking of versionUsesKeysDatabase
It's a mvar lookup either way, but I think this way will be slightly more
efficient. And it reduces the number of places where it's checked to 1.
2016-07-19 14:02:49 -04:00
Joey Hess
b0c805b3c2
todo 2016-07-19 13:04:56 -04:00
Joey Hess
847f53b973
comment 2016-07-19 12:59:33 -04:00
Joey Hess
2619019630
Avoid any access to keys database in v5 mode repositories, which are not supposed to use that database. 2016-07-19 12:12:19 -04:00