Commit graph

3848 commits

Author SHA1 Message Date
Joey Hess
9b40cd7461 update 2012-06-04 15:23:56 -04:00
Joey Hess
9791d1dfe7 update; worked on watch branch today 2012-06-04 15:16:59 -04:00
Joey Hess
677ad74687 add handling of symlink addition events
And just like that, annexed files can be moved and copies around within
the tree, and are automatically fixed to point to the content, and staged
in git. Huzzah!

Delete still remains TODO, with its troublesome race during add..
2012-06-04 15:10:43 -04:00
Joey Hess
47f8f43715 workaround other part of moved directory problem
This fixes the scenario where:

* directory foo is moved away (and still watched)
* a new directory foo is made
* file (or directory) foo/bar is created
* the old directory's file (or directory) "bar" is deleted

We don't want a deletion event for foo/bar in this case.
2012-06-04 14:54:14 -04:00
Joey Hess
fa9d479fd1 add explict test that a closed file even is on a regular file
There are two reasons for this test. First, there could be a fifo or other
non-regular file that was closed.

Second, this test avoids ugliness when a subdirectory is moved out of the
top of the watch directory to elsewhere, and a file added to it.
Since the subdirectory has moved, the file won't be present under the
old location, and nothing will be done.

I cannot find a way to stop watching such directories, at least not without
a lot of pain. The inotify interface in Haskell doesn't make it easy to
stop watching a given subdirectory when it's moved out; it would require
keeping a map of all watch handles that is shared between threads.
This workaround avoids the problem in most cases; the only remaining case
being deletion of a file from a moved subdirectory.
2012-06-04 14:31:06 -04:00
Joey Hess
59ce18d757 add hinotify dependencies 2012-06-04 13:34:22 -04:00
Joey Hess
7053f5f947 handle directory deletion
When a directory is deleted, or moved away, git rm -r it to stage
the deletion.
2012-06-04 13:30:30 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlYu7QmD7wrbHWkoxuriaA9XcijM-g5vrQ
bc99cf6a5a 2012-06-04 17:28:38 +00:00
Joey Hess
23dbff4b43 add events for symlink creation and directory removal
Improved the inotify code, so it will also notice directory removal
and symlink creation.

In the watch code, optimised away a stat of a file that's being added,
that's done by Command.Add.start. This is the reason symlink creation is
handled separately from file creation, since during initial tree walk
at startup, a stat was already done, and can be reused.
2012-06-04 13:22:56 -04:00
Joey Hess
eab3872d91 Merge branch 'master' into watch 2012-06-04 12:07:59 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
759b55a674 nothing too crazy, but it's the usual distro specific problems or architecture specific problems 2012-06-04 09:21:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlu7K3h7Ry1uDAU_ERYGuqt0LoGNJqGuRo
2a75bbdaa0 Added a forum post asking how to make locally cached files stay up to date across both rename and modify. 2012-06-04 03:41:57 +00:00
Joey Hess
619d765646 simplify OSX installation instructions
The new Haskell Platform was released today, with the new ghc git-annex's
master branch needs, so cabal should be usable again on OSX.
2012-06-03 15:12:31 -04:00
Joey Hess
c74f39843b Merge branch 'master' of ssh://git-annex.branchable.com
Conflicts:
	doc/tips/using_Amazon_S3.mdwn
