summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* releasing package git-annex version 6.201710186.20171018Gravatar Joey Hess2017-10-18
|
* reorderGravatar Joey Hess2017-10-18
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2017-10-18
|\
* | changelogGravatar Joey Hess2017-10-18
| |
* | Merge remote-tracking branch 'gueux/plasma5'Gravatar Joey Hess2017-10-18
|\ \
| * | use plasma 5 location for ServiceMenus files on linuxGravatar Félix Sipma2017-10-18
| | |
| | * (no commit message)Gravatar ghen12017-10-18
| |/ |/|
* | devblogGravatar Joey Hess2017-10-17
| |
* | better dup key with -J fixGravatar Joey Hess2017-10-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids all the complication about redundant work discussed in the previous try at fixing this. At the expense of needing each command that could have the problem to be patched to simply wrap the action in onlyActionOn once the key is known. But there do not seem to be many such commands. onlyActionOn' should not be used with a CommandStart (or CommandPerform), although the types do allow it. onlyActionOn handles running the whole CommandStart chain. I couldn't immediately see a way to avoid mistken use of onlyActionOn'. This commit was supported by the NSF-funded DataLad project.
* | Improve behavior when -J transfers multiple files that point to the same keyGravatar Joey Hess2017-10-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After a false start, I found a fairly non-intrusive way to deal with it. Although it only handles transfers -- there may be issues with eg concurrent dropping of the same key, or other operations. There is no added overhead when -J is not used, other than an added inAnnex check. When -J is used, it has to maintain and check a small Set, which should be negligible overhead. It could output some message saying that the transfer is being done by another thread. Or it could even display the same progress info for both files that are being downloaded since they have the same content. But I opted to keep it simple, since this is rather an edge case, so it just doesn't say anything about the transfer of the file until the other thread finishes. Since the deferred transfer action still runs, actions that do more than transfer content will still get a chance to do their other work. (An example of something that needs to do such other work is P2P.Annex, where the download always needs to receive the content from the peer.) And, if the first thread fails to complete a transfer, the second thread can resume it. But, this unfortunately means that there's a risk of redundant work being done to transfer a key that just got transferred. That's not ideal, but should never cause breakage; the same thing can occur when running two separate git-annex processes. The get/move/copy/mirror --from commands had extra inAnnex checks added, inside the download actions. Without those checks, the first thread downloaded the content, and then the second thread woke up and downloaded the same content redundantly. move/copy/mirror --to is left doing redundant uploads for now. It would need a second checkPresent of the remote inside the upload to avoid them, which would be expensive. A better way to avoid redundant work needs to be found.. This commit was supported by the NSF-funded DataLad project.
* | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2017-10-17
|\|
* | ideaGravatar Joey Hess2017-10-17
| |
* | update windows build scripts to use stackGravatar Joey Hess2017-10-17
| | | | | | | | | | | | | | | | | | | | | | | | Not tested yet. The EvilLinker workaround is removed. That got fixed in ghc 8.0.1, (per https://ghc.haskell.org/trac/ghc/ticket/8596) which will finally be used by the windows autobuilder now. I have not deleted the EvilLinker yet (or closed its bugs). This commit was sponsored by John Peloquin on Patreon.
* | new ltsGravatar Joey Hess2017-10-17
| |
| * (no commit message)Gravatar https://launchpad.net/~barthelemy2017-10-17
| |
| * poll vote (/sdcard/annex)Gravatar 85.144.94.1482017-10-16
|/
* Revert "new Win32 fails to build; fall back to old one"Gravatar Joey Hess2017-10-16
| | | | | | | This reverts commit adb9d19ac54595f7daea984933cdc1a34ccdedb2. Old win32-extras fails to install. I suspect toolchain breakage because a lot of stuff is failing on the windows autobuilder.
* log ghc versionGravatar Joey Hess2017-10-16
|
* new Win32 fails to build; fall back to old oneGravatar Joey Hess2017-10-16
|
* avoid cloning xss-sanitize when clone already existsGravatar Joey Hess2017-10-16
|
* try working around strange cabal install bug for xss-sanitizeGravatar Joey Hess2017-10-16
|
* windows autobuilder no longer firewalledGravatar Joey Hess2017-10-16
|
* link to bugGravatar Joey Hess2017-10-16
|
* close bugGravatar Joey Hess2017-10-16
|
* close bugGravatar Joey Hess2017-10-16
|
* Avoid repeated checking that files passed on the command line exist.Gravatar Joey Hess2017-10-16
| | | | | | | | | | | git annex add, git annex lock etc make multiple seek passes, and each seek pass checked that files existed. That was unncessary redundant work. Fixed by adding a new WorkTreeItem type, make seek actions use it, and check that the files exist when constructing it. This commit was supported by the NSF-funded DataLad project.
* add: Replace work tree file atomically.Gravatar Joey Hess2017-10-16
| | | | | | | Before, there was a window where interrupting an add could result in the file being moved into the annex, with no symlink yet created. This commit was supported by the NSF-funded DataLad project.
* avoid warningGravatar Joey Hess2017-10-16
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2017-10-15
|\
| * Added a commentGravatar madalu2017-10-12
| |
* | Added a note to standalone build that it would break datalad << 0.9.1Gravatar Yaroslav Halchenko2017-10-11
|/
* followupGravatar Joey Hess2017-10-11
|
* fix version numberGravatar Joey Hess2017-10-11
|
* typoGravatar Joey Hess2017-10-11
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2017-10-11
|\
* | responseGravatar Joey Hess2017-10-11
| |
| * Added a commentGravatar matyasbot@fd008517d046c382e18306c0b3db48eb58d45dee2017-10-11
|/
* commentGravatar Joey Hess2017-10-11
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2017-10-11
|\
* | commentGravatar Joey Hess2017-10-11
| |
* | webdav: Avoid unncessisarily creating the collection at the top of the repoGravatar Joey Hess2017-10-11
| | | | | | | | | | | | | | | | | | | | | | | | when storing files there, since that collection is created by initremote. (This seems to work around some brokenness of the box.com webdav server which was entering a redirect loop.) Note that the fix makes locationParent return Nothing instead of "." when there's no parent directory between the path and the top of the webdav repo. This commit was sponsored by André Pereira on Patreon.
* | Fix build with aws-0.17.Gravatar Joey Hess2017-10-11
| | | | | | | | This commit was sponsored by Denis Dzyubenko on Patreon.
* | closeGravatar Joey Hess2017-10-11
| |
| * Added a comment: pull didn't do anything eitherGravatar matyasbot@fd008517d046c382e18306c0b3db48eb58d45dee2017-10-11
| |
| * (no commit message)Gravatar matyasbot@fd008517d046c382e18306c0b3db48eb58d45dee2017-10-11
| |
| * Added a commentGravatar yarikoptic2017-10-10
| |
| * Added a commentGravatar yarikoptic2017-10-10
|/
* responseGravatar Joey Hess2017-10-10
|
* Added a comment: annex fsck reverts them back to incorrect!Gravatar yarikoptic2017-10-10
|
* initial reportGravatar yarikoptic2017-10-10
|