mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
19754 commits 13 branches 442 tags 103 MiB
Commit graph

14198 commits

Author SHA1 Message Date
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
https://www.google.com/accounts/o8/id?id=AItOawnxvt4mc32O0ctvPGhhII_ZKsHUiaD2o7I
f10cc07577 New post 2014-05-26 19:47:41 +00: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
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
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
Joey Hess
f5982447eb Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-24 20:38:29 -04:00
Joey Hess
d27e9f0c54
devblog 2014-05-24 20:36:48 -04:00
https://www.google.com/accounts/o8/id?id=AItOawln3ckqKx0x_xDZMYwa9Q1bn4I06oWjkog
6e12be8b29 Added a comment 2014-05-24 22:58:16 +00:00
https://www.google.com/accounts/o8/id?id=AItOawln3ckqKx0x_xDZMYwa9Q1bn4I06oWjkog
2c0b99d1a9 Added a comment 2014-05-24 22:07:15 +00:00
https://www.google.com/accounts/o8/id?id=AItOawln3ckqKx0x_xDZMYwa9Q1bn4I06oWjkog
2cda8da4b6 removed 2014-05-24 22:04:48 +00:00
https://www.google.com/accounts/o8/id?id=AItOawln3ckqKx0x_xDZMYwa9Q1bn4I06oWjkog
7d2c33d3d9 removed 2014-05-24 22:03:00 +00:00
https://www.google.com/accounts/o8/id?id=AItOawln3ckqKx0x_xDZMYwa9Q1bn4I06oWjkog
826f0562de Added a comment 2014-05-24 22:01:05 +00:00
https://www.google.com/accounts/o8/id?id=AItOawln3ckqKx0x_xDZMYwa9Q1bn4I06oWjkog
5ce3ba2ca0 Added a comment 2014-05-24 21:55:54 +00:00
https://www.google.com/accounts/o8/id?id=AItOawln3ckqKx0x_xDZMYwa9Q1bn4I06oWjkog
3ae15d07f2 Added a comment 2014-05-24 21:49:47 +00:00
https://www.google.com/accounts/o8/id?id=AItOawln3ckqKx0x_xDZMYwa9Q1bn4I06oWjkog
947e6d394f Added a comment 2014-05-24 21:45:55 +00:00
https://www.google.com/accounts/o8/id?id=AItOawln3ckqKx0x_xDZMYwa9Q1bn4I06oWjkog
3f87b689ce Added a comment 2014-05-24 21:26:24 +00:00
Joey Hess
d0cfcdca25
clean up old catchall bug 2014-05-24 16:53:09 -04:00
Joey Hess
fba56a5347
exclude moreinfo from unconfirmed list 2014-05-24 16:49:38 -04:00
Joey Hess
8420d8e863
more excludes 2014-05-24 16:48:42 -04:00
Joey Hess
950e718aee
fix excludes 2014-05-24 16:44:06 -04:00
Joey Hess
34959288ae
reorg main bugs page; show moreinfo bugs here too 2014-05-24 16:43:14 -04:00
Joey Hess
c16c4f4e26
exclude other tags 2014-05-24 16:41:21 -04:00
Joey Hess
dc7aae6e2d
fix syntax 2014-05-24 16:40:32 -04:00
Joey Hess
2d362bd08e
fix inlines 2014-05-24 16:39:18 -04:00
Joey Hess
a14440849b
fix title 2014-05-24 16:38:16 -04:00
Joey Hess
6d610a6ebc
fix pagespec 2014-05-24 16:37:36 -04:00
Joey Hess
7b01845a6c tweaks 2014-05-24 16:37:06 -04:00
Joey Hess
e828530930 Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-24 16:30:39 -04:00
Joey Hess
fb20f6829d
bug triage; add new 'confirmed' tag 2014-05-24 16:29:41 -04:00
Joey Hess
476f52ef41 seems to be a dup of an already fixed bug 2014-05-24 16:16:34 -04:00
http://joeyh.name/
55869fb535 Added a comment 2014-05-24 20:03:46 +00:00
Joey Hess
20d338536a update 2014-05-24 15:28:39 -04:00
Joey Hess
281acc5b6b Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-24 15:26:10 -04:00
Joey Hess
bafc062315 close 2014-05-24 15:25:50 -04:00
Joey Hess
cf9daf3f15 moreinfo 2014-05-24 15:24:21 -04:00
http://joeyh.name/
0df23298c3 Added a comment 2014-05-24 19:23:08 +00:00
http://joeyh.name/
6adfb631c5 Added a comment 2014-05-24 18:29:03 +00:00
http://joeyh.name/
4d8c978f6d Added a comment 2014-05-24 17:48:16 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZilYULa6CDEGfuagoDlesyakBgnf-dF8
af68610249 Added a comment 2014-05-23 23:50:58 +00:00
http://joeyh.name/
3dd54c7b2c Added a comment 2014-05-23 20:20:05 +00:00
Joey Hess
744d4b4cce Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-23 16:19:34 -04:00
Joey Hess
44a3e76115 android: Run busybox install with -s, since some versions of Android prohibit making hard links. 2014-05-23 16:18:55 -04:00
http://johan.kiviniemi.name/
a91a3554da Added a comment 2014-05-23 18:06:49 +00:00
Joey Hess
2910a85992 Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-23 13:01:29 -04:00
jamieson
5f5171d502 Added a comment: Thanks! 2014-05-23 16:11:35 +00:00
Joey Hess
80e4d10afb update 2014-05-23 12:09:02 -04:00
https://www.google.com/accounts/o8/id?id=AItOawn-3srxo7UNlXfH70S-KTW-dgsHjMKI3lo
eb205c7882 2014-05-23 15:54:52 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn-3srxo7UNlXfH70S-KTW-dgsHjMKI3lo
b7593c55b4 2014-05-23 15:54:03 +00:00
http://joeyh.name/
2ca562033a Added a comment 2014-05-23 15:30:23 +00:00
Joey Hess
5678427e3c close; not a git-annex bug but a git or samba bug 2014-05-23 11:00:15 -04:00
Joey Hess
cd049c04ee retitle 2014-05-23 10:58:20 -04:00
http://joeyh.name/
90c4f6a38f Added a comment 2014-05-23 14:57:43 +00:00
Joey Hess
b4f7cf4699 moreinfo 2014-05-23 10:54:11 -04:00
Joey Hess
a182ebec63 close 2014-05-23 10:53:31 -04:00
Joey Hess
6e57f1fbe2 fix close 2014-05-23 10:52:35 -04:00
http://joeyh.name/
48810a7c8c Added a comment 2014-05-23 14:39:18 +00:00
Joey Hess
3934fb4ee6 close 2014-05-23 10:35:15 -04:00
http://joeyh.name/
bdbb78f4dc Added a comment 2014-05-23 14:34:34 +00:00
http://joeyh.name/
3513cf4edd Added a comment 2014-05-23 14:27:01 +00:00
http://joeyh.name/
9a16abb17f Added a comment 2014-05-23 14:25:04 +00:00
Joey Hess
aa7260dc98
devblog 2014-05-22 21:08:14 -04:00
Joey Hess
c4636e2072 Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-22 16:07:52 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmBUR4O9mofxVbpb8JV9mEbVfIYv670uJo
934fcbd347 Added a comment 2014-05-22 20:05:54 +00:00
Joey Hess
2fd95f215f Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-22 16:03:18 -04:00
Joey Hess
2e1179df46 webapp: When setting up a ssh remote, record it using initremote, so that it can be easily enabled elsewhere. 
This is the capstone in making the webapp remember ssh remotes
so they can be easily enabled in other clones of the repository.

