Commit graph

26463 commits

Author SHA1 Message Date
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
Joey Hess
aa4f353e5d
clarify absPathFrom
The repo path is typically relative, not absolute, so
providing it to absPathFrom doesn't yield an absolute path.
This is not a bug, just unclear documentation.

Indeed, there seem to be no reason to simplifyPath here, which absPathFrom
does, so instead just combine the repo path and the TopFilePath.

Also, removed an export of the TopFilePath constructor; asTopFilePath
is provided to construct one as-is.
2016-01-05 17:33:48 -04:00
Joey Hess
b3d60ca285
use TopFilePath for associated files
Fixes several bugs with updates of pointer files. When eg, running
git annex drop --from localremote
it was updating the pointer file in the local repository, not the remote.
Also, fixes drop ../foo when run in a subdir, and probably lots of other
problems. Test suite drops from ~30 to 11 failures now.

TopFilePath is used to force thinking about what the filepath is relative
to.

The data stored in the sqlite db is still just a plain string, and
TopFilePath is a newtype, so there's no overhead involved in using it in
DataBase.Keys.
2016-01-05 17:22:19 -04:00
Joey Hess
f3d6f9acb5
fix some tests of v6 unlocked files 2016-01-05 17:19:30 -04:00
mark@6b90344cdab3158eacb94a3944460d138afc9bef
bf2f942997 removed 2016-01-05 20:14:46 +00:00
felix.hagemann@b76e9ea0928cf33dacffc37ec3dbecf33171a8a5
09435ff50a 2016-01-05 19:56:28 +00:00
Joey Hess
66060f45f7
Revert "Add Munin module."
This reverts commit f09df3e226.

Wow, applied to wrong project entirely.
2016-01-05 15:32:33 -04:00
Joey Hess
afb7a22176
Merge branch 'master' of ssh://git-annex.branchable.com 2016-01-05 12:01:59 -04:00
Yaroslav Halchenko
bfb68c2245
BF: added forgotten commas for new build-depends 2016-01-05 12:01:35 -04:00
Jelmer Vernooij
f09df3e226
Add Munin module.
Signed-off-by: Jelmer Vernooij <jelmer@jelmer.uk>
2016-01-05 12:01:35 -04:00
CandyAngel
14c5c24c40 Added a comment 2016-01-05 11:41:13 +00:00
grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f
d45344e5c4 2016-01-05 11:23:36 +00:00
grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f
10aecc58ab Added a comment 2016-01-05 11:09:07 +00:00