Commit graph

29529 commits

Author SHA1 Message Date
Joey Hess
06f307ad13
lost a changelog entry; put back 2017-02-03 14:40:53 -04:00
Joey Hess
b5e6d23242
Merge branch 'master' of ssh://git-annex.branchable.com 2017-02-03 14:37:49 -04:00
Joey Hess
c545701224
make sync --no-commit override annex.annex.autocommit 2017-02-03 14:36:14 -04:00
Joey Hess
b77903af48
New annex.synccontent config setting
.. which can be set to true to make git annex sync default to --content.

This may become the default at some point in the future.

As well as being configuable by git config, it can be configured by
git-annex config to control the default behavior in all clones of a
repository.

Had to add a separate --no-content switch to we can tell if it's been
explicitly set, and should override annex.synccontent. If --content was the
default, this complication would not be necessary.

This commit was sponsored by Jake Vosloo on Patreon.
2017-02-03 14:31:17 -04:00
Joey Hess
ed56dba868
annex.autocommit can be configured via git-annex config
... to control the default behavior in all clones of a repository.

This includes a new Configurable data type, so the GitConfig type indicates
which values can be configured this way.

The implementation should be quite efficient; the config log is only read
once, and only when a Configurable value has not already been set by
git-config.

Indeed, it would be nice in the future to extend this, so that git-config
is itself only read on demand. Some commands may not need to look at the
git configuration at all.

This commit was sponsored by Trenton Cronholm on Patreon.
2017-02-03 13:58:53 -04:00
yarikoptic
14ed673aba initial whining 2017-02-03 15:10:41 +00:00
http://xgm.de/oid/
9f2e3e0729 2017-02-03 10:08:27 +00:00
http://schnouki.net/
a57c21a968 Added a comment 2017-02-02 22:05:23 +00:00
Joey Hess
d6d23d8a15
remove page for Homebrew-cask
I checked the git repo, and git-annex was removed from it, since it's
available in Homebrew. (Why did they add it originally then? Dunno..)
2017-02-02 16:39:47 -04:00
Joey Hess
3dfd78531a
response 2017-02-02 16:35:55 -04:00
Joey Hess
2d2f72abf0
add missing extra-deps 2017-02-02 14:24:06 -04:00
Joey Hess
66afc38366
Merge branch 'master' of ssh://git-annex.branchable.com 2017-02-02 14:18:45 -04:00
Joey Hess
1590007d6b
comment 2017-02-02 14:18:17 -04:00
Joey Hess
04687feb7e
update 2017-02-02 12:38:36 -04:00
hello@d445805275613da28bcccb402c444f2a63e7b7f9
6918f548e0 2017-02-02 08:13:56 +00:00
kristianrumberg@85de814abe9398ab5573b77bb8a7a80ceaf3b9e1
661dae3649 2017-02-02 03:50:00 +00:00
kristianrumberg@85de814abe9398ab5573b77bb8a7a80ceaf3b9e1
089fe40314 2017-02-02 03:49:03 +00:00
chocolate.camera@ec2ecab153906be21ac5f36652c33786ad0e0b60
991c1b7945 Added a comment: Install via brew cask not working 2017-02-02 00:01:08 +00:00
5XwgD
4b0c37302a 2017-02-01 09:42:33 +00:00
Joey Hess
6ce92049bd
Merge branch 'master' of ssh://git-annex.branchable.com 2017-01-31 20:01:59 -04:00
Joey Hess
192dab049f
devblog 2017-01-31 19:58:43 -04:00
Joey Hess
ed60f60e9b
unused: Improved memory use significantly when there are a lot of differences between branches.
Argh, didn't need an accumulator here!

I think I use accumulators a lot more than I need to when recusively
processing lists..

This commit was sponsored by Jeff Goeke-Smith on Patreon.
2017-01-31 19:42:00 -04:00
Joey Hess
062286135c
unused: When large files are checked right into git, avoid buffering their contents in memory.
This makes it a little bit slower since it has to check file size,
but worth it to fix a potential memory use problem.

