Commit graph

3978 commits

Author SHA1 Message Date
https://www.google.com/accounts/o8/id?id=AItOawnBJ6Dv1glxzzi4qIzGFNa6F-mfHIvv9Ck
c7efb2888c Added a comment: Wording 2012-06-07 03:43:19 +00:00
Joey Hess
d5de27ff40 tweak 2012-06-06 23:30:38 -04:00
Joey Hess
c56812980c document watch 2012-06-06 23:28:33 -04:00
Joey Hess
b8ae9528ab refactor 2012-06-06 23:20:09 -04:00
Joey Hess
b8f85f7a82 build watch on non-linux, just don't do anything 2012-06-06 22:49:32 -04:00
http://joeyh.name/
54f5462ad4 Added a comment 2012-06-06 23:25:57 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkmtR6oVColYKoU0SjBORLDGrwR10G-mKo
9ee59f62d5 Added a comment: Dropbox Inotify 2012-06-06 22:03:29 +00:00
Joey Hess
baf9c7102e blog for the day 2012-06-06 16:56:48 -04:00
Joey Hess
a79aebbe2a update 2012-06-06 16:54:39 -04:00
Joey Hess
c5b11561f0 handle running out of watch descriptors 2012-06-06 16:50:28 -04:00
Joey Hess
8aa194bf80 update 2012-06-06 15:51:34 -04:00
Joey Hess
db8effb8f3 ignore .gitignore and .gitattributes 2012-06-06 15:50:12 -04:00
Joey Hess
e17bc40c31 update 2012-06-06 15:24:51 -04:00
Joey Hess
81d4991fa3 thoughts 2012-06-06 15:13:18 -04:00
Joey Hess
899334223f fixed 2 races! Only 1 serious race to go! 2012-06-06 14:33:12 -04:00
Joey Hess
b819f644ad close the git add race
There's a race adding a new file to the annex: The file is moved to the
annex and replaced with a symlink, and then we git add the symlink. If
someone comes along in the meantime and replaces the symlink with
something else, such as a new large file, we add that instead. Which could
be bad..

This race is fixed by avoiding using git add, instead the symlink is
directly staged into the index.

It would be nice to make `git annex add` use this same technique.
I have not done so yet because it currently runs git update-index once per
file, which would slow does `git annex add`. A future enhancement would be
to extend the Git.Queue to include the ability to run update-index with
a list of Streamers.
2012-06-06 14:29:10 -04:00
Joey Hess
91db540769 add support for staging other types of blobs, like symlinks, into the index
Also added a utility TopFilePath type, which could stand to be used more
widely.
2012-06-06 14:26:15 -04:00
Joey Hess
993e6459a3 factor out nukeFile 2012-06-06 13:13:13 -04:00
Joey Hess
723eb19bbf split out utility functions 2012-06-06 13:07:30 -04:00
Joey Hess
4b32ea793d Merge branch 'master' into watch 2012-06-06 12:52:21 -04:00
Joey Hess
455fca65bf layout 2012-06-06 11:58:08 -04:00
Nathan Collins
6f17b2fb39 WIP: Add man page installation to Setup.hs
This works with `cabal-dev install .`, but `cabal sdist` does not yet
include the man pages (tried adding a `make $(mans)` before `cabal
sdist` in `make sdist`, but no luck).

XXX: Need to go back and replace spaces with tabs.
2012-06-06 02:35:32 -07:00
Nathan Collins
1cfd2e1c05 Remove INSTALL note about man pages. 2012-06-06 01:57:31 -07:00
Joey Hess
f596084a59 move hashObject to HashObject library and generalize it to support all git object types 2012-06-06 02:31:31 -04:00
Joey Hess
27cfeca4ea Merge branch 'master' into watch 2012-06-06 02:16:21 -04:00
Joey Hess
f1bd72ea54 factor out generic update-index code from unionmerge code 2012-06-06 00:10:34 -04:00
Joey Hess
141fa3c94d update 2012-06-06 00:01:17 -04:00
Nathan Collins
f5261f60c3 Make standalone man-page installation possible
The `cabal install git-annex` doesn't install the man pages, and the
Makefile only installed the man pages as part of a full build/install.
So, I factored out the documentation parts of the Makefile.
2012-06-05 20:36:42 -07:00
Joey Hess
d41c1134cb daily blog 2012-06-05 20:54:56 -04:00
Joey Hess
d05a22b5f6 closed a race, although a less likely similar one remains 2012-06-05 20:34:25 -04:00
Joey Hess
a7a729bce4 Merge branch 'master' into watch 2012-06-05 20:30:37 -04:00
Joey Hess
c981ccc077 add: Prevent (most) modifications from being made to a file while it is being added to the annex.
Anything that tries to open the file for write, or delete the file,
or replace it with something else, will not affect the add.

Only if a process has the file open for write before add starts
can it still change it while (or after) it's added to the annex.
(fsck will catch this later of course)
2012-06-05 20:28:34 -04:00
Joey Hess
5809f33f8b use createAnnexDirectory when setting up tmp dir 2012-06-05 20:25:32 -04:00
Joey Hess
f8d422fe24 update test suite 2012-06-05 19:54:44 -04:00
Joey Hess
d3cee987ca separate source of content from the filename associated with the key when generating a key
This already made migrate's code a lot simpler.
2012-06-05 19:51:03 -04:00
Joey Hess
e6b157cc09 Merge branch 'master' into watch 2012-06-05 19:03:44 -04:00
Joey Hess
77188ff04d update 2012-06-05 19:03:39 -04:00
Joey Hess
f93fbf9c76 Merge branch 'master' into watch 2012-06-05 18:54:31 -04:00
Joey Hess
b5c617b623 one more 2012-06-05 18:54:25 -04:00
Joey Hess
4f25721bdf Merge branch 'master' into watch
Conflicts:
	doc/design/assistant/inotify.mdwn
2012-06-05 18:39:32 -04:00
Joey Hess
40456953c2 another one 2012-06-05 15:20:13 -04:00
Joey Hess
a50d1b5853 Merge branch 'master' of ssh://git-annex.branchable.com
Conflicts:
	doc/design/assistant/inotify.mdwn
2012-06-05 15:14:32 -04:00
Joey Hess
0eec65c815 races 2012-06-05 15:10:04 -04:00
Joey Hess
73ab0e642c races 2012-06-05 15:06:12 -04:00
Joey Hess
78f5f90c24 Merge branch 'master' into watch 2012-06-05 14:53:38 -04:00
Joey Hess
e771c64559 races 2012-06-05 14:53:30 -04:00
Joey Hess
1ab7b2b8ea add news item for git-annex 3.20120605 2012-06-05 14:15:00 -04:00
Joey Hess
8511957c68 releasing version 3.20120605 2012-06-05 14:14:45 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
a71b09a4fe Added a comment 2012-06-05 14:07:27 +00:00
Joey Hess
13118136c0 Preserve parent environment when running hooks of the hook special remote. 2012-06-04 21:52:36 -04:00