Commit graph

18942 commits

Author SHA1 Message Date
Joey Hess
2ff9ba9f74
add missing Network.URI Ord instance for Debian stable 2014-04-14 13:25:49 -04:00
https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8
c26bc0423e Added a comment 2014-04-14 15:35:18 +00:00
https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8
f6592e0189 Added a comment 2014-04-14 15:32:38 +00:00
https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8
68270b5b39 Added a comment 2014-04-14 15:27:50 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmYO_hgwgX9WHFWFwEN7lO5gaWs7B2EsPs
7219ecf0c8 its "approxlackingcopies", not "roughlylackingcopies" 2014-04-14 06:22:41 +00:00
Joey Hess
a0ef99b3f9
don't try to use ssh connection caching for non-ssh urls 2014-04-13 21:39:04 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlLxKVJdtIlFyco0extRJZLAKoD7pBCL2c
31753c1c53 fix typo 2014-04-13 23:10:39 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc
9305f618a0 Added a comment: auto conflict resolution master branch 2014-04-13 17:48:20 +00:00
Joey Hess
2f2a4fd3c5 Merge branch 'master' of ssh://git-annex.branchable.com 2014-04-13 13:14:23 -04:00
Joey Hess
ab09a50f3a Avoid depending on shakespeare except for when building the webapp. 2014-04-13 13:12:14 -04:00
divB
06acc0cda7 2014-04-13 16:44:23 +00:00
http://ypid.wordpress.com/
df457d2d13 Fixed Shebang in script and typo. 2014-04-13 16:36:55 +00:00
https://id.koumbit.net/anarcat
5d25b94db1 make links to internal pages instead of only github to allow cross-finding them all 2014-04-13 14:33:13 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlqL3QbH6hrzf4XT-OW5IcMj6zSrMWl2dg
9ca4d6ae0c 2014-04-13 01:23:55 +00:00
Joey Hess
9ab9812b3c Merge branch 'master' of ssh://git-annex.branchable.com 2014-04-12 18:45:09 -04:00
Joey Hess
8c447b5997 day's sponsor 2014-04-12 18:44:41 -04:00
Joey Hess
045a3cb829 devblog 2014-04-12 18:44:32 -04:00
Joey Hess
1040ef5474
day's sponsor 2014-04-12 18:43:16 -04:00
Joey Hess
caff214c5b
devblog 2014-04-12 18:40:42 -04:00
Joey Hess
da253358b7 ssh transport seems ready, needs testing 2014-04-12 18:39:50 -04:00
Joey Hess
ff192ace2f detect wicd network disconnection events 2014-04-12 18:36:48 -04:00
Joey Hess
bb44df206d NetWatcher: detect when networkmanager has lost network connection
This is a better approach to finding both when NM has lost a network
connection, and when a new network connection is made by NM.

Tested with network-manager 0.9.8.8.

This commit was sponsored by Cedric Staub.
2014-04-12 17:58:19 -04:00
Joey Hess
a33b30d0c4 remotedaemon: When network connection is lost, close all cached ssh connections.
This commit was sponsored by Cedric Staub.
2014-04-12 16:32:59 -04:00
Joey Hess
15917ec1a8 sync, assistant, remotedaemon: Use ssh connection caching for git pushes and pulls.
For sync, saves 1 ssh connection per remote. For remotedaemon, the same
ssh connection that is already open to run git-annex-shell notifychanges
is reused to pull from the remote.

Only potential problem is that this also enables connection caching
when the assistant syncs with a ssh remote. Including the sync it does
when a network connection has just come up. In that case, cached ssh
connections are likely to be stale, and so using them would hang.
Until I'm sure such problems have been dealt with, this commit needs to
stay on the remotecontrol branch, and not be merged to master.

This commit was sponsored by Alexandre Dupas.
2014-04-12 15:59:34 -04:00
2601:0:b100:7c0::1
1b3a48f992 poll vote (DCIM directory (photos and videos only)) 2014-04-12 19:38:11 +00:00
Joey Hess
96ce2812e0 Merge branch 'master' into remotecontrol
Conflicts:
	debian/changelog
