summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* record transfer information on local git remotesGravatar Joey Hess2012-07-01
| | | | | | | | | | | | | | | 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!
* bugfixesGravatar Joey Hess2012-07-01
| | | | | | fdToHandle seems to close the fd avoid excess trailing newline
* get, move, copy: Now refuse to do anything when the requested file transfer ↵Gravatar Joey Hess2012-07-01
| | | | | | | | | | | | | | | is already in progress by another process. Note this is per-remote, so trying to get the same file from multiple remotes can still let duplicate downloads run. (And uploading the same file to multiple remotes is not duplicate at all of course.) get, move, and copy are the only git-annex subcommands that transfer files, but there's still git-annex-shell recvkey and sendkey to deal with too. I considered modifying retrieveKeyFile or getViaTmp, but they are called by other code that does not involve expensive file transfers (migrate) or that does file transfers that should not be checked by this (fsck --from).
* tested; bugfixesGravatar Joey Hess2012-07-01
|
* add transfer information filesGravatar Joey Hess2012-07-01
|
* Added a comment: gnu commandsGravatar https://www.google.com/accounts/o8/id?id=AItOawnHrjHxJAm39x8DR4bnbazQO6H0nMNuY9c2012-07-01
|
* Added a comment: sha256 alternativeGravatar https://www.google.com/accounts/o8/id?id=AItOawnHrjHxJAm39x8DR4bnbazQO6H0nMNuY9c2012-06-30
|
* doc/download.mdwn: document no-s3 and assistant branchesGravatar Philipp Kern2012-06-30
|
* blog for the dayGravatar Joey Hess2012-06-29
|
* improving transfer data types and designGravatar Joey Hess2012-06-29
|
* add news item for git-annex 3.20120629Gravatar Joey Hess2012-06-29
|
* releasing version 3.201206293.20120629Gravatar Joey Hess2012-06-29
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-06-29
|\
* | further designGravatar Joey Hess2012-06-29
| |
* | pointlessnessGravatar Joey Hess2012-06-29
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus2012-06-29
|/
* blog for the dayGravatar Joey Hess2012-06-28
|
* updateGravatar Joey Hess2012-06-28
|
* post my current set of ideas for handling unlockingGravatar Joey Hess2012-06-28
|
* Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus2012-06-28
|
* (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmURXBzaYE1gmVc-X9eLAyDat_6rHPl6702012-06-28
|
* updateGravatar Joey Hess2012-06-27
|
* typoGravatar Joey Hess2012-06-27
|
* (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus2012-06-27
|
* (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus2012-06-27
|
* typoGravatar Joey Hess2012-06-27
|
* blog for the dayGravatar Joey Hess2012-06-27
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-06-27
|\
* \ Merge branch 'automerge'Gravatar Joey Hess2012-06-27
|\ \
| * | use "variant" rather than "version"Gravatar Joey Hess2012-06-27
| | | | | | | | | | | | | | | | | | While this word may be less familiar to some users, it avoids the connotation that version 2 is better than version 1, which is wrong when the two variants were conflicting.
| * | better filenames for conflict resolution filesGravatar Joey Hess2012-06-27
| | |
| * | commit merge resolutionGravatar Joey Hess2012-06-27
| | | | | | | | | | | | this is necessary so the sync can continue successfully with its push phase
| * | fix file nameGravatar Joey Hess2012-06-27
| | |
* | | closeGravatar Joey Hess2012-06-27
| | |
| * | don't automerge when the symlinks cannot be parsed as keysGravatar Joey Hess2012-06-27
| | |
| * | sync: Automatically resolves merge conflicts.Gravatar Joey Hess2012-06-27
| | | | | | | | | | | | untested, but it compiles :)
| * | properly handle deleted files when processing ls-files --unmergedGravatar Joey Hess2012-06-27
|/ /
* | add ls-files --unmerged supportGravatar Joey Hess2012-06-27
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkWzAq6TusMi9zI3FLkDOETRIAUTtmGZVg2012-06-27
| |
| * Added a commentGravatar http://joeyh.name/2012-06-27
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkwR9uOA38yi5kEUvcEWNtRiZwpxXskayE2012-06-27
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus2012-06-27
| |
| * Added a commentGravatar http://joeyh.name/2012-06-27
|/
* git-config fileEncodingGravatar Joey Hess2012-06-26
| | | | | | | | | | | | Accept arbitrarily encoded repository filepaths etc when reading git config output. This fixes support for remotes with unusual characters in their names. For example, a remote with a url of /tmp/çüş was previously skipped, because the filename wasn't encoded right so it didn't think it was available. And when setting the annex-uuid of a remote named "çüş", it used to add it under a mis-encoded form of the remote's name. Both these cases now work ok in my testing.
* Got rid of the last place that did utf8 decoding.Gravatar Joey Hess2012-06-26
| | | | | Probably fixes bugs/git-annex:_Cannot_decode_byte___39____92__xfc__39__/ although I don't know how to reproduce that bug.
* Added a commentGravatar http://joeyh.name/2012-06-27
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-06-26
|\
* | Better fix for unavailable local remotesGravatar Joey Hess2012-06-26
| | | | | | | | | | | | Not including such remotes turned out to have other consequences, including annex-truselevel git config being ignored. Instead, add guards before each operation that might try to operate on such a repo.
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkWzAq6TusMi9zI3FLkDOETRIAUTtmGZVg2012-06-27
|/
* blog for the dayGravatar Joey Hess2012-06-26
|
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-06 16:00:07 +0000