2012-06-03 14:33:35 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
0064fc0beb Added a comment 2012-06-02 12:06:38 +00:00
http://joeyh.name/
f74c287e7e Added a comment 2012-06-01 17:24:29 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnHrjHxJAm39x8DR4bnbazQO6H0nMNuY9c
be45ac2fa0 Added a comment: sha256 2012-06-01 16:13:06 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnHrjHxJAm39x8DR4bnbazQO6H0nMNuY9c
ca755617d6 removed 2012-06-01 16:10:17 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnHrjHxJAm39x8DR4bnbazQO6H0nMNuY9c
3812e67a05 Added a comment: sha256 ? 2012-06-01 16:05:06 +00:00
Joey Hess
665c0fbdaa check at configure time for sha commands in Mac OSX location 2012-05-31 23:33:07 -04:00
Joey Hess
2183fd2abd Require that the SHA256 backend can be used when building, since it's the default. 2012-05-31 23:15:40 -04:00
Joey Hess
f5de183c71 sha256sum not so optional 2012-05-31 21:51:42 -04:00
Joey Hess
1f951de014 add a nice one 2012-05-31 21:31:25 -04:00
Joey Hess
6fd83851c1 Fix display of warning message when encountering a file that uses an unsupported backend. 2012-05-31 21:03:24 -04:00
Joey Hess
d4a95faeb2 Merge branch 'master' of ssh://git-annex.branchable.com 2012-05-31 19:50:46 -04:00
Joey Hess
3a10095d40 import: New subcommand, pulls files from a directory outside the annex and adds them
Use case for this was developed somewhere on the Transiberian Railroad.
2012-05-31 19:47:18 -04:00
Joey Hess
3b09281b44 add dirContentsRecursive 2012-05-31 19:25:33 -04:00
josh
c47b1ecda0 Discussion of NTFS symlinks, junction points, and reparse points. 2012-05-31 20:11:43 +00:00
josh
233d402075 Fix typo. 2012-05-31 20:03:02 +00:00
josh
263ee1d067 Add explanation of how git on Windows handles symlinks. 2012-05-31 20:02:48 +00:00
Joey Hess
2941d30bda update 2012-05-31 15:48:26 -04:00
Joey Hess
8a0a07ab10 Merge branch 'master' of ssh://git-annex.branchable.com 2012-05-31 15:30:30 -04:00
Joey Hess
6ea9a88ede update 2012-05-31 15:28:04 -04:00
Joey Hess
595d13020b updates 2012-05-31 15:25:26 -04:00
http://joeyh.name/
cbace05372 removed 2012-05-31 17:01:51 +00:00
http://joeyh.name/
9c72d42cf4 Added a comment 2012-05-31 17:01:37 +00:00
http://joeyh.name/
4f3b83d330 Added a comment 2012-05-31 17:00:59 +00:00
http://dlaxalde.myopenid.com/
8c75989338 Added a comment 2012-05-31 14:36:33 +00:00
Joey Hess
29b43cfa39 pairing 2012-05-30 20:50:53 -04:00
Joey Hess
7c962e76b4 Merge remote-tracking branch 'origin/master' 2012-05-30 17:06:48 -04:00
Joey Hess
65977a5584 lock: Reset unlocked file to index, rather than to branch head.
Resetting an unlocked file to the branch head failed if it had just been
added, not committed, and unlocked, since the branch didbn't have it.

The code was concerned about dropping any changes that might be staged in the
index, but I cannot see why.
2012-05-30 17:01:22 -04:00
http://joeyh.name/
bdb3c57393 Added a comment 2012-05-30 00:54:38 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlBSuP2uCSUr5ONRVoyL7jg0ZhBc5us_w0
1209972509 smudge broken link 2012-05-30 00:51:29 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnoUOqs_lbuWyZBqyU6unHgUduJwDDgiKY
2a61c5f286 Added a comment 2012-05-30 00:40:48 +00:00
Joey Hess
c5412ca7fe fix 2012-05-29 20:27:52 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnoUOqs_lbuWyZBqyU6unHgUduJwDDgiKY
2150b87906 2012-05-30 00:27:23 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnoUOqs_lbuWyZBqyU6unHgUduJwDDgiKY
66d885aabc Added a comment 2012-05-30 00:26:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnoUOqs_lbuWyZBqyU6unHgUduJwDDgiKY
8cca7616ae 2012-05-30 00:25:22 +00:00
Joey Hess
96f00bafd0 Merge branch 'master' of ssh://git-annex.branchable.com 2012-05-29 19:21:07 -04:00
Joey Hess
0fcbf22ed6 updates 2012-05-29 19:17:38 -04:00