Commit graph

5923 commits

Author SHA1 Message Date
Joey Hess
12d1f71e9d really fix link.. 2012-10-05 17:59:34 -04:00
Joey Hess
5e1ff4263a fix link 2012-10-05 17:58:04 -04:00
Joey Hess
b577ec4a5c response 2012-10-05 17:56:15 -04:00
Joey Hess
b374e21118 Merge branch 'master' of ssh://git-annex.branchable.com 2012-10-05 17:09:58 -04:00
Joey Hess
d5348efeb0 blog for the day 2012-10-05 17:09:17 -04:00
Joey Hess
7bb4d507ba add AssumeNotPresent parameter to limits
Solves the issue with preferred content expressions and dropping that
I mentioned yesterday. My solution was to add a parameter to specify a set
of repositories where content should be assumed not to be present. When
deciding whether to drop, it can put the current repository in, and then
if the expression fails to match, the content can be dropped.

Using yesterday's example "(not copies=trusted:2) and (not in=usbdrive)",
when the local repo is one of the 2 trusted copies, the drop check will
see only 1 trusted copy, so the expression matches, and so the content will
not be dropped.
2012-10-05 16:52:44 -04:00
http://m-f-k.myopenid.com/
ac238eccba Added a comment: +1 2012-10-05 20:00:32 +00:00
Joey Hess
51f41bad63 Merge branch 'master' of ssh://git-annex.branchable.com 2012-10-05 11:57:54 -04:00
Joey Hess
b1c28ab87e update 2012-10-05 11:57:48 -04:00
http://joeyh.name/
4c5443329a Added a comment 2012-10-05 15:08:26 +00:00
Joey Hess
e68600813e Merge branch 'master' of ssh://git-annex.branchable.com 2012-10-05 11:00:01 -04:00
Joey Hess
094dfac9f2 note 2012-10-05 10:57:34 -04:00
http://meep.pl/
492d62ce20 Added a comment: Ah, the barber paradox 2012-10-05 06:51:12 +00:00
http://joeyh.name/
a4ffc7d155 Added a comment 2012-10-05 00:43:12 +00:00
84.186.117.8
f782c6948d poll vote (My phone (or MP3 player)) 2012-10-05 00:40:28 +00:00
http://joeyh.name/
05efde7489 Added a comment 2012-10-05 00:39:43 +00:00
Joey Hess
2faa2cdf00 update 2012-10-04 20:38:39 -04:00
Joey Hess
f84ac8141e old bug 2012-10-04 20:15:16 -04:00
Joey Hess
47314c0fad fix last zombies in the assistant
Made Git.LsFiles return cleanup actions, and everything waits on
processes now, except of course for Seek.
2012-10-04 19:56:32 -04:00
Joey Hess
f7f1d25df8 bugfix 2012-10-04 19:41:58 -04:00
Joey Hess
de3ea4adb6 remove now-unnecessary manual reaps 2012-10-04 18:58:57 -04:00
Joey Hess
5594bf0643 more zombie fighting
I'm down to 9 places in the code that can produce unwaited for zombies.

Most of these are pretty innocuous, at least for now, are only
used in short-running commands, or commands that run a set of
actions and explicitly reap zombies after each one.

The one from Annex.Branch.files could be trouble later,
since both Command.Fsck and Command.Unused can trigger it,
and the assistant will be doing those eventally. Ditto the one in
Git.LsTree.lsTree, which Command.Unused uses.

The only ones currently affecting the assistant though, are
in Git.LsFiles. Several threads use several of those.

(And yeah, using pipes or ResourceT would be a less ad-hoc approach,
but I don't really feel like ripping my entire code base apart right
now to change a foundation monad. Maybe one of these days..)
2012-10-04 18:47:31 -04:00
Joey Hess
f67b54e5e3 make a pipeReadStrict, that properly waits on the process
Nearly everything that's reading from git is operating on a small
amount of output and has been switched to use that. Only pipeNullSplit
stuff continues using the lazy version that yields zombies.
2012-10-04 18:04:09 -04:00
Joey Hess
046f51c93b reopening; zombies do seem to accumulate sometimes 2012-10-04 17:40:22 -04:00
Joey Hess
2b0423e13f Only build-depend on libghc-clientsession-dev on arches that will have the webapp. 2012-10-04 17:08:43 -04:00
Joey Hess
3567643e2a blog for the day 2012-10-04 16:55:50 -04:00
Joey Hess
bc649a35ba added preferred-content log, and allow editing it with vicfg
This includes a full parser for the boolean expressions in the log,
that compiles them into Matchers. Those matchers are not used yet.

