mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5830 commits 13 branches 442 tags 103 MiB
Commit graph

658 commits

Author SHA1 Message Date
Joey Hess
7456e9f68c Merge branch 'master' of ssh://git-annex.branchable.com 2012-09-20 17:40:08 -04:00
Joey Hess
d7c8b60e6b blog for the day 2012-09-20 17:39:09 -04:00
Joey Hess
2ae38325d5 hook rsync special remote up to the progress reporting 
Easy!

Note that with an encrypted remote, rsync will be sending a little more
data than the key size, so displayed progress may get to 100% slightly
quicker than it should. I doubt this is a big enough effect to worry about.
 2012-09-20 13:51:51 -04:00
Joey Hess
66d092dc7c update 2012-09-20 13:46:07 -04:00
http://joeyh.name/
d67e322184 Added a comment 2012-09-20 16:21:12 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlu-fdXIt_RF9ggvg4zP0yBbtjWQwHAMS4
7bb0ee9d85 Added a comment: Multiple annexes? 2012-09-20 16:10:29 +00:00
193.22.163.2
b8979793fa poll vote (Amazon S3) 2012-09-20 14:17:29 +00:00
193.22.163.2
b8b4388c80 poll vote (Amazon Glacier) 2012-09-20 14:17:12 +00:00
193.22.163.2
30f387e396 poll vote (Google Drive) 2012-09-20 14:17:05 +00:00
193.22.163.2
1c865472eb poll vote (My phone (or MP3 player)) 2012-09-20 14:16:58 +00:00
193.22.163.2
ba7d784ccd poll vote (Amazon S3) 2012-09-20 14:16:49 +00:00
92.207.74.149
084863251c poll vote (My phone (or MP3 player)) 2012-09-20 03:26:53 +00:00
Joey Hess
3d62a09e53 blog for the day 2012-09-19 17:05:42 -04:00
Joey Hess
0608a2e748 reorg 2012-09-19 14:28:57 -04:00
https://www.google.com/accounts/o8/id?id=AItOawn-KDr_Z4CMkjS0v_TxQ08SzAB5ecHG3K0
481adaaffe Added a comment: Modifying files in a folder watched by assistant 2012-09-19 14:18:55 +00:00
79.97.135.214
d95c4cff8a poll vote (Tahoe-LAFS) 2012-09-19 08:24:09 +00:00
98.108.200.80
efe26d2919 poll vote (Google Drive) 2012-09-19 06:46:40 +00:00
85.165.7.40
cbcd208d15 poll vote (My phone (or MP3 player)) 2012-09-18 23:07:43 +00:00
Joey Hess
b2396535de blog for the day 2012-09-18 17:51:18 -04:00
Joey Hess
3a0cffcfed when a Download finishes, queue Uploads 
This ensures file propigate takes place in situations such as: Usb drive A
is connected to B. A's master branch is already in sync with B, but it is
being used to sneakernet some files around, so B downloads those. There is no
master branch change, so C does not request these files. B needs to upload
the files it just downloaded on to C, etc.

My first try at this, I saw loops happen. B uploaded to C, which then
tried to upload back to B (because it had not received the updated
git-annex branch from B yet). B already had the file, but it still created
a transfer info file from the incoming transfer, and its watcher saw
that be removed, and tried to upload back to C.

These loops should have been fixed by my previous commit. (They never
affected ssh remotes, only local ones, it seemed.) While C might still try
to upload to B, or to some other remote that already has the file, the
extra work dies out there.
 2012-09-18 14:10:33 -04:00
Joey Hess
e9238e9588 avoid starting a download for a local transfer when the remote already has the key 
Turns out that recvkey already does this same check. This avoids a transfer
file being created for the download that never happened, which in turn
will avoid the assistant seeing that the download has finished, when no
transfer actually took place.
 2012-09-18 13:59:03 -04:00
Joey Hess
e6d4108fad Merge branch 'master' of ssh://git-annex.branchable.com 2012-09-17 22:37:23 -04:00
Joey Hess
9a2533cf02 blog for the day 2012-09-17 22:36:23 -04:00
Joey Hess
3c22977e44 deferred downloads 
Now when a download is queued and there's no known remote to get it from,
it's added to a deferred download list, which will be retried later.

The Merger thread tries to queue any deferred downloads when it receives
a push to the git-annex branch.

Note that the Merger thread now also forces an update of the git-annex
branch. The assistant was not updating this branch before, and it saw a
(mostly) correct view of state, but now that incoming pushes go to
synced/git-annex, it needs to be merged in.
 2012-09-17 21:05:50 -04:00
