Commit graph

30958 commits

Author SHA1 Message Date
Joey Hess
42a9555d9f
windows build fix 2017-10-24 12:17:38 -04:00
Joey Hess
92c7e67022
temporarily import from win32-extras 2017-10-24 12:06:41 -04:00
Joey Hess
2c71f4a3a8
remove unncessary withcyg 2017-10-24 12:05:00 -04:00
Joey Hess
bc82d226b6
Merge branch 'master' of ssh://git-annex.branchable.com 2017-10-24 12:02:44 -04:00
Joey Hess
6f7db3df09
add to PATH 2017-10-24 12:02:14 -04:00
ynikitenko
19e9576289 Added a comment: same problem 2017-10-24 09:31:07 +00:00
seantparsons
76e0af3153 Added a comment: Since the attachment doesn't appear to be there, here's the content. 2017-10-22 20:32:22 +00:00
seantparsons
138c9efec1 2017-10-22 20:04:43 +00:00
Joey Hess
a732dbee31
get rsync before build 2017-10-22 15:22:24 -04:00
Joey Hess
c745480882
typo 2017-10-22 15:20:26 -04:00
Joey Hess
008e991ff5
run only 1 job
Seeing interrmittent build failures that may be related to stack's
concurrency
2017-10-22 15:02:43 -04:00
Joey Hess
87c6f506e7
disable haddock 2017-10-22 14:50:09 -04:00
Joey Hess
0e766a41c6
try lts-9.10 with old win32
toolchain issue is preventing nightly from building anything on windows
2017-10-22 14:20:54 -04:00
Joey Hess
2412744e0b
temporarily remove custom-setup stanza
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.
2017-10-22 14:08:55 -04:00
Joey Hess
11928ae432
add IfElse version 2017-10-22 14:08:45 -04:00
Joey Hess
fda47b0a01
switch to nightly-2017-10-22 for newer win32 2017-10-22 14:03:10 -04:00
Joey Hess
79f56fd449
point packages dir at top 2017-10-22 13:59:42 -04:00
Joey Hess
84a517dbcb
windows-specific stack.yaml to enable Win32 2017-10-22 13:58:21 -04:00
Joey Hess
7391c49305
temporarily disable rm to get building 2017-10-22 13:42:46 -04:00
Joey Hess
bc08ef886d
better fix for rm path 2017-10-22 13:40:01 -04:00
Joey Hess
836e70424d
add cygwin bin to path 2017-10-22 13:39:26 -04:00
Joey Hess
35c807b5bc
remove msysgit cruft 2017-10-22 13:38:11 -04:00
Joey Hess
b744588459
remove ghc --version
using stack, version is pinned
2017-10-22 13:37:18 -04:00
Joey Hess
f00996a1c3
try using cygwin bin/sh
msysgit not used for a long time
2017-10-22 13:35:53 -04:00
Joey Hess
67f15844e5
Merge branch 'master' of ssh://git-annex.branchable.com 2017-10-22 13:23:21 -04:00
Joey Hess
122205e99d
force update 2017-10-22 13:22:55 -04:00
jajpater
0b9dc04a51 Added a comment: Publishing subdir is publishing files but not subdir? 2017-10-20 10:22:25 +00:00
jajpater
003fc0ad01 Added a comment: Works when first using git annex get 2017-10-20 09:59:29 +00:00
jajpater
16cb3ec4fe Added a comment: Also fails when using UUID but differently 2017-10-20 09:47:25 +00:00
jajpater
2e9588356e Added a comment: Problem with publishing subdir. Subdir does not exist, but it does. 2017-10-20 09:21:34 +00:00
ilovezfs
f3ba40cd43 Added a comment 2017-10-19 05:50:13 +00:00
Joey Hess
9fe30b81b7
add news item for git-annex 6.20171018 2017-10-18 15:41:42 -04:00
Joey Hess
bb20b1ed35
releasing package git-annex version 6.20171018 2017-10-18 15:41:08 -04:00
Joey Hess
e0966bbb16
reorder 2017-10-18 13:36:43 -04:00
Joey Hess
6efd2dfc89
Merge branch 'master' of ssh://git-annex.branchable.com 2017-10-18 13:35:28 -04:00
Joey Hess
0c1c55efea
changelog 2017-10-18 13:34:53 -04:00
Joey Hess
aa5c76c6cd
Merge remote-tracking branch 'gueux/plasma5' 2017-10-18 13:33:33 -04:00
Félix Sipma
79cfae8eaf use plasma 5 location for ServiceMenus files on linux 2017-10-18 14:27:56 +02:00
ghen1
641f898343 2017-10-18 03:40:38 +00:00
Joey Hess
112d63e82a
devblog 2017-10-17 19:07:38 -04:00
Joey Hess
e1ac299ad0
better dup key with -J fix
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.
2017-10-17 18:48:53 -04:00
Joey Hess
68a49adcda
Improve behavior when -J transfers multiple files that point to the same key
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.
2017-10-17 17:10:50 -04:00
Joey Hess
594359351c
Merge branch 'master' of ssh://git-annex.branchable.com 2017-10-17 13:39:27 -04:00
Joey Hess
9606f6e83a
idea 2017-10-17 13:39:02 -04:00
Joey Hess
59a0308f5f
update windows build scripts to use stack
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.
2017-10-17 13:00:29 -04:00
Joey Hess
193b5f4ca4
new lts 2017-10-17 13:00:22 -04:00
https://launchpad.net/~barthelemy
65847905ca 2017-10-17 10:17:32 +00:00
85.144.94.148
7e563243ff poll vote (/sdcard/annex) 2017-10-16 21:50:31 +00:00
Joey Hess
20d5d12079
Revert "new Win32 fails to build; fall back to old one"
This reverts commit ffa81d2d7f.

Old win32-extras fails to install. I suspect toolchain breakage because
a lot of stuff is failing on the windows autobuilder.
2017-10-16 15:38:35 -04:00
Joey Hess
ddff4ebc84
log ghc version 2017-10-16 15:29:45 -04:00