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

9699 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joey Hess
db3e32e768 improve wording 2013-04-02 15:45:35 -04:00
Joey Hess
0ba205f125 squelch protocol error on shutdown 2013-04-02 15:18:03 -04:00
Joey Hess
38d61f934d Update working tree files fully atomically 
This avoids commit churn by the assistant when eg,
replacing a file with a symlink.

But, just as importantly, it prevents the working tree being left with a
deleted file if git-annex, or perhaps the whole system, crashes at the
wrong time.

(It also probably avoids confusing displays in file managers.)
 2013-04-02 15:02:00 -04:00
Joey Hess
8c52b20cc7 optimise last commit 
Rather than re-adding a direct mode file unnecessarily when it's not
changed, just re-stage the symlink.
 2013-04-02 12:58:56 -04:00
Joey Hess
31cbde8190 assistant: Fix bug that could cause direct mode files to be unstaged from git. 
My test case for this bug is to have the assistant running and syncing to
a remote, and create a file in the annex. Then at the command line run
git annex drop. The assistant sees that the file is gone, sees it's a wanted
file, and downloads it from the remote.

With a directory special remote and a small file, I was seeing around 1
time in 3, a race where the file got unstaged from git after it got
downloaded.

Looking at what direct mode content managing code does in this case, it
deletes the symlink, and then adds the file content back. It would be
possible, sometimes, to avoid removing the symlink and do this atomically.
And I probably should.. but in some cases, particularly where the file
needs to be run through `cp` (multiple direct mode files with same
content), there's no way to atomically replace the symlink with the
content.

Anyway, the bug turns out to be something that the watcher does right for
indirect mode, but not for direct mode. When it got an add event, it
checked to see if this was a new file, or one we've already added. In the
latter case, no add event was queued. But that means that only the rm event
is queued, and so it unstages the file.

Fixed by queueing an add event even when the file is already in git.

Tested by running hundreds of drops in a loop; file remained staged.
 2013-04-02 12:45:31 -04:00
Joey Hess
5f4b9c5f87 clarification 2013-04-02 01:20:15 -04:00
Joey Hess
60602f9945 blog for the part of the day I didn't waste writing a lolcat filter 2013-04-01 17:55:08 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnR7hb8IaKB3IKZptRukje0yahmhfLOO98
d2b349b3e3 Added a comment 2013-04-01 19:23:12 +00:00
Joey Hess
129cf00c9c Merge branch 'master' of ssh://git-annex.branchable.com 2013-04-01 15:21:04 -04:00
Joey Hess
d87af82d97 drop --auto: Fix bug that prevented dropping files from untrusted repositories. 
This is a corresponding bug to the one I fixed yesterday in the assistant.
 2013-04-01 15:20:42 -04:00
