Commit graph

10342 commits

Author SHA1 Message Date
Joey Hess
b33c90c069 Merge branch 'master' of ssh://git-annex.branchable.com 2013-04-23 18:24:21 -04:00
Joey Hess
327b465a75 blog for the day 2013-04-23 18:23:58 -04:00
Joey Hess
ca72b1ac7b assistant: when an add fails, requeue it for later
See analysis in bug report for one way this could happen.
2013-04-23 18:23:04 -04:00
http://joeyh.name/
2a2475e1b8 Added a comment 2013-04-23 22:11:32 +00:00
Joey Hess
53674cc3fd Merge branch 'master' of ssh://git-annex.branchable.com 2013-04-23 18:09:45 -04:00
Joey Hess
68f38a7ae6 show a message to tell why adding a file failed 2013-04-23 18:09:00 -04:00
http://joeyh.name/
e0f5abbf20 Added a comment 2013-04-23 21:41:32 +00:00
Joey Hess
f77be9d0d8 Merge branch 'master' of ssh://git-annex.branchable.com 2013-04-23 17:24:51 -04:00
Joey Hess
8b0dcb3136 add: avoid ugly error message when adding a deleted file in direct mode
Due to add using withFilesMaybeModified, it will get files that have been
deleted but are still in the index. So catch the IO error that results when
trying to stat such a file.
2013-04-23 17:22:56 -04:00
http://joeyh.name/
42b6db8803 Added a comment: glad I could help 2013-04-23 21:16:48 +00:00
Joey Hess
07580dc3df sync: Bug fix, avoid adding to the annex the dummy symlinks used on crippled filesystems.
The root of the problem is that toInodeCache sees a non-symlink, and so
goes on and generates a new inode cache for the dummy symlink.

Any place that toInodeCache, or sameFileStatus, or genInodeCache are called
may need to deal with this case. Although many of them are ok. For example,
prepSendAnnex calls sameInodeCache, which calls genInodeCache.. but if
the file content is not present, the InodeCache generated for its standin
file is appropriately not the same, and so it returns Nothing.

I've audited some, but have to say I'm not happy with this; it should be
handled at the type level somehow, or a toInodeCache wrapper be used that
is aware of dummy symlinks.

(The Watcher already dealt with it, via the guardSymlinkStandin function.)
2013-04-23 17:14:28 -04:00
Joey Hess
16503f5692 sync: Commit in direct mode even if no changes were staged
There may be already staged changes from a prior `git annex add`,
so always commit.

Also, suppressed the commit output, since it contains noise due to
typechanged files in direct mode.
2013-04-23 17:14:28 -04:00
http://joeyh.name/
fa9d37fab7 Added a comment 2013-04-23 20:16:26 +00:00
http://joeyh.name/
6532dab3e0 Added a comment: I am not a horse 2013-04-23 20:05:25 +00:00
http://joeyh.name/
985cfa3a95 Added a comment 2013-04-23 20:00:31 +00:00
http://joeyh.name/
105a83a46e Added a comment 2013-04-23 19:44:04 +00:00
Joey Hess
1425b30747 Merge branch 'master' of ssh://git-annex.branchable.com 2013-04-23 15:37:55 -04:00
Joey Hess
117d772a10 reopen; apparently separate bug although submitter is unclear 2013-04-23 15:37:19 -04:00
http://keverets.livejournal.com/
20c2bf294a Added a comment 2013-04-23 19:04:15 +00:00
Joey Hess
daecfd5bd7 more efficient data type for ChangeChan
Making this a tset of lists of Changes, rather than a tset of Changes
makes refilling it, in batch mode, much more efficient. Rather than needing
to add every Change it's collected one at a time, it can add them in one
fast batch operation.

It would be more efficient yet to use a Set, but that would need an Eq
instance for InodeCache.
2013-04-23 14:54:54 -04:00
Joey Hess
14e554e29b close 2013-04-23 13:59:14 -04:00
http://joeyh.name/
598ba1cf56 Added a comment 2013-04-23 17:57:10 +00:00
http://joeyh.name/
4cf3a6d797 Added a comment 2013-04-23 17:54:14 +00:00
spwhitton
6886190a52 Added a comment 2013-04-23 17:11:46 +00:00
http://joeyh.name/
51737a0c36 Added a comment 2013-04-23 16:39:08 +00:00
Joey Hess
996cf3d10b Merge branch 'master' of ssh://git-annex.branchable.com 2013-04-23 12:38:21 -04:00
Joey Hess
834ce10ced better autostart file modification
As well as just being nicer, and less code, this uses nubBy equalFilePath
to ensure that the autostart file never gets dups.

Also, removing from the file no longer needs to be a perfect string match;
it also uses equalFilePath.
2013-04-23 12:36:37 -04:00
http://joeyh.name/
9df389bbb3 Added a comment 2013-04-23 16:05:32 +00:00
Joey Hess
f3ef6fe6a7 strip newlines in programfile
Indeed, ignore lines after the first.

Use might create it with echo..
2013-04-23 11:41:52 -04:00
Joey Hess
2c42e70f6c rename module 2013-04-23 11:38:52 -04:00
tomas
7150205452 Added a comment 2013-04-23 11:50:21 +00:00
http://keverets.livejournal.com/
6ce9f67c80 2013-04-23 11:16:55 +00:00
108.170.138.61
77c2fd4b50 poll vote (/sdcard/annex) 2013-04-23 11:02:35 +00:00
hhm
68c39cbaa5 Added a comment: file transfer? 2013-04-23 10:22:51 +00:00
hhm
9c3af3c3a2 Added a comment: file transfer? 2013-04-23 10:22:43 +00:00
hhm
23c34b9b36 2013-04-23 09:38:16 +00:00
hhm
498d938fc4 2013-04-23 09:33:59 +00:00
https://www.google.com/accounts/o8/id?id=AItOawniayrgSdVLUc3c6bf93VbO-_HT4hzxmyo
1e04656b2d Added a comment 2013-04-23 08:40:14 +00:00
tomas
c7249f4eae 2013-04-23 06:58:50 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn8nmg2ti0tVOD215PNBmLKvf2S4kXkQAY
1b63b8dea3 2013-04-23 05:26:55 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn8nmg2ti0tVOD215PNBmLKvf2S4kXkQAY
1bfee63301 2013-04-23 05:26:07 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn8nmg2ti0tVOD215PNBmLKvf2S4kXkQAY
6ef2ed3ecb 2013-04-23 05:25:13 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn8nmg2ti0tVOD215PNBmLKvf2S4kXkQAY
1893206c4f 2013-04-23 05:20:57 +00:00
Joey Hess
8a2d1988d3 expose Control.Monad.join
I think I've been looking for that function for some time.
Ie, I remember wanting to collapse Just Nothing to Nothing.
2013-04-22 20:24:53 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkZktNHFhxC1kYA9KKdKpYJO4clq9WDsjE
b46681870e poll vote (/sdcard/annex) 2013-04-22 23:48:28 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkyQL8VPwrSf8LA0k8PKDWFCEKFH3O5Jds
6729dff27e Added a comment: Brvo 2013-04-22 23:33:11 +00:00
Joey Hess
2a84deb271 Merge branch 'master' of ssh://git-annex.branchable.com 2013-04-22 17:37:04 -04:00
Joey Hess
108a1ec520 blog for the day 2013-04-22 17:31:18 -04:00
http://joeyh.name/
900c9d41f1 Added a comment 2013-04-22 21:28:03 +00:00
Joey Hess
6be815a30c rmurl: New command, removes one of the recorded urls for a file. 2013-04-22 17:18:53 -04:00