diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-07-01 16:59:54 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-07-01 17:15:11 -0400 |
| commit | 7225c2bfc0c7149e646fa9af998da983e3fa8bc8 (patch) | |
| tree | a07f878efd0876f539e4c10a6572be001ef41189 /debian | |
| parent | 8c10f377146e6599054488f47a3a742f6a7c5ae2 (diff) | |
record transfer information on local git remotes
In order to record a semi-useful filename associated with the key,
this required plumbing the filename all the way through to the remotes'
storeKey and retrieveKeyFile.
Note that there is potential for deadlock here, narrowly avoided.
Suppose the repos are A and B. A sends file foo to B, and at the same
time, B gets file foo from A. So, A locks its upload transfer info file,
and then locks B's download transfer info file. At the same time,
B is taking the two locks in the opposite order. This is only not a
deadlock because the lock code does not wait, and aborts. So one of A or
B's transfers will be aborted and the other transfer will continue.
Whew!
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index babd1786d..c279614ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ git-annex (3.20120630) UNRELEASED; urgency=low * get, move, copy: Now refuse to do anything when the requested file transfer is already in progress by another process. + * status: Lists transfers that are currently in progress. -- Joey Hess <joeyh@debian.org> Sun, 01 Jul 2012 15:04:37 -0400 |