Joey Hess
3ceaf4e972
wording
2013-03-04 15:53:37 -04:00
Joey Hess
281005fd92
restored lost line
2013-03-04 15:53:22 -04:00
Joey Hess
711d096fd7
Merge branch 'master' of ssh://git-annex.branchable.com
2013-03-04 15:11:54 -04:00
Joey Hess
c908672f3d
fix another potential race with the watcher and direct mode
...
Watcher wants to rewrite symlink to fix it. But in direct mode, the symlink
could be replaced at any time with file content that has finished being
transferred by some other process. So, just don't touch it.
FWIW, I audited the rest of the assistant for places where it removes
files, and the rest is ok. I have not audited the rest of git-annex.
2013-03-04 15:09:32 -04:00
Joey Hess
1d388d5579
fixed the race breaking moving files from archive in direct mode
...
assistant: Fix bug in direct mode that could occur when a symlink is moved
out of an archive directory, and resulted in the file not being set to
direct mode when it was transferred.
The bug was that the direct mode mapping was not up-to-date when the
transferrer finished. So, finding no direct mode place to store the object,
it was put into .git/annex in indirect mode.
To fix this, just make the watcher update the direct mode mapping to
include the new file before it starts the transfer. (Seems we don't need to
update it to remove the old file if the link was moved, because the direct
mode code will notice it's not present and the mapping gets updated for its
removal later.)
The reason this was a race, and was probably not seen often is because
the committer came along and updated the direct mode mapping as part of
adding the moved symlink. But when the file was sufficiently small or
the remote sufficiently fast, this could happen after the transfer
finished.
2013-03-04 14:25:22 -04:00
http://joeyh.name/
2b723ce9da
removed
2013-03-04 17:43:03 +00:00
http://joeyh.name/
492d46b38a
Added a comment
2013-03-04 17:29:28 +00:00
http://joeyh.name/
f458f62e4b
Added a comment
2013-03-04 17:29:16 +00:00
http://ao2.it/
3009ab5463
Added a comment: Using the Emulator?
2013-03-04 13:58:18 +00:00
http://phil.0x539.de/
d343992fce
Added a comment
2013-03-04 07:36:56 +00:00
https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89
1df34ef9a0
2013-03-04 04:44:18 +00:00
Joey Hess
051622c6da
send hothasktags stderr to null
2013-03-03 23:33:22 -04:00
Joey Hess
a238e58365
cleanup
2013-03-03 23:27:17 -04:00
Joey Hess
6cc0d93bd6
fix year
2013-03-03 23:20:47 -04:00
http://joeyh.name/
45a3f198f8
Added a comment
2013-03-04 00:57:39 +00:00
Joey Hess
7133e4fae4
Merge branch 'master' of ssh://git-annex.branchable.com
2013-03-03 20:55:56 -04:00
Joey Hess
89f973a6bd
cloe
2013-03-03 20:50:03 -04:00
Joey Hess
b20c3a6252
document the encryption cipher
2013-03-03 20:47:36 -04:00
Joey Hess
5895b2ac75
check that gpg generated as much data as we asked for
2013-03-03 20:39:01 -04:00
http://edheil.wordpress.com/
5913f1b746
Added a comment
2013-03-04 00:20:30 +00:00
Joey Hess
cb6aa9bf1e
Merge branch 'master' of ssh://git-annex.branchable.com
2013-03-03 20:06:20 -04:00
http://joeyh.name/
a41504a43b
Added a comment
2013-03-04 00:04:53 +00:00
Joey Hess
a1b6d2e057
show an error message if garbage is provided to dropunused
2013-03-03 20:04:24 -04:00
http://joeyh.name/
154594e750
Added a comment
2013-03-03 23:56:17 +00:00
Joey Hess
13cfe5c582
improve comments and variable names WRT base64 encoded encryption keys
2013-03-03 19:44:48 -04:00
https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89
27cc52b0a0
Added a comment
2013-03-03 22:43:41 +00:00
https://launchpad.net/~arand
304a577eae
Added a comment
2013-03-03 22:34:27 +00:00
http://phil.0x539.de/
cedb8abcf0
added my name
2013-03-03 22:33:01 +00:00
http://phil.0x539.de/
b65202deda
encryption uses a base64 key split into two halfs instead of an unwrapped one
2013-03-03 22:25:02 +00:00
Joey Hess
0b236edba9
fix titles
2013-03-03 17:35:22 -04:00
Joey Hess
22f6673575
Merge branch 'master' of ssh://git-annex.branchable.com
2013-03-03 17:33:11 -04:00
http://joeyh.name/
a1efdd2ce9
Added a comment
2013-03-03 21:32:39 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5iosFbL2By7UFeViqkc6v-hoAtqILeDA
f7c64afc94
Added a comment
2013-03-03 21:24:19 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5iosFbL2By7UFeViqkc6v-hoAtqILeDA
0ccd6306fa
removed
2013-03-03 21:23:38 +00:00
Joey Hess
06f28b1b2b
Merge branch 'master' of ssh://git-annex.branchable.com
2013-03-03 17:23:05 -04:00
https://www.google.com/accounts/o8/id?id=AItOawm5iosFbL2By7UFeViqkc6v-hoAtqILeDA
45309b98a3
Added a comment
2013-03-03 21:22:58 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5iosFbL2By7UFeViqkc6v-hoAtqILeDA
ee93337af1
removed
2013-03-03 21:22:27 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5iosFbL2By7UFeViqkc6v-hoAtqILeDA
2f6026186f
Added a comment
2013-03-03 21:21:40 +00:00
Joey Hess
9c6238ac9d
blog for the day
2013-03-03 17:21:03 -04:00
Joey Hess
20c65a6c0e
add
2013-03-03 17:20:17 -04:00
Joey Hess
08bdea7e52
webapp: New preferences page allows enabling/disabling debug logging at runtime, as well as configuring numcopies and diskreserve.
2013-03-03 17:07:27 -04:00
https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89
ca57d68e36
2013-03-03 20:57:48 +00:00
Joey Hess
d7ad02f893
fix title
2013-03-03 16:45:03 -04:00
annexuser
5c1975cfc8
2013-03-03 20:21:12 +00:00
http://joeyh.name/
d9126c44f4
Added a comment
2013-03-03 19:42:19 +00:00
Joey Hess
dfaba676ae
Merge branch 'master' of ssh://git-annex.branchable.com
2013-03-03 15:19:56 -04:00
Joey Hess
724711e4b7
fix
2013-03-03 15:18:24 -04:00
http://edheil.wordpress.com/
749090a17b
Added a comment
2013-03-03 18:58:42 +00:00
Joey Hess
53318d6ef1
webapp: fix display of paused local repo
2013-03-03 14:55:25 -04:00
http://joeyh.name/
1c78b7f287
Added a comment
2013-03-03 18:53:23 +00:00
