Commit graph

39506 commits

Author SHA1 Message Date
Joey Hess
ad08273ac5 refactor 2011-03-23 17:29:54 -04:00
Joey Hess
8beb72e206 migrate: Bugfix for case when migrating a file results in a key that is already present in .git/annex/objects.
For example, this could happen if using SHA1 and a file with content
"foo" were added to that backend. Then a file with "content" foo were
migrated from the WORM backend.

Assume that, if a backend assigned the same key, the already annexed
content must be the same. So, the "old" content can be reused.
2011-03-23 17:25:28 -04:00
Joey Hess
af45a62980 update 2011-03-23 13:13:51 -04:00
Joey Hess
2c70a0a816 Merge remote-tracking branch 'branchable/master' 2011-03-23 13:12:22 -04:00
Joey Hess
0cd70cb5c0 kFreeBSD support
Tested on Debian kfreebsd-amd64. The BSD #includes worked. Both statfs64
and statfs worked. Using statfs to keep the same as general freebsd, and
because I didn't try it on 32 bit.
2011-03-23 13:10:20 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
443bf2ade7 Added a comment 2011-03-23 17:03:53 +00:00
http://joey.kitenet.net/
4727ebab53 Added a comment 2011-03-23 16:57:56 +00:00
Joey Hess
b9c4c006bd use statfs64 on apple, while retaining statfs on freebsd
http://git-annex.branchable.com/bugs/Makefile_is_missing_dependancies/#comment-3196b43b7d745ab206435d0a69686815
indicates statfs64 works on apple. Probably on freebsd too, but I
have not tested it and so will stick with the old code there.
2011-03-23 12:53:57 -04:00
Joey Hess
17db081ac5 Merge remote-tracking branch 'branchable/master' 2011-03-23 12:47:14 -04:00
Joey Hess
7400c8318a correct 2011-03-23 12:46:51 -04:00
Joey Hess
68d90b3328 allow force overriding the disk space check 2011-03-23 12:45:34 -04:00
Joey Hess
e096c8278a Merge remote-tracking branch 'branchable/master' 2011-03-23 12:23:58 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
7ffc3a72ae Added a comment 2011-03-23 16:23:57 +00:00
Joey Hess
0dac2b4f6c Revert "Define (__APPLE__) in StatFS"
This reverts commit 4440ecf4a7.

Turns out that it is reporting a block size of 0 and so all bogus.
2011-03-23 12:23:13 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
48a8f811fa Added a comment 2011-03-23 16:14:22 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
328b023c53 Added a comment 2011-03-23 16:02:35 +00:00
http://joey.kitenet.net/
da198e87fb bit about bare repos 2011-03-23 15:31:54 +00:00
http://joey.kitenet.net/
d0a7513bbb Added a comment 2011-03-23 15:28:00 +00:00
http://joey.kitenet.net/
7808de3d47 Added a comment 2011-03-23 15:18:29 +00:00
http://joey.kitenet.net/
cf70075c4b Added a comment 2011-03-23 15:13:33 +00:00
Jimmy Tang
4440ecf4a7 Define (__APPLE__) in StatFS
At least on OSX 10.6.6 it appears to have the same defintions as
FreeBSD. The build process doesn't complain and the code is enabled,
this needs to be tested and checked more.
2011-03-23 11:11:55 -04:00
http://joey.kitenet.net/
5b4ae90cdb Added a comment 2011-03-23 15:05:12 +00:00
Joey Hess
7da3dc5984 Merge remote-tracking branch 'branchable/master' 2011-03-23 10:55:54 -04:00
Joey Hess
b0eccb003a improve free space needed display 2011-03-23 10:52:40 -04:00
http://peter-simons.myopenid.com/
6d857b540a Added a comment: Why isn't this package built with Cabal? 2011-03-23 11:31:06 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
002db413a5 2011-03-23 09:53:16 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
847629ee69 Added a comment 2011-03-23 08:21:32 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
ba064654a3 2011-03-23 07:27:14 +00:00
Joey Hess
04539d1671 improve size change display 2011-03-23 02:42:14 -04:00
Joey Hess
cd1cb52652 tweak 2011-03-23 02:15:26 -04:00
Joey Hess
c43e3b5c78 check key size when available, no matter the backend
Now that SHA and other backends can have size info, fsck should check it
whenever available.
2011-03-23 02:10:59 -04:00
Joey Hess
12cdc96216 tweak 2011-03-23 01:13:13 -04:00
Joey Hess
0a295fad34 Merge remote-tracking branch 'branchable/master' 2011-03-23 01:07:17 -04:00
Joey Hess
1161fa8bdf add units to disk size check message 2011-03-23 01:06:14 -04:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
745f48297d Added a comment 2011-03-23 02:07:49 +00:00
Joey Hess
376fc65d3e add license text 2011-03-22 21:23:35 -04:00
Joey Hess
7051763b5b tweak 2011-03-22 21:00:18 -04:00
Joey Hess
d12512bfc6 Merge remote-tracking branch 'branchable/master' 2011-03-22 20:42:33 -04:00
http://joey.kitenet.net/
0e8f304dec Added a comment 2011-03-23 00:38:10 +00:00
Joey Hess
43d1747804 Merge remote-tracking branch 'branchable/master' 2011-03-22 20:36:24 -04:00
Joey Hess
c1dc407941 Fix space leak in fsck and drop commands.
The space leak was somehow caused by this line:

	absfiles <- mapM absPath files

I confess, I don't quite understand why this caused bad buffering,
but apparently the whole pipeline from git-ls-files backed up at that
point.

Happily, rewriting the code to only get the cwd once and use a pure
function to calculate absfiles clears it up, and should be a little more
efficient in syscalls too.
2011-03-22 20:31:22 -04:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
686b12ae30 Added a comment 2011-03-22 23:41:53 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
d2a8e51177 2011-03-22 22:59:55 +00:00
Joey Hess
5d75919561 update 2011-03-22 18:55:29 -04:00
Joey Hess
3a41923789 clarify wording
temp files are always assumed to be unused, in either mode
2011-03-22 18:53:16 -04:00
Joey Hess
1ea373e246 clarify 2011-03-22 18:52:52 -04:00
Joey Hess
9f9325aa3d clean too 2011-03-22 18:51:14 -04:00
Joey Hess
ee6fabb7ca update 2011-03-22 18:50:36 -04:00
Joey Hess
fea20d260c applied 2011-03-22 18:45:11 -04:00
Jimmy Tang
c44c318eaf Touch up Makefile to depend on StatFS.hs 2011-03-22 18:43:54 -04:00