A complication is that matching against an expression should never
crash git-annex with an error. Instead, vicfg checks that the expressions
parse. If a bad expression (or an expression understood by some future
git-annex version) gets into the log, it'll be ignored.

Most of the code in Limit couldn't fail anyway, but I did have to make
limitCopies check its parameter first, and return an error if it's bad,
rather than erroring at runtime.
2012-10-04 16:00:19 -04:00
Joey Hess
c809f3d486 Merge branch 'master' of ssh://git-annex.branchable.com 2012-10-04 13:29:04 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlFUH5H4OUj9vMJIoXQs8bheiptgANQ6fU
0d8f90d91c 2012-10-04 13:26:01 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm9n2FZTQzC5wvWqgKKnU0HyuC5vgVkfbY
8dd7fe7e41 2012-10-04 05:57:59 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmcYryijvlF8bJvM_eZNSrUPEkMlxMDGTQ
9963a3a74c Added a comment: The bug is actually something completely different! 2012-10-04 03:53:58 +00:00
Joey Hess
4493d5f6c3 Merge branch 'master' of ssh://git-annex.branchable.com 2012-10-03 23:29:53 -04:00
Joey Hess
b67525ce65 tweak 2012-10-03 23:29:37 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmcYryijvlF8bJvM_eZNSrUPEkMlxMDGTQ
4c366d6a09 Fixed formatting. 2012-10-04 02:25:24 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmcYryijvlF8bJvM_eZNSrUPEkMlxMDGTQ
0f682bc6fc Bug description. 2012-10-04 02:20:38 +00:00
Joey Hess
e138a514a9 Merge branch 'master' of ssh://git-annex.branchable.com 2012-10-03 19:41:26 -04:00
Joey Hess
d7898605e3 blog for the day 2012-10-03 19:39:53 -04:00
Joey Hess
b793b77d85 finished vicfg
One note: Deleted lines are not currently parsed as config changes.
That makes sense for trust settings. It may make sense to support deleted
lines as a way to clear group settings.
2012-10-03 19:37:39 -04:00
Joey Hess
dda953bcce wrote parser 2012-10-03 19:13:21 -04:00
Joey Hess
7a7f63182c vicfg: New command, allows editing (or simply viewing) most of the repository configuration settings stored in the git-annex branch.
Incomplete; I need to finish parsing and saving. This will also be used
for editing transfer control expresssions.

Removed the group display from the status output, I didn't really
like that format, and vicfg can be used to see as well as edit rempository
group membership.
2012-10-03 17:04:52 -04:00
Joey Hess
949fdcb63a better example 2012-10-03 11:02:34 -04:00
https://www.google.com/accounts/o8/id?id=AItOawknpbpx4uDElXRzJ4kPXuJU1KdcslOI6go
dc5dd9f22a Added a comment: I strongly agree with Glen 2012-10-03 14:07:41 +00:00
62.93.122.86
377330f2c1 poll vote (My phone (or MP3 player)) 2012-10-03 09:35:07 +00:00
http://wiggy.net/
e7fe412a6d Added a comment: symlinks? 2012-10-03 07:15:22 +00:00
65.12.145.136
58a2e4175e poll vote (My phone (or MP3 player)) 2012-10-03 00:55:16 +00:00
65.12.145.136
ff676a1670 poll vote (Google Drive) 2012-10-03 00:54:54 +00:00
65.12.145.136
c537490c32 poll vote (Amazon Glacier) 2012-10-03 00:54:41 +00:00
Joey Hess
c696db7dd4 blog for the day 2012-10-02 18:16:58 -04:00
Joey Hess
9a3471971b avoid crashing committer if it fails to stage changes
Just retry later.
2012-10-02 18:04:06 -04:00
Joey Hess
9aab70de66 always check with ls-files before adding new files
Makes it safe to use git annex unlock with the watcher/assistant.
And also to mix use of the watcher/assistant with regular files stored in git.

Long ago, I had avoided doing this check, except during the startup scan,
because it would be slow to run ls-files repeatedly.

But then I added the lsof check, and to make that fast, got it to detect
batch file adds. So let's move the ls-files check to also occur when it'll
have a batch, and can check them all with one call.

This does slow down adding a single file by just a bit, but really only
a little bit. (The lsof check is probably more expensive.) It also
speeds up the startup scan, especially when there are lots of new files
found by the scan.

Also, fixed the sleep for annex.delayadd to not run while the threadstate
lock is held, so it doesn't unnecessarily freeze everything else.

Also, --force no longer makes it skip the lsof check, which was not
documented, and seems never a good idea.
2012-10-02 17:41:23 -04:00