aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-04-15
|\
| * Added a commentGravatar divB2014-04-15
| |
* | found a way to make uninit always fastGravatar Joey Hess2014-04-15
|/ | | | | | | | | | | | | To do so, I slightly changed the behavior of unannex. Now in fast mode, it only makes a hard link when the annexed file's link count is 1. This avoids unannexing 2 files with the same content in fast mode from hard linking them together. (One will end up hard linked to the annex, which the docs warn about.) With that change, uninit can simply always run unannex in fast mode. Since .git/annex/objects is being blown away anyway, there's no worry in this case about a hard link pointing into it causing an annexed object to be modified.
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-04-15
|\
* | document uninit --fast and also why it's not the defaultGravatar Joey Hess2014-04-15
| |
| * Added a commentGravatar Xyem2014-04-15
| |
| * Added a comment: great job on that plugin!Gravatar https://id.koumbit.net/anarcat2014-04-15
| |
| * (no commit message)Gravatar divB2014-04-15
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-04-14
|\
* | devblogGravatar Joey Hess2014-04-14
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawlqL3QbH6hrzf4XT-OW5IcMj6zSrMWl2dg2014-04-14
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmvzzyDA8uXFz8yokeCrepbh8PwWe_WrjE2014-04-14
|/
* it's landed! merge remotecontrol into masterGravatar Joey Hess2014-04-14
|
* fix RESUMEGravatar Joey Hess2014-04-14
|
* improve descGravatar Joey Hess2014-04-14
|
* Merge branch 'master' into remotecontrolGravatar Joey Hess2014-04-14
|\ | | | | | | | | Conflicts: doc/devblog/day_152__more_ssh_connection_caching.mdwn
| * adjust to not use cpp in modules used by configureGravatar Joey Hess2014-04-14
| |
| * add missing Network.URI Ord instance for Debian stableGravatar Joey Hess2014-04-14
| |
| * Added a commentGravatar https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d82014-04-14
| |
| * Added a commentGravatar https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d82014-04-14
| |
| * Added a commentGravatar https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d82014-04-14
| |
| * its "approxlackingcopies", not "roughlylackingcopies"Gravatar https://www.google.com/accounts/o8/id?id=AItOawmYO_hgwgX9WHFWFwEN7lO5gaWs7B2EsPs2014-04-14
| |
* | don't try to use ssh connection caching for non-ssh urlsGravatar Joey Hess2014-04-13
| |
| * fix typoGravatar https://www.google.com/accounts/o8/id?id=AItOawlLxKVJdtIlFyco0extRJZLAKoD7pBCL2c2014-04-13
| |
| * Added a comment: auto conflict resolution master branchGravatar https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc2014-04-13
| |
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-04-13
| |\
| * | Avoid depending on shakespeare except for when building the webapp.Gravatar Joey Hess2014-04-13
| | |
| | * (no commit message)Gravatar divB2014-04-13
| | |
| | * Fixed Shebang in script and typo.Gravatar http://ypid.wordpress.com/2014-04-13
| | |
| | * make links to internal pages instead of only github to allow cross-finding ↵Gravatar https://id.koumbit.net/anarcat2014-04-13
| | | | | | | | | | | | them all
| | * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawlqL3QbH6hrzf4XT-OW5IcMj6zSrMWl2dg2014-04-13
| |/
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-04-12
| |\
| * | day's sponsorGravatar Joey Hess2014-04-12
| | |
| * | devblogGravatar Joey Hess2014-04-12
| | |
* | | day's sponsorGravatar Joey Hess2014-04-12
| | |
* | | devblogGravatar Joey Hess2014-04-12
| | |
* | | ssh transport seems ready, needs testingGravatar Joey Hess2014-04-12
| | |
* | | detect wicd network disconnection eventsGravatar Joey Hess2014-04-12
| | |
* | | NetWatcher: detect when networkmanager has lost network connectionGravatar Joey Hess2014-04-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | remotedaemon: When network connection is lost, close all cached ssh connections.Gravatar Joey Hess2014-04-12
| | | | | | | | | | | | This commit was sponsored by Cedric Staub.
* | | sync, assistant, remotedaemon: Use ssh connection caching for git pushes and ↵Gravatar Joey Hess2014-04-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * poll vote (DCIM directory (photos and videos only))Gravatar 2601:0:b100:7c0::12014-04-12
| |/
* | Merge branch 'master' into remotecontrolGravatar Joey Hess2014-04-12
|\| | | | | | | | | Conflicts: debian/changelog
| * add new testGravatar Joey Hess2014-04-12
| |
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-04-12
| |\
| * | wrote test case; found bugs in date math; fixed and simplified using ↵Gravatar Joey Hess2014-04-12
| | | | | | | | | | | | Data.Time.Calendar
| * | Improve handling on monthly/yearly scheduling.Gravatar Joey Hess2014-04-12
| | | | | | | | | | | | Avoid back-to-back runs.
| | * Add doc/bugs/Drop_--from_always_trusts_local_repository.mdwnGravatar David Triendl2014-04-12
| | |
| | * removedGravatar https://openid.stackexchange.com/user/e65e6d0e-58ba-41de-84cc-1f2ba54cf5742014-04-12
| |/
| * Improve handling on monthly/yearly scheduling.Gravatar Joey Hess2014-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.