Joey Hess
3fba4f83ed
fix windows build
2016-02-16 16:15:32 -04:00
Joey Hess
7db739f6c4
100% pass on FAT
2016-02-16 16:02:54 -04:00
Joey Hess
aa569500d5
fix numerous problem with test suite on crippled filesystems etc
2016-02-16 15:30:59 -04:00
Joey Hess
15148ee9eb
annex.addunlocked
...
* add, addurl, import, importfeed: When in a v6 repository on a crippled
filesystem, add files unlocked.
* annex.addunlocked: New configuration setting, makes files always be
added unlocked. (v6 only)
2016-02-16 14:43:43 -04:00
Joey Hess
adc27f081a
escape slashes in annex pointer files
...
The problem with having the slashes unescaped is, it broke parsing, since
the parser takes the filename to get the part containing the key.
That particularly affected URL keys.
This makes the format be the same as symlinks point to, which keeps things
simple.
Existing pointer files will continue to work ok.
2016-02-16 14:10:08 -04:00
Joey Hess
32dcc1303a
devblog
2016-02-15 16:55:55 -04:00
Joey Hess
b46ba09343
avoid fromkey test when on crippled fs
2016-02-15 16:54:44 -04:00
Joey Hess
7899f7248a
force strict file read
...
Avoid possibly having the file open still when it gets deleted.
Needed on Windows, particularly.
2016-02-15 16:47:34 -04:00
Joey Hess
4d89a1ffd1
allow \r in pointer files
...
git-annex doesn't write \r, but it can be present due to line ending
conversions or perhaps user edits.
2016-02-15 16:37:40 -04:00
Joey Hess
cceff0e46c
wow, this windows sh is super busted. try another hack
2016-02-15 16:15:23 -04:00
Joey Hess
f9d79d194b
Windows: Fix v6 unlocked files to actually work.
...
Pointer files were not being treated as annex content, so "git annex get"
didn't replace them with the object.
2016-02-15 16:12:18 -04:00
Joey Hess
dcf42949cb
fix script
2016-02-15 16:05:52 -04:00
Joey Hess
46297817c6
add back caballog target
...
used by ghci wrapper script
2016-02-15 16:01:31 -04:00
Joey Hess
88718976c6
skip v6 locked tests on windows, not supported
2016-02-15 15:53:55 -04:00
Joey Hess
2e3b5e645f
When initializing a v6 repo on a crippled filesystem, don't force it into direct mode.
2016-02-15 15:41:49 -04:00
Joey Hess
6021538332
fix build w/o concurrent-output
2016-02-15 15:29:41 -04:00
Joey Hess
7d4b4a77b1
seems false didn't cause windows shell to propigate test suite failure
2016-02-15 15:23:17 -04:00
Joey Hess
8a20f4ed24
avoid warning on windows build
2016-02-15 15:11:06 -04:00
Joey Hess
4034de2be6
quiet warning on windows
2016-02-15 15:06:54 -04:00
Joey Hess
65c1003bf5
don't try to pull in libmagic on windows
...
May be possible to install the library somehow, but it certainly won't be
available normally, and so cabal will fail to install magic.
2016-02-15 15:05:31 -04:00
Joey Hess
540a0343ba
more windows build fix
2016-02-15 15:03:44 -04:00
Joey Hess
2fca8e730f
Merge branch 'master' of ssh://git-annex.branchable.com
2016-02-15 14:59:18 -04:00
Joey Hess
f55c576923
fix windows build
2016-02-15 14:58:45 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
ef557d7cac
Added a comment
2016-02-15 17:05:08 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
2301c7c134
Added a comment
2016-02-15 17:02:59 +00:00
Joey Hess
dfbb5db3a8
add spacer to menu
2016-02-15 13:02:14 -04:00
Joey Hess
4eeb25d9c9
comment
2016-02-15 12:52:56 -04:00
Joey Hess
115ef6b7fa
Merge branch 'master' of ssh://git-annex.branchable.com
2016-02-15 12:50:29 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
813d3262d2
2016-02-15 16:30:37 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
ad15d778e3
added [[!meta author=yoh]]
2016-02-15 15:29:22 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
eb879367a7
Added a comment
2016-02-15 15:28:41 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
8ed1e1bc66
2016-02-15 15:26:36 +00:00
emanuele.olivetti@47d88ed185b03191e25329caa6fabc2efb3118b2
2e62e4cce0
Added a comment
2016-02-15 09:47:24 +00:00
jonan
60d9cb69ea
2016-02-15 09:37:52 +00:00
Joey Hess
7aab9a0b23
fix make fast to link executable again
...
Use second ghc pass, not first.
2016-02-15 00:57:55 -04:00
Joey Hess
4ee302d1b0
deprecated
2016-02-14 20:49:03 -04:00
Joey Hess
591d0e2af1
remove unused Read instance
2016-02-14 20:48:19 -04:00
Joey Hess
6702f5a9c6
fix typo
2016-02-14 19:31:40 -04:00
Joey Hess
2ce5b6cdf2
Merge branch 'master' of ssh://git-annex.branchable.com
2016-02-14 18:03:31 -04:00
Joey Hess
49215d68ae
devblog
2016-02-14 18:01:35 -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
675321264f
fsck: Detect and fix missing associated file mappings in v6 repositories.
...
This also handles fixing up after the bad data written by
cf260d9a15
2016-02-14 17:09:54 -04:00
Joey Hess
74bbdfa888
files with only 1 linkCount may still be unlocked
...
When on crippled filesystem, or without annex.thin set.
2016-02-14 17:04:09 -04:00
Joey Hess
5b51db7645
clean up
2016-02-14 16:52:43 -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
613d6056f5
better types
2016-02-14 16:26:39 -04: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
