Commit graph

27964 commits

Author SHA1 Message Date
Joey Hess
176cd98293
remove \r from Arbitrary for log tests 2016-05-27 12:04:49 -04:00
Joey Hess
5418c8a23a
prep release 2016-05-27 11:50:27 -04:00
Joey Hess
abaeb517eb
comment 2016-05-27 11:46:24 -04:00
Joey Hess
eba68572dc
Split lines in the git-annex branch on \r as well as \n, to deal with \r\n terminated lines written by some versions of git-annex on Windows.
This fixes strange displays in some cases, including whereis showing
many duplicate locations, and showing more total copies than actually
exist.

It's unknown if that lead to data loss when eg, dropping. At the moment,
it seems unlikely it could, since the UUID with \r's appended is not the
same as a UUID without, and so no remote matches it.

It's also unknown if \r's can leak in on windows, perhaps when merging the
git-annex branch.
2016-05-27 11:45:13 -04:00
Joey Hess
f4db181d9b
fix warning 2016-05-27 11:15:52 -04:00
Joey Hess
4e0af0e3e8
followup 2016-05-27 11:05:53 -04:00
Joey Hess
0c2c9202d7
followup 2016-05-27 11:01:33 -04:00
Joey Hess
9a0a75182b
Merge branch 'master' of ssh://git-annex.branchable.com 2016-05-27 10:40:08 -04:00
Joey Hess
0e33730b5a
analysis 2016-05-27 10:39:55 -04:00
ggreif@8132a868199b4ffec14150c87f538dc06a538220
a7d83f92f6 Added a comment: GHC HEAD warnings 2016-05-27 14:21:11 +00:00
Joey Hess
35b1130a8f
Merge branch 'master' of ssh://git-annex.branchable.com 2016-05-27 10:19:17 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
ae9f6b5dd4 2016-05-25 18:30:34 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
e92d36ddb2 just added a tag to claim my ownership 2016-05-25 12:59:57 +00:00
xloem
2040cb9a61 2016-05-25 12:25:31 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
e6bffbdf08 Added a comment 2016-05-25 01:09:56 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
f2327ef7b0 closing 2016-05-25 00:28:36 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
8c6067d96f 2016-05-25 00:25:03 +00:00
Joey Hess
5b5b1e33bc
update copyright year 2016-05-24 17:44:36 -04:00
Joey Hess
714750e593
include 3 in upgradableVersions
Does not change behavior, only git annex version output
2016-05-24 17:13:19 -04:00
Joey Hess
2b7b2c4136
only warn about missing dbus support on linux 2016-05-24 16:51:10 -04:00
Joey Hess
bbe42999ae
devblog 2016-05-24 16:08:43 -04:00
Joey Hess
7b61c7f5d0
temporarily add cabal.config to support ghc 8.0.1 build
This commit can be reverted once the library deps are worked out upstream.
2016-05-24 16:06:27 -04:00
Joey Hess
d815bb8635
close 2016-05-24 16:06:24 -04:00
Joey Hess
a533cc3b35
close 2016-05-24 16:00:39 -04:00
Joey Hess
1183205838
Merge branch 'master' of ssh://git-annex.branchable.com 2016-05-24 15:59:22 -04:00
Joey Hess
1b3bde0625
enableremote: Remove annex-ignore configuration from a remote. 2016-05-24 15:58:27 -04:00
Joey Hess
b33a649a25
enableremote: Can now be used to explicitly enable git-annex to use git remotes. Using the command this way prevents other git-annex commands from probing new git remotes to auto-enable them. 2016-05-24 15:24:38 -04:00
Joey Hess
afb332a142
replace redudundant and incomplete encryption para with link 2016-05-24 14:38:59 -04:00
NhanHo
bd8e8ebd07 2016-05-24 13:15:56 +00:00
NhanHo
eab26c79c3 2016-05-24 10:39:34 +00:00
ilovezfs
c4cd0c8730 Added a comment 2016-05-24 09:32:31 +00:00
NhanHo
f6cded63e9 2016-05-24 09:08:35 +00:00
NhanHo
b18f0f55b6 2016-05-24 09:07:18 +00:00
myannex@18bb16ff5a145a744e065dc96ed566d7a236ccbc
b88ed4dba9 2016-05-24 06:02:09 +00:00
Joey Hess
f79875ef3b
Updated cabal file explictly lists source files.
The tarball on hackage will include only the files needed for cabal install;
it is NOT the full git-annex source tree. While it's totally obnoxious that
cabal files need every file listed out when basic wildcard support could
avoid hundreds of lines, and have to be maintained when files are added,
this does get the tarball size back down to 1 mb.

This also stops stack from complaining that it found modules not listed in
the cabal file.

debian/changelog, debian/NEWS, debian/copyright: Converted to symlinks
to CHANGELOG, NEWS, and COPYRIGHT, which used to symlink to these instead.
This avoids needing to include debian/ in the hackage tarball.

Setup.hs: Build man pages at install time using make and mdwn2man.
If it fails, which it probably will on windows, just skip installing
them.
2016-05-24 01:28:07 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
91f8800721 Added a comment: what would be the "best" command to run? 2016-05-24 00:10:23 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
e1247977b3 added that reconfirmed with 6.20160523+gitg33c00ab-1~ndall+1 2016-05-23 23:58:15 +00:00
Joey Hess
cbb1dbdafc
lts-5.18 2016-05-23 18:52:09 -04:00
Joey Hess
20bfbb28ac
improved refactoring
ghc 8.0.1 didn't like runner because it used Rank2Types or something.
Instead, factor out the feeder action.
2016-05-23 18:47:30 -04:00
Joey Hess
12cee25b41
devblog 2016-05-23 18:26:45 -04:00
Joey Hess
737d4a5ba1
deja vu all over again 2016-05-23 18:25:39 -04:00
Joey Hess
4d4fb65da2
Merge branch 'master' of ssh://git-annex.branchable.com 2016-05-23 18:15:17 -04:00
Joey Hess
7afa487eaa
add todo item 2016-05-23 18:13:03 -04:00
Joey Hess
70ecc00f31
re-close 2016-05-23 17:52:08 -04:00
Joey Hess
016a5af853
cleanup 2016-05-23 17:51:15 -04:00
Joey Hess
0d0a796d63
plumb RemoteGitConfig through to encryptCipher 2016-05-23 17:48:38 -04:00
Joey Hess
b9ce477fa2
plumb RemoteGitConfig through to decryptCipher 2016-05-23 17:33:32 -04:00
Joey Hess
22c174158c
plumb RemoteGitConfig through to setRemoteCredPair 2016-05-23 17:08:43 -04:00
Joey Hess
91df4c6b53
Pass the various gnupg-options configs to gpg in several cases where they were not before.
Removed the instance LensGpgEncParams RemoteConfig because it encouraged
code that does not take the RemoteGitConfig into account.

RemoteType's setup was changed to take a RemoteGitConfig,
although the only place that is able to provide a non-empty one is
enableremote, when it's changing an existing remote. This led to several
folow-on changes, and got RemoteGitConfig plumbed through.
2016-05-23 17:03:20 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
065a8c3030 fixed meta tag 2016-05-23 20:48:35 +00:00