Commit graph

19015 commits

Author SHA1 Message Date
https://www.google.com/accounts/o8/id?id=AItOawl64jV2rE8GMogJ6XuqESSkz78RVBgVdGw
ae070c310b Added a comment: I can't add special remotes 2014-04-10 07:50:40 +00:00
Joey Hess
9417526a8f Merge branch 'master' of ssh://git-annex.branchable.com 2014-04-09 17:32:23 -04:00
Joey Hess
4cca9cef0c
update 2014-04-09 16:43:43 -04:00
Joey Hess
83654f031d Merge branch 'master' of ssh://git-annex.branchable.com 2014-04-09 16:34:19 -04:00
Joey Hess
4d19487a0b
devblog 2014-04-09 16:33:10 -04:00
Joey Hess
db38678595 webapp: Rework xmpp nudge to prompt for either xmpp or a ssh remote be set up.
This commit was sponsored by Nathan Howell.
2014-04-09 16:27:24 -04:00
Joey Hess
14349fb752 also show signal icon next to connected xmpp remotes 2014-04-09 15:51:00 -04:00
Joey Hess
33b8cff433 webapp: Show a network signal icon next to ssh remotes that it's currently connected with. 2014-04-09 15:26:41 -04:00
Joey Hess
356eec08a6
typo 2014-04-09 14:22:59 -04:00
Joey Hess
fb73792f72 make git-remote-daemon ssh transport robust
* Remote system might be available, and connection get lost. Should
  reconnect, but needs to avoid bad behavior (ie, constant reconnect
  attempts.) Use exponential backoff.

* Detect if old system had a too old git-annex-shell, and show the user
  a nice message in the webapp. Required parsing error messages, so perhaps
  this code shoudl be removed once enough time has passed..

* Switch the protocol to using remote URI's, rather than remote names.
  Names change. Also avoids issues with serialization of names containing
  whitespace.

This is nearly ready for merge into master now. I'd still like to make the ssh
transport smarter about reusing ssh connection caching during git pull.

This commit was sponsored by Jim Paris.
2014-04-09 14:14:55 -04:00
Joey Hess
38862bf65d merge from propellor 2014-04-09 01:15:24 -04:00
Joey Hess
bd21fe0b14 Merge branch 'master' of ssh://git-annex.branchable.com 2014-04-08 23:33:00 -04:00
EvanDeaubl
714129a533 Added a comment 2014-04-09 03:28:25 +00:00
Joey Hess
b907ca0525 Merge branch 'master' of ssh://git-annex.branchable.com 2014-04-08 19:32:00 -04:00
Joey Hess
e2736a3f5e
add day's sponsor 2014-04-08 19:00:21 -04:00
Joey Hess
1f095f7935 Merge branch 'master' of ssh://git-annex.branchable.com 2014-04-08 18:53:17 -04:00
Joey Hess
eea2b36062
how to send patches 2014-04-08 18:52:35 -04:00
augusto
3ebd994bd5 Added a comment 2014-04-08 22:46:18 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl-xMSPoRHcT5d2nAc1K8pWVi-AexKkYik
81fc642052 2014-04-08 22:45:28 +00:00
https://id.koumbit.net/anarcat
164a5e6128 link to the haskell page, which has many teaching resources about it 2014-04-08 22:44:28 +00:00
Joey Hess
113b0cd46f Merge branch 'master' of ssh://git-annex.branchable.com 2014-04-08 18:30:40 -04:00
Joey Hess
1f6cca2879
devblog 2014-04-08 18:27:08 -04:00
Joey Hess
1c1596c2db Merge branch 'master' of ssh://git-annex.branchable.com 2014-04-08 16:32:30 -04:00
Joey Hess
0408ad35a5 Merge branch 'fix/build-without-Webapp-Quvi' of https://github.com/frasertweedale/git-annex 2014-04-08 16:19:34 -04:00
Joey Hess
913ab7ce87 Merge branch 'gitignore-cabal-sandbox' of https://github.com/frasertweedale/git-annex 2014-04-08 16:18:16 -04:00
Joey Hess
f67d5abc41 support gcrypt remotes (assuming them to be over ssh transport) 2014-04-08 16:16:46 -04:00
Joey Hess
549a64b58b Merge branch 'master' of ssh://git-annex.branchable.com 2014-04-08 15:38:16 -04:00
Joey Hess
e4ea97427b add contribute page, mention haskell on front page 2014-04-08 15:37:22 -04:00
Joey Hess
ccfceb887c update 2014-04-08 15:30:32 -04:00
Joey Hess
960394a947 discard old transports on pause 2014-04-08 15:26:32 -04:00
Joey Hess
fac7bca05b assistant: Now detects immediately when other repositories push changes to
a ssh remote, and pulls.

XMPP is no longer needed in this configuration!

Requires the remote server have git-annex-shell with notifychanges support.

(untested)

This commit was sponsored by Geog Wechslberger.
2014-04-08 15:23:50 -04:00
Joey Hess
cbcb7f50d8 remotedaemon: avoid extraneous stdout output 2014-04-08 14:02:25 -04:00
Joey Hess
9a4a3bfb43 fix STOP 2014-04-08 13:51:49 -04:00
Joey Hess
fa0cf81b26 cleaned up AnnexState handling in transports 2014-04-08 13:42:57 -04:00
Joey Hess
b3b07ab330 clarify 2014-04-08 12:09:24 -04:00
Fraser Tweedale
fbb30eac13 .gitignore: add cabal sandbox dir and config files 2014-04-08 23:37:04 +10:00
Fraser Tweedale
3a7068ffe6 fix build failure with flags -Webapp -Quvi 2014-04-08 19:49:43 +10:00
Joey Hess
9eedecd9e1 Merge branch 'master' of ssh://git-annex.branchable.com 2014-04-08 00:32:05 -04:00
https://openid.stackexchange.com/user/e65e6d0e-58ba-41de-84cc-1f2ba54cf574
b37d53856b Added a comment: Encrypt with pub or sub? 2014-04-08 03:56:37 +00:00
https://openid.stackexchange.com/user/e65e6d0e-58ba-41de-84cc-1f2ba54cf574
5b6e93ed74 removed 2014-04-08 03:50:55 +00:00
https://openid.stackexchange.com/user/e65e6d0e-58ba-41de-84cc-1f2ba54cf574
4e020eb780 Added a comment: Encrypt with pub or sub? 2014-04-08 03:47:26 +00:00
Joey Hess
24a126154f Merge branch 'master' of ssh://git-annex.branchable.com 2014-04-07 19:32:56 -04:00
Joey Hess
bea3d58a4e Merge branch 'master' of ssh://git-annex.branchable.com 2014-04-07 19:15:22 -04:00
http://johan.kiviniemi.name/
d1642dcd6a Added a comment 2014-04-07 22:55:13 +00:00
Joey Hess
a388bebf7b devblog 2014-04-07 18:54:57 -04:00
http://johan.kiviniemi.name/
1b5c6bac73 Added a comment 2014-04-07 22:48:19 +00:00
http://johan.kiviniemi.name/
c888c5f46d Added a comment 2014-04-07 22:44:33 +00:00
Joey Hess
a1817e9760 Merge branch 'master' of ssh://git-annex.branchable.com 2014-04-07 18:31:16 -04:00
http://joeyh.name/
c789119a90 Added a comment 2014-04-07 22:17:16 +00:00
http://joeyh.name/
030e67a77b removed 2014-04-07 22:15:25 +00:00