Commit graph

19964 commits

Author SHA1 Message Date
Joey Hess
b84644826b devblog 2014-05-28 18:26:38 -04:00
Joey Hess
5a0779fd70 remove newlines from static js and css
This works around a bug in the EvilSplicer; see
http://git-annex.branchable.com/bugs/Bootstrap3_icons_missing_on_Android/
2014-05-28 18:21:01 -04:00
Joey Hess
d9fefa615c Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-28 17:50:29 -04:00
Joey Hess
469640e790 allow building with old versions of exceptions before MonadMask was split out 2014-05-28 17:48:49 -04:00
bnikolic
30398456a0 2014-05-28 21:25:57 +00:00
Joey Hess
02a4cef66c update for change to exceptions 2014-05-28 17:23:23 -04:00
Ben Gamari
99b89b22fd Use exceptions in place of deprecated MonadCatchIO-transformers 2014-05-28 17:03:40 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmqz6wCn-Q1vzrsHGvEJHOt_T5ZESilxhc
6e040807dd Added a comment 2014-05-28 17:30:43 +00:00
Joey Hess
f7a1f2924e prep release 2014-05-28 11:16:43 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmqz6wCn-Q1vzrsHGvEJHOt_T5ZESilxhc
f3652880d1 Added a comment 2014-05-28 15:03:26 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmi0jblSiI4c5-EswqKw4PXkx5M4fuVvdk
df8388e9aa 2014-05-28 14:50:37 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlAx-pYJ036y2lgKtLJvXm7s-HFRBiJlZY
730710b097 Added a comment 2014-05-28 13:27:20 +00:00
EskildHustvedt
e1b5de522e 2014-05-28 09:26:48 +00:00
92.192.126.78
7a10cec87e poll vote (Same as for regular git-annex. ~/annex/) 2014-05-28 08:55:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnxvt4mc32O0ctvPGhhII_ZKsHUiaD2o7I
c0093fb8a7 Added a comment 2014-05-28 04:40:27 +00:00
Joey Hess
649fd25871 Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-27 20:46:00 -04:00
http://joeyh.name/
d78c187c72 Added a comment 2014-05-28 00:37:30 +00:00
http://joeyh.name/
723c4f3edc Added a comment 2014-05-28 00:33:48 +00:00
Joey Hess
0c2a14e4aa fix dodgy use of Char8
I don't know if this was a bug, but I don't know if it was not a bug
either.

See also,
http://git-annex.branchable.com/bugs/Truncated_file_transferred_via_S3/
where the file is not truncated, but mangled..
2014-05-27 20:31:25 -04:00
Joey Hess
b197ec8917 get rid of (completely safe) uses of Char8
Char8 often indicates an encoding bug. It didn't here, but I can avoid it
and not worry about it.
2014-05-27 20:26:10 -04:00
Joey Hess
34f2c82886 Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-27 20:13:55 -04:00
Joey Hess
37da3d7b5d
better heuristic for what is a package-qualified symbol
Hopefully this will avoid mangling css files embedded in strings inside
spliced code.
2014-05-27 20:12:16 -04:00
http://joeyh.name/
6bf824eb4c Added a comment 2014-05-28 00:04:58 +00:00
http://joeyh.name/
75b19afb8c Added a comment 2014-05-28 00:02:43 +00:00
http://schnouki.net/
c783f3d2e2 2014-05-27 22:45:20 +00:00
Joey Hess
9b4050fb77
typo 2014-05-27 16:39:04 -04:00
Joey Hess
95a96b9d8c fix date of this blog post 2014-05-27 16:36:52 -04:00
Joey Hess
829b4243f7 Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-27 16:36:18 -04:00
Joey Hess
b1eeb83f7f
devblog 2014-05-27 16:35:59 -04:00
http://joeyh.name/
fd38145408 Added a comment 2014-05-27 20:23:04 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmqz6wCn-Q1vzrsHGvEJHOt_T5ZESilxhc
457b3bf4fd Added a comment 2014-05-27 19:58:37 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZilYULa6CDEGfuagoDlesyakBgnf-dF8
0f6079f33e Added a comment 2014-05-27 19:07:45 +00:00
http://joeyh.name/
3d9bd11ac6 Added a comment 2014-05-27 19:03:20 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZilYULa6CDEGfuagoDlesyakBgnf-dF8
c0fadd2229 Added a comment 2014-05-27 18:59:08 +00:00
http://joeyh.name/
91f48d8da2 Added a comment 2014-05-27 18:45:35 +00:00
Joey Hess
a41ddabd73 webapp: When setting up a ssh remote, if the user inputs ~/foo, normalize that to foo, since it's in the home directory by default. 2014-05-27 14:33:27 -04:00
Joey Hess
dd5ac19b39 Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-27 14:16:55 -04:00
Joey Hess
95ca3bb022 Fix encoding of data written to git-annex branch. Avoid truncating unicode characters to 8 bits.
Allow any encoding to be used, as with filenames (but utf8 is the sane
choice). Affects metadata and repository descriptions, and preferred
content expressions.

The question of what's the right encoding for the git-annex branch is a
vexing one. utf-8 would be a nice choice, but this leaves the possibility
of bad data getting into a git-annex branch somehow, and this resulting in
git-annex crashing with encoding errors, which is a failure mode I want to
avoid.

(Also, preferred content expressions can refer to filenames, and filenames
can have any encoding, so limiting to utf-8 would not be ideal.)

The union merge code already took care to not assume any encoding for a
file. Except it assumes that any \n is a literal newline, and not part of
some encoding of a character that happens to contain a newline. (At least
utf-8 avoids using newline for anything except liternal newlines.)
Adapted the git-annex branch code to use this same approach.

Note that there is a potential interop problem with Windows, since
FileSystemEncoding doesn't work there, and instead things are always
decoded as utf-8. If someone uses non-utf8 encoding for data on the
git-annex branch, this can lead to an encoding error on windows. However,
this commit doesn't actually make that any worse, because the union merge
code would similarly fail with an encoding error on windows in that
situation.

This commit was sponsored by Kyle Meyer.
2014-05-27 14:16:33 -04:00
http://joeyh.name/
b7a788b62b Added a comment 2014-05-27 18:02:11 +00:00
http://joeyh.name/
df1e38d7af Added a comment 2014-05-27 17:58:35 +00:00
http://joeyh.name/
4cab8f0262 Added a comment 2014-05-27 17:54:06 +00:00
Joey Hess
2dc0c434e0 Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-27 12:58:08 -04:00
http://joeyh.name/
293f722fb4 Added a comment 2014-05-27 16:13:09 +00:00
http://joeyh.name/
89693cb21e Added a comment 2014-05-27 16:10:29 +00:00
http://joeyh.name/
9d2b66c745 Added a comment 2014-05-27 16:08:14 +00:00
Joey Hess
52386a7cdf
pebak 2014-05-27 12:00:40 -04:00
https://id.koumbit.net/anarcat
4b4e4ef328 Added a comment 2014-05-27 03:00:48 +00:00
Joey Hess
6fa08a3e49 devblog 2014-05-26 18:10:32 -04:00
Joey Hess
9fcbe52dab Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-26 18:01:48 -04:00
Joey Hess
ba1e14d502
fix gnutls to link, again
I don't know why, but I keep finding that the way I hacked this to work
before doesn't work and a new way is needed. Perhaps changes to cabal made
my old hacks break?
2014-05-26 17:56:41 -04:00