Commit graph

9451 commits

Author SHA1 Message Date
Joey Hess
e8553ad62f Merge branch 'master' of ssh://git-annex.branchable.com 2013-03-17 17:06:18 -04:00
Joey Hess
25d0d7d15c reopen 2013-03-17 17:06:02 -04:00
Joey Hess
35a0ae334c assistant: Fix OSX bug that prevented committing changed files to a repository when in indirect mode. 2013-03-17 17:01:43 -04:00
Joey Hess
1760a2e98c make tags in bg 2013-03-17 16:27:34 -04:00
http://joeyh.name/
7e9c0208db Added a comment 2013-03-17 20:03:48 +00:00
Joey Hess
1473ad6ea4 Merge branch 'master' of ssh://git-annex.branchable.com 2013-03-17 15:59:28 -04:00
Joey Hess
746ffa773a assistant: Avoid syncing with annex-ignored remotes when reconnecting to the network, or connecting a drive. 2013-03-17 15:59:03 -04:00
Joey Hess
69cc00c5fc remove debug print 2013-03-17 15:44:14 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmRFKwny4rArBaz-36xTcsJYqKIgdDaw5Q
ed275d01ef 2013-03-17 19:16:17 +00:00
http://joeyh.name/
bc22f247e4 Added a comment 2013-03-17 19:05:28 +00:00
Joey Hess
3eb2d971ee tag 2013-03-17 15:04:50 -04:00
http://joeyh.name/
5c86d42bd6 Added a comment 2013-03-17 18:59:40 +00:00
http://joeyh.name/
257c0d0838 Added a comment 2013-03-17 18:53:27 +00:00
Joey Hess
5040c21fd7 add a startup notice in the log, with version number 2013-03-17 14:45:24 -04:00
annexuser
97b76d673e 2013-03-17 17:39:33 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnxp2XU8gIribhhGhGuYtU6eMMwHv5gUGI
442097cba6 Added a comment: Google Talk silently drops non-Google invites (at least) 2013-03-17 13:44:19 +00:00
annexuser
707f36e92d 2013-03-17 03:23:26 +00:00
annexuser
e65016e9bd 2013-03-17 01:55:43 +00:00
annexuser
328a124977 Added a comment 2013-03-17 01:29:49 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnR7hb8IaKB3IKZptRukje0yahmhfLOO98
9378da82fc Added a comment 2013-03-17 00:30:26 +00:00
Joey Hess
b55602ecf5 blog for the day 2013-03-16 19:26:52 -04:00
Joey Hess
1b59a17bfa Merge branch 'master' of ssh://git-annex.branchable.com 2013-03-16 19:20:49 -04:00
Joey Hess
0400c5f596 fix redirect from XMPP prompt to pairing pages 2013-03-16 19:19:58 -04:00
Joey Hess
4c0642a70d stop abusing UltDest here, just get Referer header by hand 2013-03-16 19:00:11 -04:00
Joey Hess
140774a8c8 webapp: Switch all forms to POST. 2013-03-16 18:48:26 -04:00
85.16.227.39
d8fae4b9ff poll vote (Needs more focus on the UI.) 2013-03-16 22:22:04 +00:00
85.16.227.39
aed2fc55a6 poll vote (Using only git-annex webapp to config does not seem to work: Create walkthough?) 2013-03-16 22:21:40 +00:00
Joey Hess
26374f40a9 Merge branch 'master' of ssh://git-annex.branchable.com 2013-03-16 17:58:21 -04:00
http://joeyh.name/
d72fe7e0f6 Added a comment 2013-03-16 21:56:37 +00:00
Joey Hess
17c9ff576d Fix several bugs caused by a bad Ord instance for Remote.
A long time ago I made Remote be an instance of the Ord typeclass, with an
implementation that compared the costs of Remotes. That seemed like a good
idea at the time, as it saved typing.. But at the time I was still making
custom Read and Show instances too. I've since learned that this is *not* a
good idea, and neither is making custom Ord instances, without deep thought
about the possible sets of values in a type. Haskell typeclasses are not a
toy.

This Ord instance came around and bit me when I put Remotes into a Set,
because now remotes with the same cost appeared to be in the Set even if
they were not. Also affected putting Remotes into a Map.

Rarely does a bug go this deep. I've fixed it comprehensively, first
removing the Ord instance entirely, and fixing the places that wanted to
order remotes by cost to do it explicitly. Then adding back an Ord instance
that is much more sane. Also by checking the rest of the Ord instances in
the code base (which were all ok).

While doing that, I found lots of places that kept remotes in Maps and
Sets. All of it was probably subtly broken in one way or another before
this fix, but it would be hard to say exactly how the bugs would
manifest.
2013-03-16 17:43:42 -04:00
modules
2fed1bc3f8 2013-03-16 21:43:22 +00:00
Joey Hess
b3d3ece2ab remove old debug print 2013-03-16 17:04:48 -04:00
http://joeyh.name/
3e720f2cbe Added a comment 2013-03-16 20:48:42 +00:00
http://joeyh.name/
7892debeec Added a comment 2013-03-16 20:47:05 +00:00
Joey Hess
6314be1e3c map: Combine duplicate repositories, for a nicer looking map. 2013-03-16 16:31:59 -04:00
Joey Hess
db2fe522ba xmpp: Re-enable XA flag, since disabling it did not turn out to help with the problems Google Talk has with not always sending presence messages to clients. 2013-03-16 16:00:37 -04:00
Joey Hess
55f20ae099 xmpp: send a presence query when there's an important message to send
This may work around google talk's horrible presence handling, in which
clients often don't learn about other clients, at least when using the same
account. This way, every time we start a git push over xmpp, we'll waste
bandwidth asking clients to please try again to identify themselves.
2013-03-16 15:36:47 -04:00
Joey Hess
e3354cf19c xmpp: --debug now enables a sanitized dump of the XMPP protocol
So I can debug these damn google talk presence issues.
2013-03-16 15:29:51 -04:00
Joey Hess
7cfa1d5363 typo 2013-03-16 14:50:30 -04:00
Joey Hess
996e899acc webapp: Encourage user to install git-annex on a server when adding a ssh server, rather than just funneling them through to rsync. 2013-03-16 12:58:59 -04:00
Joey Hess
ab0c6db755 Merge remote-tracking branch 'origin/master'
Conflicts:
	doc/bugs/WEBDAV_443.mdwn
2013-03-16 12:25:02 -04:00
Joey Hess
e856bd7c6a forgot to add to sum type 2013-03-16 12:09:22 -04:00
http://joeyh.name/
12ad4d6b27 Added a comment 2013-03-16 16:04:30 +00:00
https://pradermecker.myopenid.com/
36c75f5e94 Added a comment: Thanks 2013-03-16 15:46:45 +00:00
https://pradermecker.myopenid.com/
9f247e5a4a 2013-03-16 15:44:29 +00:00
http://joeyh.name/
37e984cb04 Added a comment 2013-03-16 15:39:14 +00:00
Joey Hess
00209cce93 close 2013-03-16 11:36:49 -04:00
http://joeyh.name/
057bc6e165 Added a comment 2013-03-16 15:35:05 +00:00
Joey Hess
2bd6d97df4 Merge branch 'master' of ssh://git-annex.branchable.com 2013-03-16 11:19:15 -04:00
Joey Hess
79f10b75c1 Add incrementalbackup repository group. 2013-03-16 11:17:53 -04:00