This commit was sponsored by Fernando Jimenez on Patreon.
2017-01-31 19:09:37 -04:00
Joey Hess
9eb10caa27
Some optimisations to string splitting code.
Turns out that Data.List.Utils.split is slow and makes a lot of
allocations. Here's a much simpler single character splitter that behaves
the same (even in wacky corner cases) while running in half the time and
75% the allocations.

As well as being an optimisation, this helps move toward eliminating use of
missingh.

(Data.List.Split.splitOn is nearly as slow as Data.List.Utils.split and
allocates even more.)

I have not benchmarked the effect on git-annex, but would not be surprised
to see some parsing of eg, large streams from git commands run twice as
fast, and possibly in less memory.

This commit was sponsored by Boyd Stephen Smith Jr. on Patreon.
2017-01-31 19:06:22 -04:00
mschiff
288a529d2a 2017-01-31 22:01:31 +00:00
mschiff
be899558f9 2017-01-31 22:00:58 +00:00
mschiff
3a6a96c1db 2017-01-31 21:58:54 +00:00
Joey Hess
dbaea98836
fix lack of laziness streaming large diffs
A commit last year that made a partial function use Maybe unfortunately
caused the whole input to need to be consumed, breaking streaming. So,
revert it.

This commit was sponsored by Nick Daly on Patreon.
2017-01-31 17:43:11 -04:00
Joey Hess
a130bc4f9b
add new modules to annoying list 2017-01-31 17:27:44 -04:00
butirsky@86ff3803c45a8a1e5fc253d2728ce493c8addf96
ae84bfc9e5 Added a comment 2017-01-31 18:30:00 +00:00
Joey Hess
88e7d787e2
fix link 2017-01-31 13:25:37 -04:00
Joey Hess
8ee86a5cad
comment 2017-01-31 13:24:34 -04:00
Joey Hess
f0719897e0
Merge branch 'master' of ssh://git-annex.branchable.com 2017-01-31 13:11:54 -04:00
Joey Hess
ae2ff452a4
comment
This commit was sponsored by Brock Spratlen on Patreon.
2017-01-31 13:10:54 -04:00
Joey Hess
a1842d387b
comment
This commit was sponsored by Ole-Morten on Patreon.
2017-01-31 13:01:55 -04:00
git-annex@6f13b739194f758abc0b86556b7ce966c1bf3c00
670f9a5116 2017-01-31 16:53:58 +00:00
Joey Hess
3fcfe2abd0
please answer questions 2017-01-31 12:53:55 -04:00
Joey Hess
b6556e50ad
response
This commit was sponsored by Andreas on Patreon.
2017-01-31 12:47:49 -04:00
Joey Hess
03bdb230b4
respond
This commit was sponsored by Bruno BEAUFILS on Patreon.
2017-01-31 12:41:09 -04:00
Joey Hess
cfe3d37dc3
fix formatting of comment 2017-01-31 12:32:03 -04:00
Joey Hess
5798013fb2
reproduced bug; started analysis
This commit was sponsored by Peter Hogg on Patreon.
2017-01-31 12:30:44 -04:00
Joey Hess
3300911b14
lts-7.18 finally!
esqueleto finally got fixed, thanks to @bitemyapp

Since XMPP was removed, the previous build failures related to it should
no longer be a problem either.

Meanwhile, lts-5.18 fails to build anymore on Debian due to linker
hardening breaking the version of ghc stack uses with that version.

This commit was sponsored by Francois Marier on Patreon.
2017-01-31 12:27:08 -04:00
Joey Hess
e5b733ba22
close 2017-01-31 11:25:38 -04:00
Joey Hess
a4192b5612
close old xmpp bug 2017-01-31 11:24:15 -04:00
alanz
ac45e758f4 spacing 2017-01-31 11:34:43 +00:00
alanz
e5adeba3ac Otherwise the USB remote cannot sync 2017-01-31 11:33:32 +00:00
Fabio
f8cb16b6a4 Added a comment 2017-01-30 22:26:46 +00:00
Joey Hess
5676d267b5
forgot to add this new source file 2017-01-30 17:36:45 -04:00
Joey Hess
eeb227aeb8
Merge branch 'master' of ssh://git-annex.branchable.com 2017-01-30 17:34:48 -04:00
Joey Hess
85b62fa798
devblog 2017-01-30 17:32:03 -04:00