summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* updateGravatar Joey Hess2012-07-02
|
* better pid file locking codeGravatar Joey Hess2012-07-02
|
* fix associatedfile sanity checkGravatar Joey Hess2012-07-02
| | | | | | It seems best to require that the file just be relative, and not some ../ trick. git-annex-shell sendkey and recvkey both update transfer information now
* fix reading of empty filename from transfer info fileGravatar Joey Hess2012-07-02
|
* pass associatedfile and remoteuuid to git-annex-shellGravatar Joey Hess2012-07-02
| | | | | | | | This *almost* works. Along the way, I noticed that the --uuid parameter was being accidentially passed after the --, so that has never been actually used by git-annex-shell to verify it's running in the expected repository. Oops. Fixed.
* avoid untrappable exception if dirContentsRecursive is run on a directoryGravatar Joey Hess2012-07-02
| | | | | | | | that doesn't exist, or cannot be read The problem is its use of unsafeInterleaveIO, which causes its IO code to run when the thunk is forced, outside any exception trapping the caller may do.
* cleanupGravatar Joey Hess2012-07-02
|
* official Fedora builds now available for F16, F17Gravatar Joey Hess2012-07-02
|
* record transfers for git-annex-shellGravatar Joey Hess2012-07-02
| | | | | | | | | Not yet tested and places git-annex-shell is run need to be modified to pass the new field settings. Note that rsyncServerSend was changed to fork, rather than directly exec rsync, because it needs to keep the transfer lock held, and clean up the transfer log when done.
* add fields to git-annex-shellGravatar Joey Hess2012-07-02
|
* reorgGravatar Joey Hess2012-07-01
|
* blog for the dayGravatar Joey Hess2012-07-01
|
* 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
| |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-02 18:14:49 +0000