93.218.139.22
714cf46171 poll vote (My phone (or MP3 player)) 2012-09-17 19:01:43 +00:00
Joey Hess
1e37c0c5fc note 2012-09-17 13:43:08 -04:00
174.127.226.162
a4c062151d poll vote (Google Drive) 2012-09-17 17:36:16 +00:00
Joey Hess
2081a31fda Merge branch 'master' of ssh://git-annex.branchable.com 2012-09-16 20:14:13 -04:00
Joey Hess
cead5d056e blog for the day 2012-09-16 20:13:32 -04:00
Joey Hess
601ee470af sync: Pushes the git-annex branch to remote/synced/git-annex, rather than directly to remote/git-annex. 
This fixes a problem I was seeing in the assistant where two remotes would
attempt to sync with one another at the same time, and both failed pushing
the diverged git-annex branch. Then when both tried to resolve the failed
push, they each modified their git-annex branch, which again each blocked
the other from pushing into it. The result was that the git-annex
branches were perpetually diverged (despite having the same content!) and
once the assistant fell into this trap, it couldn't get out and always
had to do the slow push/fail/pull/merge/push/fail cycle.
 2012-09-16 17:54:12 -04:00
http://meep.pl/
1ea5f13230 poll vote (Tahoe-LAFS) 2012-09-16 19:48:51 +00:00
Joey Hess
e61512f42d fix 2012-09-16 13:13:17 -04:00
Joey Hess
ebdc8422db Merge branch 'master' of ssh://git-annex.branchable.com 2012-09-16 13:11:47 -04:00
Joey Hess
a5230cce7c fix display of only blog posts tagged polls 2012-09-16 13:11:12 -04:00
2001:470:1f04:a19:200b:39d4:308f:4f6c
b3e9a121e0 poll vote (My phone (or MP3 player)) 2012-09-16 16:48:19 +00:00
2001:470:1f04:a19:200b:39d4:308f:4f6c
ce3a5acf9f poll vote (My phone (or MP3 player)) 2012-09-16 16:48:14 +00:00
2001:470:1f04:a19:200b:39d4:308f:4f6c
f8ff6577aa poll vote (My phone (or MP3 player)) 2012-09-16 16:48:08 +00:00
2001:638:a00:2a:298a:16f8:72b0:85b5
874321692e poll vote (My phone (or MP3 player)) 2012-09-16 15:14:11 +00:00
80.217.244.158
d5897c3cdc poll vote (My phone (or MP3 player)) 2012-09-16 14:53:35 +00:00
98.207.92.124
93f42da0bd poll vote (Amazon S3) 2012-09-16 06:52:00 +00:00
Joey Hess
719d229d9d Merge branch 'master' of ssh://git-annex.branchable.com 2012-09-15 22:41:06 -04:00
Joey Hess
dd9e1f9831 blog for the day 2012-09-15 22:40:21 -04:00
188.61.52.255
d0d9eb1031 poll vote (Amazon Glacier) 2012-09-16 01:17:43 +00:00
188.61.52.255
a404ed33c3 poll vote (Tahoe-LAFS) 2012-09-16 01:17:34 +00:00
188.61.52.255
7e76544945 poll vote (Amazon Glacier) 2012-09-16 01:17:17 +00:00
Joey Hess
9a9b4b840e Merge branch 'master' of ssh://git-annex.branchable.com 2012-09-15 20:17:03 -04:00
80.187.96.136
816b9b4200 poll vote (Amazon S3) 2012-09-15 20:20:58 +00:00
89.236.47.66
83a1d4d496 poll vote (My phone (or MP3 player)) 2012-09-15 20:10:35 +00:00
Joey Hess
b453ea8b48 found some bugs 2012-09-15 15:24:07 -04:00
128.61.104.52
0b8fdca494 poll vote (My phone (or MP3 player)) 2012-09-15 15:03:16 +00:00
87.79.135.229
69bdc6207b poll vote (Amazon Glacier) 2012-09-15 13:01:56 +00:00
2001:980:45c4:1:a5a9:c33:f9a:2d05
1c054cd2e6 poll vote (My phone (or MP3 player)) 2012-09-15 12:41:35 +00:00
88.67.98.182
e804d96a09 poll vote (My phone (or MP3 player)) 2012-09-15 09:40:27 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmU_2tE75oyG0h2ZPN4lcroIKEMC8G-otE
071a73212f poll vote (My phone (or MP3 player)) 2012-09-15 07:58:28 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmU_2tE75oyG0h2ZPN4lcroIKEMC8G-otE
3ffbd76267 poll vote (Google Drive) 2012-09-15 07:58:12 +00:00
37.14.174.110
4360ce62b6 poll vote (My phone (or MP3 player)) 2012-09-15 00:33:20 +00:00
196.210.205.176
77db311489 poll vote (My phone (or MP3 player)) 2012-09-14 20:46:10 +00:00
216.203.6.11
3dea341433 poll vote (Amazon S3) 2012-09-14 20:09:53 +00:00
82.36.235.9
735d0300e3 poll vote (Amazon S3) 2012-09-14 19:42:19 +00:00
85.84.130.12
2fda03c46f poll vote (Google Drive) 2012-09-14 17:41:37 +00:00
142.103.22.67
69d474d7e2 poll vote (My phone (or MP3 player)) 2012-09-14 17:32:46 +00:00
194.167.235.220
e83052b916 poll vote (My phone (or MP3 player)) 2012-09-14 16:32:14 +00:00
108.202.177.46
2667e58eef poll vote (Amazon S3) 2012-09-14 14:37:32 +00:00
2001:8b0:641b:0:240:f4ff:fe51:2b8f
d3aee0b85e poll vote (My phone (or MP3 player)) 2012-09-14 13:44:19 +00:00
61.16.175.58
6e4ad78135 poll vote (Amazon S3) 2012-09-14 12:59:04 +00:00
81.110.190.38
b421a08d86 poll vote (Amazon Glacier) 2012-09-14 12:28:17 +00:00
134.34.1.246
afc5fb8291 poll vote (OpenStack SWIFT) 2012-09-14 11:20:52 +00:00
134.109.4.210
f76ab022f2 poll vote (My phone (or MP3 player)) 2012-09-14 10:40:26 +00:00
134.93.131.80
7f5b073e69 poll vote (My phone (or MP3 player)) 2012-09-14 09:03:42 +00:00
80.138.120.93
bfe58eee87 poll vote (OpenStack SWIFT) 2012-09-14 08:56:49 +00:00
204.210.141.90
ebcac59a07 poll vote (Amazon S3) 2012-09-14 08:06:55 +00:00
130.206.138.233
225c7d44e3 poll vote (Google Drive) 2012-09-14 08:06:02 +00:00
195.81.3.249
2f88f683e0 poll vote (My phone (or MP3 player)) 2012-09-14 07:52:37 +00:00
93.137.114.136
d4605eee8d poll vote (My phone (or MP3 player)) 2012-09-14 07:49:24 +00:00
193.29.115.250
dfcf907069 poll vote (Google Drive) 2012-09-14 07:33:50 +00:00
193.29.115.250
9b85c3eb37 poll vote (Box.com) 2012-09-14 07:33:43 +00:00
78.144.72.66
dbfa65a6c5 poll vote (My phone (or MP3 player)) 2012-09-14 07:11:10 +00:00
76.21.12.58
6c1d606ef1 poll vote (Amazon Glacier) 2012-09-14 06:11:22 +00:00
90.84.144.43
8a4d5cae22 poll vote (My phone (or MP3 player)) 2012-09-14 05:34:22 +00:00
189.103.67.26
4b1baaa945 poll vote (Google Drive) 2012-09-14 04:53:04 +00:00
http://mike.magin.org/
71c6909086 poll vote (Amazon S3) 2012-09-14 04:21:17 +00:00
140.107.155.156
679bb30d32 poll vote (Google Drive) 2012-09-14 04:18:28 +00:00
82.145.208.111
2269b13510 poll vote (Google Drive) 2012-09-14 04:17:12 +00:00
69.94.209.177
f1f78f596b poll vote (My phone (or MP3 player)) 2012-09-14 03:19:06 +00:00
75.42.235.50
54ebb8a86f poll vote (Google Drive) 2012-09-14 02:55:39 +00:00
75.150.123.25
7898bf1b23 poll vote (My phone (or MP3 player)) 2012-09-14 02:55:34 +00:00
75.42.235.50
9568922418 poll vote (Google Drive) 2012-09-14 02:54:50 +00:00
96.53.57.14
e76260d656 poll vote (My phone (or MP3 player)) 2012-09-14 01:58:23 +00:00
204.101.237.139
833e5fb2fa poll vote (My phone (or MP3 player)) 2012-09-14 01:36:59 +00:00
70.80.215.148
b2552dd336 poll vote (Amazon Glacier) 2012-09-13 23:42:46 +00:00
70.80.215.148
4fed2bcacc poll vote (Tahoe-LAFS) 2012-09-13 23:42:37 +00:00
70.80.215.148
72f852f66c poll vote (Amazon Glacier) 2012-09-13 23:42:21 +00:00
91.66.168.202
63cc93eba7 poll vote (Tahoe-LAFS) 2012-09-13 23:29:57 +00:00
2001:15c0:66bc:0:f2de:f1ff:fe77:7ecb
8b9c1b1b50 poll vote (My phone (or MP3 player)) 2012-09-13 23:07:03 +00:00
64.125.69.70
a1a8ec89a3 poll vote (Amazon Glacier) 2012-09-13 22:38:32 +00:00
50.137.168.176
83ccdad5f3 poll vote (My phone (or MP3 player)) 2012-09-13 22:36:13 +00:00
50.137.168.176
d9b4a468a6 poll vote (OpenStack SWIFT) 2012-09-13 22:36:04 +00:00
99.117.172.61
324e629f4e poll vote (Amazon S3) 2012-09-13 22:31:43 +00:00
50.76.39.249
dd9d68c697 poll vote (My phone (or MP3 player)) 2012-09-13 21:52:47 +00:00
2001:1938:81:1ff::2
66b37568a8 poll vote (My phone (or MP3 player)) 2012-09-13 21:49:45 +00:00