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
Joey Hess
69f793a2b2
update path to gnutls etc libs
2014-05-26 15:51:21 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnxvt4mc32O0ctvPGhhII_ZKsHUiaD2o7I
f10cc07577
New post
2014-05-26 19:47:41 +00:00
Joey Hess
6dbff11251
another include needed by TH
2014-05-26 15:24:31 -04:00
Joey Hess
7145d25972
work around another dep problem
2014-05-26 13:53:53 -04:00
Joey Hess
70fd42521f
remove patch that turns out to be unnecessary
2014-05-26 13:14:50 -04:00
Joey Hess
8886ccb102
export PATH to alex and happy
2014-05-26 13:13:33 -04:00
http://svario.it/gioele
5deb81648b
New bug "import" generates a commit even with autocommit=false
2014-05-26 16:13:38 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkJafmCf-sg9_OM0pynFYM3AO4WCgJiaMI
e63152f82a
Added a comment: building fails on fedora 19
2014-05-26 15:31:10 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkYmMFDdf3GJ9Oba6NCVkzGc4JyB9WavMs
7ff3e8a793
2014-05-26 14:55:25 +00:00
https://svario.it/gioele
b5c060abe3
New todo: Chunks support in all special remotes
2014-05-26 14:06:57 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZilYULa6CDEGfuagoDlesyakBgnf-dF8
a37e276df6
removed
2014-05-26 11:52:53 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZilYULa6CDEGfuagoDlesyakBgnf-dF8
2b89dd9ce6
Added a comment
2014-05-26 11:52:27 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZilYULa6CDEGfuagoDlesyakBgnf-dF8
5992244977
Added a comment
2014-05-26 11:52:19 +00:00
Joey Hess
346112d49a
proper fix for "foo"# -- need MagicHash extension
2014-05-25 23:27:48 -04:00
Joey Hess
062e37d201
typo
2014-05-25 23:09:45 -04:00
Joey Hess
9b7fa4ad07
put in hack for weird new problem with ghc's emitted splices
2014-05-25 23:03:44 -04:00
Joey Hess
6c1ed6ed4b
add imports needed for android with current ghc and libs
2014-05-25 23:00:42 -04:00
Joey Hess
3444ada7fe
Merge branch 'master' of ssh://git-annex.branchable.com
2014-05-25 22:53:16 -04:00
Joey Hess
fb3b1fac54
Merge orca:/tmp/build
2014-05-25 22:51:57 -04:00
androidbuilder
0f5b40a106
update remaining android patches
2014-05-26 02:47:15 +00:00
Joey Hess
ddd1a888a7
more work around for cabal dependency mess
2014-05-25 22:20:11 -04:00
Joey Hess
ddb1f25209
network-protocol-xmpp patch no longer needed
2014-05-25 21:59:13 -04:00
Joey Hess
1f05bcea98
libxml-sax patch no longer needed
2014-05-25 21:57:53 -04:00
Joey Hess
8abaafaf6d
set unicode locale when building
...
some packages, particularly unix-compat, fail to install in a C
locale. wow
2014-05-25 21:44:28 -04:00
Joey Hess
6052486dc3
work around recent cabal dependency mess
2014-05-25 21:25:04 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmZilYULa6CDEGfuagoDlesyakBgnf-dF8
98a4eea9c6
2014-05-25 22:14:20 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlu-fdXIt_RF9ggvg4zP0yBbtjWQwHAMS4
fc149e21fc
2014-05-25 19:50:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlu-fdXIt_RF9ggvg4zP0yBbtjWQwHAMS4
2fdc9b4cc0
2014-05-25 19:47:49 +00:00
Joey Hess
8abfd5045c
Merge branch 'master' of ssh://git-annex.branchable.com
2014-05-25 12:04:53 -04:00
Joey Hess
89f6f3347d
Merge commit '5e9e9d3cc7f54d7aaa835ef7842a9d7a444c3fda'
2014-05-25 12:02:48 -04:00
https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8
a9091cac2e
Added a comment
2014-05-25 15:16:33 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl6RDLuI2b2fHkTRseVQGUNjcQ2qUrOaE0
bcd0e65ab1
Added a comment
2014-05-25 15:10:34 +00:00
https://www.google.com/accounts/o8/id?id=AItOawke2Zlikj8zQb7M2IWyqT3rqN5mOi-uVrk
2815f5cfb4
2014-05-25 13:13:08 +00:00
Sören Brunk
5e9e9d3cc7
update android haskell patches
2014-05-25 10:04:37 +02:00
Joey Hess
1ce222efe9
fix abiversion lookup to work when propellor is running this script
2014-05-25 01:37:22 -04:00
Joey Hess
f5982447eb
Merge branch 'master' of ssh://git-annex.branchable.com
2014-05-24 20:38:29 -04:00
