mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
19783 commits 13 branches 445 tags 110 MiB
Commit graph

14224 commits

Author SHA1 Message Date
Joey Hess
6d07c9c570 Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-30 16:49:22 -04:00
Joey Hess
5ab287a7bf
meta 2014-05-30 16:48:33 -04:00
http://joeyh.name/
99dc5ca659 Added a comment 2014-05-30 20:47:02 +00:00
Joey Hess
2d3c415489
tag layout 2014-05-30 16:33:06 -04:00
Joey Hess
038431bc2e
tag layout 2014-05-30 16:30:55 -04:00
Joey Hess
f9d450928c Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-30 16:11:05 -04:00
Joey Hess
40a0001fd7
display tags in the main bug list 2014-05-30 16:10:16 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmZilYULa6CDEGfuagoDlesyakBgnf-dF8
ab73d75cc0 Added a comment 2014-05-30 19:37:03 +00:00
Joey Hess
0d70e36466 fix broken link 2014-05-30 15:32:42 -04:00
Joey Hess
2ee73cfd83 fix link 2014-05-30 15:31:49 -04:00
http://joeyh.name/
d1596dc5e7 Added a comment 2014-05-30 19:15:33 +00:00
Joey Hess
22033f954b Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-30 15:10:21 -04:00
http://joeyh.name/
1fec9dd04b Added a comment 2014-05-30 19:09:32 +00:00
Joey Hess
4fa8f8a6e6 Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-30 15:09:26 -04:00
Joey Hess
9c0f3ae7e1 assistant: Make sanity checker tmp dir cleanup code more robust. 2014-05-30 15:08:49 -04:00
http://joeyh.name/
3de1a77893 Added a comment 2014-05-30 18:58:57 +00:00
Joey Hess
0db43ccc81 Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-30 14:52:12 -04:00
Joey Hess
9eaabf0382 webapp: avoid overwriting remote configs when enabling it 
Avoid stomping on existing group and preferred content settings
when enabling or combining with an already existing remote.

Two level fix. First, use defaultStandardGroup rather than
setStandardGroup, so if there is an existing configuration in the git-annex
branch, it's not overwritten.

To handle pre-existing ssh remotes (including gcrypt), a second level is
needed, because before syncing with the remote, it's configuration won't be
available locally. (And syncing could take a long time.) So, in this case,
keep track of whether the remote is being created or enabled, and only set
configs when creating it.

This commit was sponsored by Anders Lannerback.
 2014-05-30 14:03:04 -04:00
Joey Hess
de0cba18f6 webapp: Avoid stomping on existing group and preferred content settings when adding a local repository (or removable drive repository) that already exists. 
This does mean that if the webapp is asked to add a git repository on
a removable drive that already exists, but is not yet a git-annex
repository, it will avoid putting it in any group. That unlikely edge case
is ok; the next step is the edit repository screen, which will show it's
not in any group and the user can pick one.
 2014-05-30 12:32:44 -04:00
go8ose
d4d699ee73 Added a comment 2014-05-30 10:28:38 +00:00
Joey Hess
930d984142 bug 2014-05-29 20:34:42 -04:00
http://joeyh.name/
096af25206 Added a comment 2014-05-30 00:32:25 +00:00
Joey Hess
1c1e636b23 Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-29 20:26:42 -04:00
Joey Hess
2dd274e4ca webapp: When adding a new local repository, fix bug that caused its group and preferred content to be set in the current repository, even when not combining. 
There was a tricky bit here, when it does combine, the edit form is shown,
and so the info needs to be committed to the new repository, but then
pulled into the current one. And caches need to be invalidated for it
to be visible in the edit form.
 2014-05-29 20:17:05 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmHp5oVW8Z9v_vHs5FRtlYj80TYMQWVTS0
