Commit graph

6304 commits

Author SHA1 Message Date
Steve
4dd83485e7 2012-10-20 18:10:23 +00:00
Steve
1a1312925f 2012-10-20 18:04:55 +00:00
Steve
3f40f9d68d 2012-10-20 18:03:59 +00:00
Joey Hess
403bb5b93a update 2012-10-20 12:59:59 -04:00
Joey Hess
ff36e474f1 Merge branch 'master' of ssh://git-annex.branchable.com 2012-10-20 12:45:16 -04:00
Joey Hess
14b376d440 Merge branch 'safesemaphore'
Conflicts:
	debian/changelog
	git-annex.cabal
2012-10-20 12:44:25 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnq-RfkVpFN15SWvQ2lpSGAi0XpNQuLxKM
af3cee511c 2012-10-20 15:22:54 +00:00
https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89
2f319e8aba Added a comment: Correction 2012-10-20 05:34:47 +00:00
https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89
acff478d3b 2012-10-20 05:31:45 +00:00
https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89
de452ca2a9 Added a comment: Response 2012-10-20 05:21:13 +00:00
Joey Hess
4d1e0c9be8 Merge branch 'master' of ssh://git-annex.branchable.com 2012-10-19 17:03:07 -04:00
Joey Hess
ef030e770a blog for the day 2012-10-19 17:02:37 -04:00
http://joeyh.name/
09da058873 Added a comment 2012-10-19 21:01:44 +00:00
Joey Hess
73c28d2ca7 nasty race workaround 2012-10-19 16:59:18 -04:00
Joey Hess
40aab719df Replace "in=" with "present" in preferred content expressions
in= was problimatic in two ways. First, it referred to a remote by name,
but preferred content expressions can be evaluated elsewhere, where that
remote doesn't exist, or a different remote has the same name. This name
lookup code could error out at runtime. Secondly, in= seemed pretty useless.
in=here did not cause content to be gotten, but it did let present content
be dropped.

present is more useful, although "not present" is unstable and should be
avoided.
2012-10-19 16:09:21 -04:00
Joey Hess
3417c55189 remove git-annex branch read cache
This cache prevented noticing changes made by another process.

The case I just ran into involved the assistant dropping a file, which
cached its presence info. Then the same file was downloaded again,
but the assistant didn't know its presence info had changed.

I don't see a way to keep this cache. Will instead rely on the OS level
file cache, for files in the journal. May need to add more higher-level
caching of info that it's ok to have a potentially stale copy of,
although much of git-annex already does so.
2012-10-19 14:25:15 -04:00
Joey Hess
f4c3a45da0 check preferred content when a file is moved or created
This can result in the file being dropped, or being downloaded, or even
being dropped from some other repo.

It's even possible to create a file in a directory where content is not
wanted, which will make the assistant immediately send it elsewhere, and
then drop it.
2012-10-19 14:22:13 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkoMFuxYLuZXXOEh4uGzSAD8otbDxW5r94
e8f8dbe752 2012-10-19 17:47:17 +00:00
Joey Hess
168752ca3b race 2012-10-19 13:33:11 -04:00
Joey Hess
6fab0e9c15 Merge branch 'master' of ssh://git-annex.branchable.com 2012-10-19 13:10:53 -04:00
Joey Hess
84f3691932 close 2012-10-19 13:10:32 -04:00
http://joeyh.name/
41adb74e85 Added a comment 2012-10-19 17:08:39 +00:00
http://joeyh.name/
a2c35d5680 Added a comment 2012-10-19 17:07:08 +00:00
http://grossmeier.net/
c3d48bfa3e 2012-10-19 05:34:11 +00:00
http://a-or-b.myopenid.com/
94c849d0a6 2012-10-19 01:38:17 +00:00
http://a-or-b.myopenid.com/
a4ccbc0d50 Added a comment 2012-10-19 01:21:42 +00:00
93.231.130.2
78637fcb15 poll vote (Google Drive) 2012-10-19 00:32:24 +00:00
https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89
fbf5d27a49 Added a comment: Ah 2012-10-18 23:52:03 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlZvtBCVyJw4O71OPsdwGpVh6iJ1W-xaPc
c0ebf23a2d Added a comment 2012-10-18 22:44:40 +00:00
Joey Hess
c42ef4ac2e blog for the day 2012-10-18 18:10:02 -04:00
Joey Hess
9c89924c05 check and drop after uploads 2012-10-18 16:05:43 -04:00
Joey Hess
0c6a1ec87d update 2012-10-18 15:56:52 -04:00
Joey Hess
ee9e0702a2 check and drop unwanted content from remotes after receiving a transfer 2012-10-18 15:37:57 -04:00
Joey Hess
dea125e1b7 split 2012-10-18 15:22:28 -04:00
Joey Hess
f7f34d2072 drop unwanted content in the transfer scan
This was complicated quite a bit by needing to check numcopies. I optimised
that, so it only looks up numcopies once per file, no matter how many
remotes it checks to drop from. Although it did just occur to me that
it might be better to first check if it wants to drop content, and only
then check numcopies..
2012-10-18 15:07:11 -04:00
Joey Hess
dbe8de40ab minor transfer scanner code reworking
Also a small optimisation using a Set
2012-10-18 13:42:17 -04:00
Nicolas Pouillard
03ba7d6a87 One more #ifdef WITH_S3 2012-10-18 12:43:24 -04:00
Nicolas Pouillard
6b0a6cd226 import S3 only when enabled 2012-10-18 12:42:57 -04:00
Nicolas Pouillard
4af755d504 Relax the dependency on the base package, to accomodate with GHC 7.6 2012-10-18 15:51:04 +02:00
84.204.75.2
9026ed9c3f poll vote (Google Drive) 2012-10-18 11:48:11 +00:00
84.204.75.2
dfc6d8a38a poll vote (My phone (or MP3 player)) 2012-10-18 11:47:33 +00:00
https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89
5851556836 Added a comment: I agree 2012-10-18 07:11:20 +00:00
https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89
a9b5adb6eb 2012-10-18 07:04:13 +00:00
https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89
c38dfc8290 Added a comment: Another idea 2012-10-18 05:38:07 +00:00
https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89
10d27267aa Added a comment: Works great! 2012-10-18 05:34:06 +00:00
http://joeyh.name/
0331c546f5 Added a comment 2012-10-18 02:23:54 +00:00
http://joeyh.name/
96abd75a3c Added a comment 2012-10-18 02:20:25 +00:00
Joey Hess
3735063869 Merge branch 'master' of ssh://git-annex.branchable.com 2012-10-17 22:05:11 -04:00
http://joeyh.name/
91b64deceb Added a comment 2012-10-18 02:04:47 +00:00
Joey Hess
46d1b25bce add solaris workaround to cabal file too
uname reports SunOS, but cabal seems to use solaris.
2012-10-17 22:00:29 -04:00