Commit graph

26625 commits

Author SHA1 Message Date
wsha.code+ga@b38779424f41c5701bbe5937340be43ff1474b2d
bd1ce3ef0d Added a comment 2016-01-10 03:08:24 +00:00
G.nius.ck@d885edcfde63422ee84e5ee501b7aa545e91298d
6bdbc06317 Added a comment: What do you mean by "git-annex" branch? 2016-01-09 16:04:30 +00:00
https://openid.stackexchange.com/user/e65e6d0e-58ba-41de-84cc-1f2ba54cf574
e4e76c881a Added a comment: Copy from .git/config 2016-01-09 06:44:59 +00:00
mark@6b90344cdab3158eacb94a3944460d138afc9bef
f285579729 Added a comment: Special remotes 2016-01-08 21:12:45 +00:00
Joey Hess
dc58825bed
link 2016-01-08 16:37:47 -04:00
Joey Hess
dd4549e78b
layout 2016-01-08 16:36:11 -04:00
Joey Hess
2f41bbebfb
Merge branch 'master' of ssh://git-annex.branchable.com 2016-01-08 16:35:15 -04:00
Joey Hess
8be45cbf0a
devblog 2016-01-08 16:32:22 -04:00
Joey Hess
55ad30d1d9
update 2016-01-08 16:30:31 -04:00
Joey Hess
8e958c3f4b
defer deletion of test repos until end, fixes sqlite crash
The crash turned out to be caused by the sqlite database being deleted out
from under sqlite before it was done with it. Since multiple git_annex
calls are done in the same process while running the test suite, the
DbHandle could linger until GCed, and the test repo, and thus sqlite
database be deleted before the workerThread was done.
2016-01-08 16:14:39 -04:00
Joey Hess
bafcbe95c3
fix one more test failure with v6 unlocked file merge conflict resolution 2016-01-08 15:23:15 -04:00
oliverconzen@8cff8c5ab3868de177f748566f90c79720f9cf4b
1b91c07834 Added a comment 2016-01-08 19:21:28 +00:00
Joey Hess
51bc32e21e
better fix for slash in view metadata
The homomorphs are back, just encoded such that it doesn't crash in LANG=C

However, I noticed a bug in the old escaping; [pseudoSlash] was escaped the
same as ['/','/']. Fixed by using '%' to escape pseudoSlash. Which requires
doubling '%' to escape it, but that's already done in the escaping of
worktree filenames in a view, so is probably ok.
2016-01-08 13:55:35 -04:00
Joey Hess
42619e2231
view: Avoid using cute unicode homomorphs for '/' and '\' and instead use ugly escaping, as the unicode method doesn't work on non-unicode supporting systems. 2016-01-08 12:45:32 -04:00
Joey Hess
6b963426a0
link to new tip about encryption 2016-01-08 11:48:53 -04:00
Alan
498bd6fb43 2016-01-08 12:53:20 +00:00
wsha.code+ga@b38779424f41c5701bbe5937340be43ff1474b2d
e94ef9bcb7 2016-01-08 07:38:01 +00:00
anntzer.lee@b6e099b6ef8ba8b53005ca7f0e473e825001129b
f0a54b40de Added a comment 2016-01-08 07:35:21 +00:00
sameerds
5527ea62b8 Added a comment: bump! 2016-01-08 07:31:18 +00:00
wsha.code+ga@b38779424f41c5701bbe5937340be43ff1474b2d
f381b5f952 Added a comment 2016-01-08 06:56:02 +00:00
philippgodbersen@b5b6f1c85f129c3bbf300214eb690810f9c582b6
219b1fc3f9 2016-01-07 23:27:10 +00:00
Joey Hess
65b0358444
response 2016-01-07 18:22:51 -04:00
Joey Hess
d6fe7fdd7d
rekey: No longer copies over urls from the old to the new key.
It makes sense for migrate to do that, but not for this low-level (and
little used) plumbing command to.
2016-01-07 18:06:20 -04:00
Joey Hess
2b781cbf7b
Merge branch 'master' of ssh://git-annex.branchable.com 2016-01-07 18:03:33 -04:00
Joey Hess
c96fb11a96
devblog 2016-01-07 18:03:06 -04:00
Joey Hess
4b819bee2b
avoid confusing git with a modified ctime in clean filter
Linking the file to the tmp dir was not necessary in the clean
filter, and it caused the ctime to change, which caused git to think
the file was changed. This caused git status to get slow as it kept
re-cleaning unchanged files.
2016-01-07 17:48:04 -04:00
Joey Hess
b1a1b40a15
fix inverted logic in old associated files cleanup 2016-01-07 15:54:10 -04:00
Joey Hess
722f56a99d
update 2016-01-07 15:47:19 -04:00
Joey Hess
98fb475726
fix broken test 2016-01-07 15:16:36 -04:00
Joey Hess
3b960d1422
migrate and rekey v6 unlocked file support 2016-01-07 15:14:15 -04:00
Joey Hess
0b59fb423e
migrate: Copy over metadata to new key. 2016-01-07 14:21:12 -04:00
grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f
ab36e2908b Added a comment 2016-01-07 06:19:30 +00:00
Joey Hess
66f3fb1ce2
unused: deal with v6 unlocked file that is implicitly ingested by git diff etc 2016-01-06 22:11:21 -04:00
Joey Hess
7482853ddd
force hash to finish with file before returning
Fixes a minor fd leak, never more than 1 in normal use,
which broke the test suite when I tried to write to
a file that was still open for a previous hashing.
2016-01-06 22:09:36 -04:00
Joey Hess
2e071a09b7
cleanup 2016-01-06 20:41:25 -04:00
Joey Hess
3320870bad
optimise
03cb2c8ece put a cat-file into the fast
bloomfilter generation path. Instead, add another bloom filter which diffs
from the work tree to the index.

