Commit graph

4141 commits

Author SHA1 Message Date
Joey Hess
e9630e90de the syncer now pushes out changes to remotes, in parallel
Note that, since this always pushes branch synced/master to the remote, it
assumes that master has already gotten all the commits that are on the
remote merged in. Otherwise, fast-forward prevention may prevent the push.

That's probably ok, because the next stage is to automatically detect
incoming pushes and merge.
2012-06-22 15:49:48 -04:00
Joey Hess
28e28bc043 stub syncer thread and commit channel 2012-06-22 14:10:25 -04:00
Joey Hess
3ee44cf8fe add assistant command
like watch, but more magic
2012-06-22 13:04:03 -04:00
https://www.google.com/accounts/o8/id?id=AItOawldKnauegZulM7X6JoHJs7Gd5PnDjcgx-E
cf9bf920e8 Added a comment: Homebrew instead of MacPorts 2012-06-22 04:26:06 +00:00
Joey Hess
f27da7a1cc blog for the day and design update 2012-06-21 20:02:00 -04:00
Joey Hess
8a0d6d83f4 remove unused and slightly indefensible Eq and Ord instances 2012-06-21 13:14:31 -04:00
Joey Hess
3138a49084 update 2012-06-21 13:11:22 -04:00
Joey Hess
46d1f5a9d0 fix test suite build 2012-06-21 13:04:24 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnXgp-iIaBK5pnk22xqMVERQb97VyXaejs
ebe8ee6753 Added a comment 2012-06-21 07:08:33 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
680b0c8405 2012-06-21 06:36:02 +00:00
Joey Hess
9f1a29762b blog for the day 2012-06-21 01:07:37 -04:00
Joey Hess
019d073505 Merge branch 'watch' 2012-06-21 01:05:37 -04:00
Joey Hess
7db83a1b0f demote lsof
not available on kfreebsd, and only used by watch
2012-06-21 00:28:56 -04:00
Joey Hess
75dba7f7bc belt and suspenders check
It's possible for there to be multiple queued changes all adding the same
file, and for those changes to be reordered. Maybe. This check will guard
against that ending up adding the wrong version of the file last.
2012-06-20 20:05:40 -04:00
Joey Hess
c70c036707 Merge branch 'master' of ssh://git-annex.branchable.com 2012-06-20 19:33:47 -04:00
Joey Hess
33b914bcf1 pending adds now retried for kqueue
Rethought how to keep track of pending adds that need to be retried later.
The commit thread already run up every second when there are changes,
so let's keep pending adds queued as changes until they're safe to add.

Also, the committer is now smarter about avoiding empty commits when
all the adds are currently unsafe, or in the rare case that an add event
for a symlink is not received in time. It may avoid them entirely.

This seems to work as before for inotify, and is untested for kqueue.

(Actually commit batching seems to be improved for inotify, although I'm
not sure why. I'm seeing only two commits made during large batch
operations, and the first of those is the non-batch mode commit.)
2012-06-20 19:29:53 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmL8pteP2jbYJUn1M3CbeLDvz2SWAA1wtg
a27f3af51f Added a comment 2012-06-20 20:49:07 +00:00
Joey Hess
e0fdfb2e70 maintain set of files pendingAdd
Kqueue needs to remember which files failed to be added due to being open,
and retry them. This commit gets the data in place for such a retry thread.

Broke KeySource out into its own file, and added Eq and Ord instances
so it can be stored in a Set.
2012-06-20 16:31:46 -04:00
Joey Hess
ad11de94e5 typo 2012-06-20 15:53:56 -04:00
Joey Hess
4afefb48f1 thought 2012-06-20 15:29:12 -04:00
Joey Hess
88e26046d7 typo 2012-06-20 15:27:54 -04:00
Joey Hess
483b1b08c6 Merge branch 'master' into watch 2012-06-20 13:15:59 -04:00
Joey Hess
75b6ee81f9 avoid ByteString.Char8 where not needed
Its truncation behavior is a red flag, so avoid using it in these places
where only raw ByteStrings are used, without looking at the data inside.
2012-06-20 13:13:40 -04:00
http://joeyh.name/
6d641f1ac0 Added a comment 2012-06-20 16:59:53 +00:00
Joey Hess
9dc512a3ca fixed 2012-06-20 12:58:31 -04:00
Joey Hess
701231e930 Merge branch 'master' of ssh://git-annex.branchable.com 2012-06-20 12:57:19 -04:00
Joey Hess
dfccee2616 unused: Fix crash when file names contain invalid utf8.
Was decoding the git-cat-file of the symlink target as utf8, but that can't
do, unix filenames are from the 70's and need this shiny disco
fileSystemEncoding.
2012-06-20 12:57:00 -04:00
Joey Hess
ee2acd474f [Word8] to filesystem encoded String
My, GHC makes this hard.
2012-06-20 12:51:25 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnXgp-iIaBK5pnk22xqMVERQb97VyXaejs
77bcc76e87 Added a comment 2012-06-20 14:55:33 +00:00
http://joeyh.name/
568f8d0273 Added a comment 2012-06-20 14:49:09 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnXgp-iIaBK5pnk22xqMVERQb97VyXaejs
e711f20c8f Added a comment 2012-06-20 14:37:10 +00:00
http://joeyh.name/
5774f14958 Added a comment 2012-06-20 14:34:23 +00:00
http://joeyh.name/
5976271390 Added a comment 2012-06-20 14:30:27 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnXgp-iIaBK5pnk22xqMVERQb97VyXaejs
befa378ef7 2012-06-20 11:12:48 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnXgp-iIaBK5pnk22xqMVERQb97VyXaejs
8dbd36ab0a 2012-06-20 11:12:11 +00:00
Joey Hess
dbe7d0e7fe Merge branch 'master' of ssh://git-annex.branchable.com 2012-06-19 18:35:07 -04:00
Joey Hess
2a079a9d37 blog for the day 2012-06-19 18:32:30 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
c838a35d83 2012-06-19 22:28:50 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
23b08efa42 2012-06-19 22:28:08 +00:00
Joey Hess
5580af5789 add closingTracked flag 2012-06-19 10:22:36 -04:00
Joey Hess
8bdb331b60 bug 2012-06-19 10:17:06 -04:00
Joey Hess
39746e30dc typo 2012-06-19 10:11:28 -04:00
Joey Hess
e68b3c99f4 kqueue synthetic add events on startup 2012-06-19 10:08:06 -04:00
Joey Hess
2a61df23e7 kqueue recursive directory adding 2012-06-19 09:56:03 -04:00
Joey Hess
d832a474e9 fixed 2012-06-19 09:19:40 -04:00
Joey Hess
627504744c inverted logic 2012-06-19 09:17:06 -04:00
Joey Hess
27b5fc9fd4 yeah 2012-06-19 09:11:04 -04:00
Joey Hess
c8d4efeed3 Merge branch 'master' of ssh://git-annex.branchable.com 2012-06-19 09:09:47 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
99a3d6a00c 2012-06-19 07:09:09 +00:00
https://www.google.com/accounts/o8/id?id=AItOawncBlzaDI248OZGjKQMXrLVQIx4XrZrzFo
e986d1acb1 2012-06-19 07:08:44 +00:00