2014-04-12 14:20:41 -04:00
Joey Hess
8c15face0e add new test 2014-04-12 14:19:56 -04:00
Joey Hess
09fa46f94f Merge branch 'master' of ssh://git-annex.branchable.com 2014-04-12 13:31:45 -04:00
Joey Hess
9fff243ff2
wrote test case; found bugs in date math; fixed and simplified using Data.Time.Calendar 2014-04-12 13:29:35 -04:00
Joey Hess
b815988d16
Improve handling on monthly/yearly scheduling.
Avoid back-to-back runs.
2014-04-12 12:58:32 -04:00
David Triendl
ea5166ea96 Add doc/bugs/Drop_--from_always_trusts_local_repository.mdwn 2014-04-12 06:46:08 +02:00
https://openid.stackexchange.com/user/e65e6d0e-58ba-41de-84cc-1f2ba54cf574
0f609b1f7f removed 2014-04-12 03:51:56 +00:00
Joey Hess
d955cfe78a Improve handling on monthly/yearly scheduling.
Code was still buggy, it turns out (though the recursion checker caught
it). In the case of (Schedule (Monthly Nothing) AnyTime), where the last
run was on yyyy-12-31, it looped forever.

Also, the handling of (Schedule (Yearly Nothing) AnyTime) was wacky where
the last run was yyyy-12-31. It would suggest a window starting on the 3rd
for the next run (because 31 mod 28 is 3).

I think that originally I was wanted to avoid running on 01-01 if it had
just run on 12-31. But the code didn't accomplish this, and it's not
necessary anyway. This is supposed to calculate the next window meeting the
schedule, and for (Schedule (Monthly Nothing), the window starts at 01-01
and runs through 01-31. If that causes two back-to-back runs, well the next
one will not be until 02-01 at the earliest.

Also, back-to-back runs can be avoided, if desired, by using Divisible 2.
2014-04-11 21:42:43 -04:00
Joey Hess
740788ccb6 Merge branch 'master' of ssh://git-annex.branchable.com 2014-04-11 19:02:28 -04:00
Joey Hess
0ad2314e89
devblog 2014-04-11 19:01:01 -04:00
Joey Hess
8d45a82988 use ustar format and omit filnames with colons. new hackage requirements
The tarball on hackage will no longer correspond to the git tag. Oh well.
2014-04-11 18:45:46 -04:00
Joey Hess
13902f50d0 Merge branch 'master' of ssh://git-annex.branchable.com 2014-04-11 18:31:35 -04:00
Joey Hess
da795e0843 add news item for git-annex 5.20140412 2014-04-11 18:29:48 -04:00
Joey Hess
2503f433dc prep release 2014-04-11 18:10:10 -04:00
Joey Hess
e26dead493 guard against any remaining infinite recursion bugs; throw error if no candidate cn be found in next hundred years
Note that the exception thrown is not visible in the webapp currently
because it crashes one of Cronner's 2 worker threads, which is never
checked.
2014-04-11 18:08:46 -04:00
Joey Hess
5592fc16d3 Record git-annex (5.20140412) in archive suite sid 2014-04-11 17:14:38 -04:00
Joey Hess
2a82adc417 git-annex (5.20140412) unstable; urgency=high
* Last release didn't quite fix the high cpu issue in all cases, this should.

# imported from the archive
2014-04-11 17:14:38 -04:00
Joey Hess
9e16171c7f Last release didn't quite fix the high cpu issue in all cases, this should.
This is supposed to look for a day past the last day it ran, not a month
past.

Seems to work, at least in anarcat's test case.
2014-04-11 17:14:19 -04:00
Joey Hess
7da3e2b908 Merge branch 'master' of ssh://git-annex.branchable.com 2014-04-11 15:58:33 -04:00
Joey Hess
5006ade11d add news item for git-annex 5.20140411 2014-04-11 15:45:44 -04:00
Joey Hess
9d8e15bd37 Merge branch 'master' of ssh://git-annex.branchable.com 2014-04-11 15:31:02 -04:00
Joey Hess
91fa570aad more prep 2014-04-11 15:10:19 -04:00
Joey Hess
bdb81af880
prep release 2014-04-11 15:01:10 -04:00
Joey Hess
e0ca99b480
rename confusingly named "day" 2014-04-11 14:38:23 -04:00
Joey Hess
2aab47ea3e Merge branch 'master' of ssh://git-annex.branchable.com 2014-04-11 14:35:27 -04:00