Also, pull the sha of the changed object out of the diffs, and cat that
object directly, rather than indirecting through the filename.

Finally, removed some hacks that are unncessary thanks to the worktree to
index diff.
2016-01-06 20:38:02 -04:00
Joey Hess
b26776d92f
fix parsing of v6 unlocked file
The newline broke this ad-hoc parser; use the normal one.
2016-01-06 17:46:46 -04:00
Joey Hess
5498576c79
Merge branch 'master' of ssh://git-annex.branchable.com 2016-01-06 16:54:04 -04:00
Joey Hess
03cb2c8ece
unused: Bug fix when a new file was added to the annex, and then removed (but not git rmed). git still has the add staged in this case, so the content should not be unused and was wrongly treated as such.
So, we need to look at both the file on disk to see if it's a annex link,
and the file in the index too. lookupFile doesn't look in the index if the file
is not present on disk.
2016-01-06 16:49:41 -04:00
Joey Hess
f263316c16
skip fix test in unlocked v6 pass
fix is not relevant for unlocked files
2016-01-06 16:16:19 -04:00
Joey Hess
3dc08f5d4f
fix test
have to change the content of unlocked file before committing

otherwise git commit will fail in v6 mode when the file was already
unlocked, because no changes have been made
2016-01-06 16:14:51 -04:00
Joey Hess
55c162c400
fix test
file is locked here, so use right test.
2016-01-06 16:12:00 -04:00
Joey Hess
0c1cc7789f
fix test failure locking an unlocked not present file
In v5, that was not possible, but it is in v6, and so the test was failing.

Investigating, it turns out that locking was copying the pointer file
content to the annex object despite the content not being present. So,
add a check to prevent that.
2016-01-06 16:01:52 -04:00
Joey Hess
d667a68b7e
test: Added --keep-failures option. 2016-01-06 13:44:12 -04:00
ovidiu@66ace8a8d99ce938b0538ffa0f26d30db02a9626
679ab35238 Added a comment 2016-01-06 17:00:38 +00:00
Joey Hess
b96cfdc094
whereis --json: Make url list be included in machine-parseable form. 2016-01-06 12:33:32 -04:00
Joey Hess
6a194e09ff
response 2016-01-06 11:52:16 -04:00
mark@6b90344cdab3158eacb94a3944460d138afc9bef
632b4c72d2 2016-01-05 22:44:15 +00:00
Joey Hess
70a4d41b9d
Merge branch 'master' of ssh://git-annex.branchable.com 2016-01-05 18:13:10 -04:00
Joey Hess
50d25c186d
update 2016-01-05 17:41:46 -04:00