Commit graph

6779 commits

Author SHA1 Message Date
Joey Hess
2ce5b6cdf2
Merge branch 'master' of ssh://git-annex.branchable.com 2016-02-14 18:03:31 -04:00
Joey Hess
885e54df0a
fsck: Populate unlocked files in v6 repositories whose content is present in annex/objects but didn't reach the work tree.
This also handles fixing up after cf260d9a15
2016-02-14 17:27:50 -04:00
Joey Hess
cf260d9a15
Fix storing of filenames of v6 unlocked files when the filename is not representable in the current locale.
This is a mostly backwards compatable change. I broke backwards
compatability in the case where a filename starts with double-quote.
That seems likely to be very rare, and v6 unlocked files are a new feature
anyway, and fsck needs to fix missing associated file mappings anyway. So,
I decided that is good enough.

The encoding used is to just show the String when it contains a problem
character. While that adds some overhead to addAssociatedFile and
removeAssociatedFile, those are not called very often. This approach has
minimal decode overhead, because most filenames won't be encoded that way,
and it only has to look for the leading double-quote to skip the expensive
read. So, getAssociatedFiles remains fast.

I did consider using ByteString instead, but getting a FilePath converted
with all chars intact, even surrigates, is difficult, and it looks like
instance PersistField ByteString uses Text, which I don't trust for problem
encoded data. It would probably be slower too, and it would make the
database less easy to inspect manually.
2016-02-14 16:37:25 -04:00
jody.frankowski@46af27a91b08450190f627a8fba772a61e22719f
1db3746ed7 Added a comment 2016-02-14 20:31:49 +00:00
Joey Hess
4100dd9733
close 2016-02-14 16:26:27 -04:00
Joey Hess
eebf42eaaa
close 2016-02-14 15:16:36 -04:00
Joey Hess
9d123645ee
comment 2016-02-14 15:14:02 -04:00
Joey Hess
5e7b53a815
Merge branch 'master' of ssh://git-annex.branchable.com 2016-02-14 15:12:53 -04:00
Joey Hess
9a6afb846f
fixed a couple days ago 2016-02-14 15:11:05 -04:00
Joey Hess
0f18636c8a
Work around problem with concurrent-output when in a non-unicode locale by avoiding use of it in such a locale.
Instead -J will behave as if it was built without concurrent-output support
in this situation. Ie, it will be mostly quiet, except when there's an
error.

