summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* add includes to cabalGravatar Joey Hess2017-10-24
|
* add winprocess.hGravatar Joey Hess2017-10-24
|
* try to avoid TerminateProcess link error on windowsGravatar Joey Hess2017-10-24
| | | | | | | | | Building with stack, it failed: `_TerminateProcess' referenced in section `.text' of .stack-work\dist\5f9bc736\build\git-annex\git-annex-tmp\Utility\WinProcess.o: defined in discarded section `.text' of C:/Users/jenkins/AppData/Local/Programs/stack/i386-windows/ghc-8.0.2/mingw/bin/../lib/gcc/i686-w64-mingw32/5.2.0/../../../../i686-w64-mingw32/lib/../lib/libkernel32.a(dacgs01154.o) This is a reversion of 6d66a81ca98f8579bf06f7fb724ed733670d39b9, to try the other way to implement it, which will hopefully avoid the problem.
* avoid build warning on windowsGravatar Joey Hess2017-10-24
|
* windows build fixGravatar Joey Hess2017-10-24
|
* temporarily import from win32-extrasGravatar Joey Hess2017-10-24
|
* remove unncessary withcygGravatar Joey Hess2017-10-24
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2017-10-24
|\
* | add to PATHGravatar Joey Hess2017-10-24
| |
| * Added a comment: same problemGravatar ynikitenko2017-10-24
| |
| * Added a comment: Since the attachment doesn't appear to be there, here's the ↵Gravatar seantparsons2017-10-22
| | | | | | | | content.
| * (no commit message)Gravatar seantparsons2017-10-22
|/
* get rsync before buildGravatar Joey Hess2017-10-22
|
* typoGravatar Joey Hess2017-10-22
|
* run only 1 jobGravatar Joey Hess2017-10-22
| | | | | Seeing interrmittent build failures that may be related to stack's concurrency
* disable haddockGravatar Joey Hess2017-10-22
|
* try lts-9.10 with old win32Gravatar Joey Hess2017-10-22
| | | | toolchain issue is preventing nightly from building anything on windows
* temporarily remove custom-setup stanzaGravatar Joey Hess2017-10-22
| | | | | | | | | This needs to include unix except on windows, but when I tried an if (! os(windows)) cabal crashed: 'parseField' called on a non-field. This is possibly a bug in Cabal. Cabal is able to configure w/o the custom-setup stanza, so omit it.
* add IfElse versionGravatar Joey Hess2017-10-22
|
* switch to nightly-2017-10-22 for newer win32Gravatar Joey Hess2017-10-22
|
* point packages dir at topGravatar Joey Hess2017-10-22
|
* windows-specific stack.yaml to enable Win32Gravatar Joey Hess2017-10-22
|
* temporarily disable rm to get buildingGravatar Joey Hess2017-10-22
|
* better fix for rm pathGravatar Joey Hess2017-10-22
|
* add cygwin bin to pathGravatar Joey Hess2017-10-22
|
* remove msysgit cruftGravatar Joey Hess2017-10-22
|
* remove ghc --versionGravatar Joey Hess2017-10-22
| | | | using stack, version is pinned
* try using cygwin bin/shGravatar Joey Hess2017-10-22
| | | | msysgit not used for a long time
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2017-10-22
|\
* | force updateGravatar Joey Hess2017-10-22
| |
| * Added a comment: Publishing subdir is publishing files but not subdir?Gravatar jajpater2017-10-20
| |
| * Added a comment: Works when first using git annex getGravatar jajpater2017-10-20
| |
| * Added a comment: Also fails when using UUID but differentlyGravatar jajpater2017-10-20
| |
| * Added a comment: Problem with publishing subdir. Subdir does not exist, but ↵Gravatar jajpater2017-10-20
| | | | | | | | it does.
| * Added a commentGravatar ilovezfs2017-10-19
|/
* add news item for git-annex 6.20171018Gravatar Joey Hess2017-10-18
|
* 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
| |