Joey Hess
162565d928
info: Allow use in a repository where annex.uuid is not set.
2014-04-15 19:42:49 -04:00
Joey Hess
e8832f3371
Merge branch 'master' of ssh://git-annex.branchable.com
2014-04-15 14:32:11 -04:00
divB
c400a2ed50
Added a comment
2014-04-15 18:23:13 +00:00
Joey Hess
03ce5cd8d2
found a way to make uninit always fast
...
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.
2014-04-15 14:23:08 -04:00
Joey Hess
97210abe71
Merge branch 'master' of ssh://git-annex.branchable.com
2014-04-15 14:13:15 -04:00
Joey Hess
49005d5c28
document uninit --fast and also why it's not the default
2014-04-15 14:12:42 -04:00
Xyem
8c5d8c768c
Added a comment
2014-04-15 14:25:06 +00:00
https://id.koumbit.net/anarcat
9c8c08cc10
Added a comment: great job on that plugin!
2014-04-15 04:47:18 +00:00
divB
746739afda
2014-04-15 01:35:28 +00:00
Joey Hess
2d19a8e62f
Merge branch 'master' of ssh://git-annex.branchable.com
2014-04-14 21:26:44 -04:00
Joey Hess
124cf9e2ae
devblog
2014-04-14 21:26:22 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlqL3QbH6hrzf4XT-OW5IcMj6zSrMWl2dg
8b30839a25
Added a comment
2014-04-14 22:45:23 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmvzzyDA8uXFz8yokeCrepbh8PwWe_WrjE
b12202f853
2014-04-14 21:52:38 +00:00
Joey Hess
b70cd37a6f
it's landed! merge remotecontrol into master
2014-04-14 14:22:44 -04:00
Joey Hess
55102467ac
fix RESUME
2014-04-14 14:20:10 -04:00
Joey Hess
b82582caf1
improve desc
2014-04-14 14:14:54 -04:00
Joey Hess
138d25518d
Merge branch 'master' into remotecontrol
...
Conflicts:
doc/devblog/day_152__more_ssh_connection_caching.mdwn
2014-04-14 13:38:35 -04:00
Joey Hess
e53a85743e
adjust to not use cpp in modules used by configure
2014-04-14 13:37:12 -04:00
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