Note that it's not a problem for a filename to contain invalid utf-8 when
in a utf-8 locale. That is handled ok by concurrent-output. It's only
displaying unicode characters in a non-unicode locale that doesn't work.
2016-02-14 15:02:42 -04:00
jody.frankowski@46af27a91b08450190f627a8fba772a61e22719f
6983f0a541 2016-02-14 17:46:39 +00:00
emanuele.olivetti@47d88ed185b03191e25329caa6fabc2efb3118b2
9597a21979 Added a comment 2016-02-13 22:27:57 +00:00
emanuele.olivetti@47d88ed185b03191e25329caa6fabc2efb3118b2
a4745df82e 2016-02-13 00:29:58 +00:00
Joey Hess
6a7f65e62d
fix typo 2016-02-10 12:41:28 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
24e2ab277f 2016-02-09 23:58:12 +00:00
christoph.schober@b8a66d38d9dfeeb6d7cd83888079d5870014ad7a
85386d6408 2016-02-09 18:59:32 +00:00
annuges
aac064d688 Added a comment 2016-02-09 13:49:43 +00:00
Joey Hess
17c97434f2
init: Fix bugs in submodule .git symlink fixup, that occurred when initializing in a subdirectory of a submodule and a submodule of a submodule. 2016-02-08 15:41:27 -04:00
Joey Hess
085ec7d693
retitle 2016-02-08 15:26:18 -04:00
Joey Hess
6b6911f6ff
update 2016-02-08 15:25:36 -04:00
Joey Hess
dba6a4bc6e
comment 2016-02-08 15:21:00 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
2c70c88396 Added a comment 2016-02-08 16:21:57 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
0c852966a6 Added a comment: submodules of the submodules 2016-02-08 16:05:18 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
54a83f5288 2016-02-08 15:50:17 +00:00
annuges
18a021a43f 2016-02-07 16:00:39 +00:00
Joey Hess
80ee1bcf71
followup 2016-02-05 13:03:43 -04:00
luca@b7e273474d087a5c7fc4428503f21d5624636d9f
7bef2c110c removed 2016-02-05 07:47:14 +00:00
luca@b7e273474d087a5c7fc4428503f21d5624636d9f
cc0a436589 Added a comment 2016-02-05 06:43:28 +00:00
luca@b7e273474d087a5c7fc4428503f21d5624636d9f
756e5f8002 Added a comment 2016-02-05 06:43:11 +00:00
floppy@47eb4e509346aa37da79eaae46eb0d576f4a16c0
51f9184637 2016-02-03 07:45:43 +00:00
divergentdave@5c17d06f6d67c6f157b76a4cc95ca764b7d2f899
edde0977ff Added a comment: Disabling SSH connection caching 2016-02-01 06:52:55 +00:00
Gothmog
dd7238252d 2016-01-30 13:24:31 +00:00
Gothmog
7e7a8a3606 2016-01-30 13:23:46 +00:00
Joey Hess
ef4b4c3856
webapp: Fix deletion of current repository directory.
removeDirectoryRecursive "." fails; need full path.

I think this is a reversion introduced in the relative path conversion, in
january of *last* year!
2016-01-29 14:04:39 -04:00
Joey Hess
86689eb930
comment 2016-01-29 13:22:24 -04:00
Joey Hess
9a4af2324e
Fix reversion in lookupkey, contentlocation, and examinekey which caused them to sometimes output side messages. 2016-01-29 13:20:24 -04:00
Joey Hess
66a24e0f36
followup 2016-01-29 13:08:12 -04:00
ggreif@8132a868199b4ffec14150c87f538dc06a538220
ee5d8e408d 2016-01-28 10:58:35 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
599a3bafac 2016-01-28 01:28:21 +00:00
Joey Hess
aaac5e6779
bug 2016-01-26 15:20:00 -04:00
Joey Hess
039e83ed5d
Fix nasty reversion in the last release that broke sync --content's handling of many preferred content expressions.
The type checker should have noticed this, but the changes to mapM
that make it accept any Traversable hid the fact that it was not being
passed a list at all. Thus, what should have returned an empty list most
of the time instead returned [""] which was treated as the name of the
associated file, with disasterout consequences.

When I have time, I should add a test case checking what sync --content
drops. I should also consider replacing mapM with one re-specialized to
lists.
2016-01-26 14:28:43 -04:00
Joey Hess
3ddfa7bf1d
retitle 2016-01-26 14:17:46 -04:00
Joey Hess
f1d33568b0
update 2016-01-26 13:49:10 -04:00
alexander+gitannex@2296816092e64c93002644a8af3a4d4c9e6b21c7
8a0b08f018 2016-01-25 23:21:12 +00:00
Joey Hess
b4c9460467
Merge branch 'master' of ssh://git-annex.branchable.com 2016-01-25 16:30:25 -04:00
Joey Hess
d2ed162192
close 2016-01-25 16:29:46 -04:00
hello@8ec3aeb95041eb24da1d74b9a59964a3e3519fb5
1ff8ba5ce6 Add bug report 2016-01-25 20:25:16 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
63052faa64 Added a comment 2016-01-25 20:23:23 +00:00
Joey Hess
d3ba9fe5c8
matchexpression: New plumbing command to check if a preferred content expression matches some data. 2016-01-25 16:16:18 -04:00
Joey Hess
7a468324e6
comment 2016-01-25 14:26:58 -04:00