Currently, the user will need to enter a password to enable the ssh remote,
but everything else is filled in automatically.

This commit was sponsored by Peter Lloyd.
 2014-05-22 14:57:42 -04:00
http://johan.kiviniemi.name/
47cec4f439 Added a comment 2014-05-22 18:35:33 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmaB2n9HFclAvyMyDzvTPaifh5OrlF51Co
e73bf4789b Added a comment 2014-05-22 09:44:33 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmaB2n9HFclAvyMyDzvTPaifh5OrlF51Co
845a5761e7 Added a comment 2014-05-22 07:23:23 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmaB2n9HFclAvyMyDzvTPaifh5OrlF51Co
c26d1e40cf Added a comment 2014-05-22 06:07:51 +00:00
https://id.koumbit.net/anarcat
f1e673b0cb weird backward compatibility bug? 2014-05-22 01:07:10 +00:00
Jamieson
1ad430213d 2014-05-21 22:57:11 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZilYULa6CDEGfuagoDlesyakBgnf-dF8
6b2ba18fb9 Added a comment 2014-05-21 22:21:37 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZilYULa6CDEGfuagoDlesyakBgnf-dF8
210c1b153c 2014-05-21 21:33:23 +00:00
Joey Hess
fde5c83426 Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-21 15:53:57 -04:00
Joey Hess
9adcf8fff5 webapp: More robust startup when annex directory is not a git repo or not intialized by git-annex. 2014-05-21 15:41:54 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmqz6wCn-Q1vzrsHGvEJHOt_T5ZESilxhc
9daa4bc82c Added a comment 2014-05-21 19:19:45 +00:00
EskildHustvedt
e107c6ed27 Added a comment 2014-05-21 19:19:30 +00:00
EskildHustvedt
afbca4d6e4 Added a comment 2014-05-21 19:18:19 +00:00
Joey Hess
902599248c title 2014-05-21 14:59:53 -04:00
Joey Hess
5b0c2c2315 idea 2014-05-21 14:47:54 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmqz6wCn-Q1vzrsHGvEJHOt_T5ZESilxhc
25004bf5b0 Added a comment 2014-05-21 18:47:42 +00:00
Joey Hess
1db1bbb9c2 wontfix 2014-05-21 14:38:37 -04:00
http://joeyh.name/
384862c936 Added a comment 2014-05-21 18:35:42 +00:00
http://joeyh.name/
fc6e5adb4a Added a comment 2014-05-21 18:31:54 +00:00
http://joeyh.name/
7751c5ff6e Added a comment 2014-05-21 18:29:16 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkAUMhKOSkh9JaBA6xst3XxQIIsDEq5Zd4
025939ceef Added a comment: OK 2014-05-21 18:19:30 +00:00
Joey Hess
93cff937a9 moreinfo 2014-05-21 14:17:04 -04:00
http://joeyh.name/
24994c2b07 Added a comment 2014-05-21 18:11:45 +00:00
http://joeyh.name/
9b53d0cf76 Added a comment 2014-05-21 18:06:09 +00:00
https://id.koumbit.net/anarcat
0c805db3df Added a comment 2014-05-21 18:02:51 +00:00
http://joeyh.name/
e9bbc8eb25 Added a comment 2014-05-21 17:41:22 +00:00
http://joeyh.name/
45c0b7fa88 Added a comment 2014-05-21 17:32:17 +00:00
http://joeyh.name/
25b0836856 Added a comment 2014-05-21 17:28:16 +00:00
Joey Hess
b477d06485 moreinfo 2014-05-21 13:28:10 -04:00
Joey Hess
2bb31a6923 close 2014-05-21 13:23:22 -04:00
Joey Hess
d528db0837 close; dup 2014-05-21 13:21:30 -04:00
Joey Hess
62d57e9035 move to todo 2014-05-21 13:20:23 -04:00
http://joeyh.name/
4cde990664 Added a comment 2014-05-21 17:18:08 +00:00
http://joeyh.name/
60b712569e Added a comment 2014-05-21 17:11:27 +00:00
http://joeyh.name/
7e2bf4c589 Added a comment 2014-05-21 17:10:24 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmaB2n9HFclAvyMyDzvTPaifh5OrlF51Co
2c5cb98337 Added a comment 2014-05-21 07:17:45 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZilYULa6CDEGfuagoDlesyakBgnf-dF8
9f9499bcff removed 2014-05-21 04:07:59 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZilYULa6CDEGfuagoDlesyakBgnf-dF8
74c04de41b Added a comment: Box.com and unknown CA? 2014-05-21 04:07:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZilYULa6CDEGfuagoDlesyakBgnf-dF8
461555e33e Added a comment: Box.com and unknown CA? 2014-05-21 04:07:30 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkexhIpGcYa22aPQtLm-StpHiF-MHYPh5w
155326a813 2014-05-20 17:03:02 +00:00
gjost
3df51b332f Added a comment 2014-05-20 15:19:35 +00:00
http://jsyjr.myopenid.com/
913f16edc1 2014-05-20 13:16:41 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmaB2n9HFclAvyMyDzvTPaifh5OrlF51Co
06efe07c0a 2014-05-20 12:08:11 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmaB2n9HFclAvyMyDzvTPaifh5OrlF51Co
5c9c8b291b Added a comment: DBus wasn't installed 2014-05-20 11:46:35 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmaB2n9HFclAvyMyDzvTPaifh5OrlF51Co
3959c22714 2014-05-20 05:08:46 +00:00
Joey Hess
1905822535
devblog 2014-05-19 18:59:08 -04:00
Joey Hess
dd26672f9e
fixed gcrypt OSX bug 2014-05-19 18:25:59 -04:00
Joey Hess
882e65c80d Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-19 16:20:00 -04:00
Joey Hess
fed509fb3e assistant: When there are multiple remotes giving different ways to access the same repository, honor remote cost settings and use the cheapest available. 
Note that TransferInfo does not always contain the Remote, although
any transfer added to the TransferQueue does have a Remote in its
TransferInfo. The transferkeys command still accepts a UUID, which is
useful to handle upgrades, where an old assistant version runs the new
transferkeys.

This commit was sponsored by Kalle Svensson.
 2014-05-19 16:19:33 -04:00
Joey Hess
e5bebde345 wontfix 2014-05-19 13:09:46 -04:00
http://joeyh.name/
7eeba067f6 Added a comment 2014-05-19 17:09:17 +00:00
Joey Hess
ff6ac90138 Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-19 13:07:03 -04:00
Joey Hess
d7d8a0a6ed
close; dup 2014-05-19 13:06:51 -04:00
http://joeyh.name/
792f3090de Added a comment 2014-05-19 17:06:30 +00:00
http://joeyh.name/
8dd31bed6b Added a comment 2014-05-19 17:04:16 +00:00
http://joeyh.name/
03a5650012 Added a comment 2014-05-19 16:56:15 +00:00
http://joeyh.name/
a4d2838bb7 Added a comment 2014-05-19 16:48:10 +00:00
http://joeyh.name/
a088904563 Added a comment 2014-05-19 16:46:56 +00:00
Joey Hess
d5c6d2ef67 title 2014-05-19 12:44:55 -04:00
http://joeyh.name/
d14713375e Added a comment 2014-05-19 16:44:19 +00:00