fcbc0bb905 Added a comment 2014-05-30 00:13:27 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmHp5oVW8Z9v_vHs5FRtlYj80TYMQWVTS0
8bd81516af 2014-05-30 00:12:05 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmHp5oVW8Z9v_vHs5FRtlYj80TYMQWVTS0
0968cba5d2 2014-05-29 23:36:17 +00:00
http://joeyh.name/
b71f9bfd56 Added a comment 2014-05-29 20:46:47 +00:00
Joey Hess
a4d760b700 add news item for git-annex 5.20140529 2014-05-29 16:46:05 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmi0jblSiI4c5-EswqKw4PXkx5M4fuVvdk
11d7f9b222 Added a comment 2014-05-29 20:10:15 +00:00
Joey Hess
9169fc86f3 remove a few orphaned comments 2014-05-29 15:27:06 -04:00
Joey Hess
f15675e109 Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-29 15:24:36 -04:00
Joey Hess
222f78e9ea remove old closed bugs and todo items to speed up wiki updates and reduce size 
Remove closed bugs and todos that were least edited before 2014.

Command line used:

for f in $(grep -l '\[\[done\]\]' *.mdwn); do if [ -z $(git log --since=2014 --pretty=oneline "$f") ]; then git rm  $f; git rm -rf $(echo "$f" | sed 's/.mdwn$//'); fi; done
 2014-05-29 15:23:05 -04:00
http://joeyh.name/
05bd1345e7 Added a comment 2014-05-29 19:14:51 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmi0jblSiI4c5-EswqKw4PXkx5M4fuVvdk
040c20731c Added a comment 2014-05-29 19:10:08 +00:00
Joey Hess
3796a74fc2
can't use iframe for jenkins, it seems (sameorigin) 2014-05-29 14:40:51 -04:00
Joey Hess
39a52483de
don't use https for windows autobuilder, it's expired cert 2014-05-29 14:39:03 -04:00
Joey Hess
3c5b052142 Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-29 14:23:16 -04:00
Joey Hess
0e82106700
remove 2 more spam comments. Will Ban user Balan. IP bans next step. 2014-05-29 14:22:06 -04:00
http://joeyh.name/
63b63d4089 Added a comment 2014-05-29 18:21:30 +00:00
http://joeyh.name/
6539888000 Added a comment 2014-05-29 18:15:12 +00:00
Joey Hess
970605964c
remove spam comment (will ban this spammer's openid) 2014-05-29 13:20:34 -04:00
Joey Hess
37e8945827 Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-29 13:19:56 -04:00
Joey Hess
973166c2cb close 2014-05-29 13:19:07 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmqz6wCn-Q1vzrsHGvEJHOt_T5ZESilxhc
818c797d0e Added a comment 2014-05-29 16:48:18 +00:00
https://id.koumbit.net/anarcat
793b39360b Added a comment 2014-05-29 16:09:38 +00:00
go8ose
839c07951d 2014-05-29 12:21:53 +00:00
Balan
badc9a4c75 Added a comment: http://freshofruits.com 2014-05-29 07:25:15 +00:00
Balan
fcc79f9bb2 Added a comment: Buy Fruits Online | Fruits Online Chennai 2014-05-29 07:23:20 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmXGwBCD9trUbr0aC8jtDqScpaYK6PNOx0
06c793b453 2014-05-29 06:41:04 +00:00
http://joeyh.name/
92a05910e9 Added a comment 2014-05-28 22:31:21 +00:00
http://joeyh.name/
d0ab472718 Added a comment 2014-05-28 22:29:05 +00:00
Joey Hess
0736b265da confirmed 2014-05-28 18:27:15 -04:00
Joey Hess
b84644826b devblog 2014-05-28 18:26:38 -04:00
bnikolic
30398456a0 2014-05-28 21:25:57 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmqz6wCn-Q1vzrsHGvEJHOt_T5ZESilxhc
6e040807dd Added a comment 2014-05-28 17:30:43 +00: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
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
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
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