mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
4186 commits 13 branches 445 tags 110 MiB
Commit graph

4186 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joey Hess
e0a65247ae Merge branch 'master' into assistant 2012-06-26 17:23:20 -04:00
Joey Hess
7e62e57f8c Avoid ugly failure mode when moving content from a local repository that is not available. 
Prelude.undefined error message was introduced by
bb4f31a0ee.

It seems best to filter out local repositories that cannot be accessed
from the list of remotes, rather than keeping them in and making every
thing that uses the list have to deal with remotes that may have an unknown
location.

Besides fixing the error message, this also makes unavailable local
remotes' names not be shown in various messages, including in git annex
status output.

Also, move --to an unavailable local repository now avoids some ugly
errors like "changeWorkingDirectory: does not exist".
 2012-06-26 17:22:44 -04:00
Joey Hess
a7b8c807d9 new bug I noticed 2012-06-26 12:37:04 -04:00
Joey Hess
f2bce89055 better data type for push records 
Not yet plumbed thru
 2012-06-26 12:36:42 -04:00
Joey Hess
75e8690cca Merge branch 'master' into assistant 
Conflicts:
	GitAnnex.hs
 2012-06-26 09:16:08 -04:00
Joey Hess
41fcb3d852 Version build dependency on STM, and allow building without it, which disables the watch command. 2012-06-26 09:15:47 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmURXBzaYE1gmVc-X9eLAyDat_6rHPl670
6168795c1a 2012-06-26 08:32:16 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmURXBzaYE1gmVc-X9eLAyDat_6rHPl670
f72dd3e7e5 2012-06-26 08:31:48 +00:00
Joey Hess
336cee671e blog for the day 2012-06-25 20:40:58 -04:00
Joey Hess
17a8f60710 Merge branch 'master' of ssh://git-annex.branchable.com 2012-06-25 20:17:54 -04:00
Joey Hess
05c4dfb941 fixup merges now done when needed 2012-06-25 20:16:30 -04:00
Joey Hess
14015036bc Merge branch 'master' into assistant 2012-06-25 16:44:37 -04:00
Joey Hess
5cfe91f06d add a push retry thread 2012-06-25 16:38:12 -04:00
Joey Hess
0b146f9ecc reorg threads 2012-06-25 16:10:24 -04:00
http://joeyh.name/
e3163bf416 Added a comment 2012-06-25 15:45:18 +00:00
http://joeyh.name/
61091915f6 Added a comment 2012-06-25 15:42:48 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
7e8a6e76b1 2012-06-25 15:38:57 +00:00
http://joeyh.name/
07c15d9a17 Added a comment 2012-06-25 15:38:44 +00:00
Joey Hess
cede7bdcde cabal: Only try to use inotify on Linux. 2012-06-25 11:38:42 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
0b04ff6431 2012-06-25 15:32:59 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
2e92f95edc 2012-06-25 15:30:00 +00:00
http://joeyh.name/
4884f18922 Added a comment 2012-06-25 15:29:30 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
fb415526e9 2012-06-25 13:37:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkwR9uOA38yi5kEUvcEWNtRiZwpxXskayE
fa5c88b8f1 Added a comment: For the moment 2012-06-25 02:51:11 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkwR9uOA38yi5kEUvcEWNtRiZwpxXskayE
7c754c8f66 Added a comment: Installation not working on OS X 10.6.8 2012-06-25 02:21:40 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkjvjLHW9Omza7x1VEzIFQ8Z5honhRB90I
4f04745c6b Added a comment: The fact that the keys changed causes merge conflicts 2012-06-25 00:29:02 +00:00
Joey Hess
38b3d8da1b typo 2012-06-24 17:51:08 -04:00
Joey Hess
fbc16360d5 add news item for git-annex 3.20120624 2012-06-24 12:51:36 -04:00
Joey Hess
a0952dd0f9 releasing version 3.20120624 2012-06-24 12:51:18 -04:00
http://joeyh.name/
d233537451 Added a comment 2012-06-23 14:30:22 +00:00
Joey Hess
19eee6a1df noninteractive merge 2012-06-23 10:29:46 -04:00
Joey Hess
d88ee75a2d Merge branch 'master' into assistant 2012-06-23 10:27:12 -04:00
Joey Hess
325053e8de fixed 2012-06-23 10:27:04 -04:00
Joey Hess
af5e6156ba Merge branch 'master' of ssh://git-annex.branchable.com 2012-06-23 10:23:53 -04:00
Joey Hess
c79e3b67e9 sync: Avoid recent git's interactive merge. 2012-06-23 10:22:56 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
c6daf4e6c2 2012-06-23 07:24:23 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
f0617ece7c 2012-06-23 07:02:16 +00:00
Joey Hess
d707f2dce5 cleanup 2012-06-23 01:35:40 -04:00
Joey Hess
a71e7161fc golfing 2012-06-23 01:33:10 -04:00
Joey Hess
38df4ed44f license 2012-06-23 01:20:40 -04:00
Joey Hess
3118eeb63f update 2012-06-23 01:19:33 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlc1og3PqIGudOMkFNrCCNg66vB7s-jLpc
3606e94336 Added a comment: how is this different than rsync? 2012-06-22 22:10:22 +00:00
Joey Hess
264dd38c65 blog for the day 2012-06-22 17:17:41 -04:00
Joey Hess
e699ce1841 added a merger thread 
Wow! I can create a file in repo a, and it instantly* shows up in repo b!

* under 1 second anyway
 2012-06-22 17:01:08 -04:00
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
153942cc6e update 2012-06-22 15:47:02 -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