Commit graph

28256 commits

Author SHA1 Message Date
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
Joey Hess
50e63f75d1
webapp: Escape unusual characters in ssh hostnames when generating mangled hostnames. This allows IPv6 addresses to be used on filesystems not supporting : in filenames. 2016-07-19 11:37:03 -04:00
Joey Hess
242868eadb
comment 2016-07-19 11:06:49 -04:00
jscinoz@dc383eb6c5526eeb832a38ef5e5e626cf282ee6c
ba68310fe6 Added a comment 2016-07-18 06:32:54 +00:00
jscinoz@dc383eb6c5526eeb832a38ef5e5e626cf282ee6c
b909eba399 Added a comment 2016-07-18 06:17:57 +00:00
jscinoz@dc383eb6c5526eeb832a38ef5e5e626cf282ee6c
2332b6df9b 2016-07-18 04:20:02 +00:00
Joey Hess
5537766d96
devblog 2016-07-17 15:20:40 -04:00
Joey Hess
d0b0d8cff7
Merge branch 'master' of ssh://git-annex.branchable.com 2016-07-17 15:15:48 -04:00
Joey Hess
c4d011bf3e
log: Added --all option. 2016-07-17 15:15:08 -04:00
interfect@b151490178830f44348aa57b77ad58c7d18e8fe7
06642951fb 2016-07-17 18:25:41 +00:00
Joey Hess
154c939830
Speed up startup time by caching the refs that have been merged into the git-annex branch.
This can speed up git-annex commands by as much as a second, depending on
the number of remotes.
2016-07-17 12:24:34 -04:00
Joey Hess
c04d9d6a01
avoid stripping rpath when linking haskell libs dynamically 2016-07-17 10:58:30 -04:00
emanuele.olivetti@47d88ed185b03191e25329caa6fabc2efb3118b2
1490acd398 removed 2016-07-14 15:03:01 +00:00
emanuele.olivetti@47d88ed185b03191e25329caa6fabc2efb3118b2
b3c58d7cf2 Added a comment: googledriveannex fails: No handlers could be found for logger "oauth2client.util" 2016-07-14 14:58:29 +00:00
emanuele.olivetti@47d88ed185b03191e25329caa6fabc2efb3118b2
8d44d6b637 Added a comment: googledriveannex does not 2016-07-14 14:58:05 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
4b91715ed2 2016-07-14 14:18:31 +00:00
Horus
1563545556 Added a comment 2016-07-14 09:28:33 +00:00
Horus
fe094d812c 2016-07-14 09:06:57 +00:00