http://adamspiers.myopenid.com/
ed8a6872ca Added a comment: Ask for more money :-) 2013-04-01 19:01:50 +00:00
Joey Hess
4b12506c0a fix up some weird write-in choices 2013-04-01 14:37:08 -04:00
http://joeyh.name/
b952f4afcf Added a comment 2013-04-01 18:33:37 +00:00
http://joeyh.name/
9ae27553a0 Added a comment 2013-04-01 18:28:21 +00:00
http://joeyh.name/
3bd965365e Added a comment 2013-04-01 18:24:20 +00:00
2001:470:26:9bb:288e:30f8:701e:d88d
123945726c poll vote (get webapp working on Android) 2013-04-01 18:21:14 +00:00
84.57.11.234
999974e496 poll vote (direct mode (aka real files instead of symlinks)) 2013-04-01 18:05:51 +00:00
2a00:c440:20:124f:cbc:afff:fe2e:f82
429f87f2fb poll vote (optimize file transfer using rsync in the case of changing files) 2013-04-01 17:59:32 +00:00
2a00:c440:20:124f:cbc:afff:fe2e:f82
29c539800d poll vote (direct mode (aka real files instead of symlinks)) 2013-04-01 17:58:31 +00:00
2a00:c440:20:124f:cbc:afff:fe2e:f82
1534e6b748 poll vote (direct mode (aka real files instead of symlinks)) 2013-04-01 17:58:23 +00:00
2a00:c440:20:124f:cbc:afff:fe2e:f82
bdc7ca2697 poll vote (direct mode (aka real files instead of symlinks)) 2013-04-01 17:58:16 +00:00
216.112.253.9
97f7ea0f36 poll vote (upload and download rate limiting) 2013-04-01 17:57:51 +00:00
89.0.248.69
fa6c542e27 poll vote (encrypted git remotes using git-remote-gcrypt) 2013-04-01 16:53:51 +00:00
86.59.215.85
b6cfbbe999 poll vote (encrypted git remotes using git-remote-gcrypt) 2013-04-01 16:47:50 +00:00
80.138.106.186
59da93865f poll vote (don't work on features, work on making it easier to install and use) 2013-04-01 16:41:47 +00:00
80.138.106.186
2e6575b41c poll vote (upload and download rate limiting) 2013-04-01 16:41:25 +00:00
80.187.102.178
58cf01062e poll vote (upload and download rate limiting) 2013-04-01 16:41:06 +00:00
128.223.222.16
6017acec88 poll vote (get webapp working on Android) 2013-04-01 16:34:56 +00:00
70.68.144.25
03ba25c95b poll vote (optimize file transfer using rsync in the case of changing files) 2013-04-01 16:06:43 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn26WQjIP5fnMgQF_L_k3Q3UrR5v8mjRTY
91e2f4b7a5 2013-04-01 15:43:48 +00:00
166.147.104.35
0a81b6ac4a poll vote (start windows port now) 2013-04-01 15:26:16 +00:00
2602:306:bd11:6a50:a866:164d:7b3b:990c
0ba44c85d5 poll vote (don't work on features, work on making it easier to install and use) 2013-04-01 14:54:39 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkWG4T4SGZxY-q4Wo8Jbxwb67g4J-WYmQM
77ff956b86 Added a comment: don't work on features option 2013-04-01 14:03:35 +00:00
2003:6a:6d02:1401:c62c:3ff:fe10:28ef
2e4bd482e3 poll vote (get webapp working on Android) 2013-04-01 13:58:38 +00:00
24.185.86.215
a9dc23d6ee poll vote (start windows port now) 2013-04-01 13:46:10 +00:00
212.255.24.94
65403f7bcc poll vote (Handle duplicate files) 2013-04-01 13:28:15 +00:00
212.255.24.94
1e40801585 poll vote (start windows port now) 2013-04-01 13:28:07 +00:00
212.255.24.94
6dbd1d99a8 poll vote (encrypted git remotes using git-remote-gcrypt) 2013-04-01 13:27:47 +00:00
212.255.24.94
b2fde7adf9 poll vote (get webapp working on Android) 2013-04-01 13:27:32 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmBUR4O9mofxVbpb8JV9mEbVfIYv670uJo
92f09d5866 tweak formatting :) 2013-04-01 13:11:48 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmBUR4O9mofxVbpb8JV9mEbVfIYv670uJo
2a648212e4 rename forum/Stupid_mistake:_recoverable__63__.txt to forum/Stupid_mistake:_recoverable__63__.mdwn 2013-04-01 13:11:06 +00:00
62.46.178.22
676c726d46 poll vote (get webapp working on Android) 2013-04-01 10:08:34 +00:00
85.16.230.26
cb04250c79 poll vote (direct mode (aka real files instead of symlinks)) 2013-04-01 10:04:29 +00:00
85.16.230.26
a79b1118b9 poll vote (don't work on features, work on making it easier to install and use) 2013-04-01 10:04:10 +00:00
85.16.230.26
ea674454f1 poll vote (upload and download rate limiting) 2013-04-01 10:03:43 +00:00
Rasmus
1de88242e1 Better txt formatting 2013-04-01 09:48:10 +00:00
80.187.103.131
7319d8fd67 poll vote (start windows port now) 2013-04-01 09:46:00 +00:00
Rasmus
cd6b42aa99 Asked a new questioin 2013-04-01 09:45:50 +00:00
80.187.103.131
f67a83fc1e poll vote (get webapp working on Android) 2013-04-01 09:45:01 +00:00
89.182.13.50
158052bf6e poll vote (don't work on features, work on making it easier to install and use) 2013-04-01 09:10:09 +00:00