Commit graph

30927 commits

Author SHA1 Message Date
Joey Hess
d0d1154497
remove unused value
felix's patch removed the user of home
2017-10-30 12:36:43 -04:00
Joey Hess
c7fe7760d1
typo fix 2017-10-30 12:28:44 -04:00
Joey Hess
0743ee1bbc
managed to repro 2017-10-30 12:26:49 -04:00
Joey Hess
fb9b4724ba
moreinfo 2017-10-30 12:19:33 -04:00
Joey Hess
81926f638e
responses 2017-10-30 12:10:39 -04:00
Joey Hess
24883e01cd
Fix export of subdir of a branch.
Seems I forgot to fully test that feature when documenting it.

git rev-parse needs a colon after a branch to de-reference the tree
it points to, rather than the commit. But that had it adding an extra
colon when the user specified "branch:subdir". So, check if there is a
colon before adding one.

This commit was sponsored by Francois Marier on Patreon.
2017-10-30 12:02:22 -04:00
Joey Hess
edafe8621e
comment 2017-10-30 11:51:22 -04:00
Lykos153
58179ad49a 2017-10-29 17:57:50 +00:00
ynikitenko
1f5d4766d6 Added a comment: thanks 2017-10-29 16:28:34 +00:00
Joey Hess
20b04a465f
remove custom-setup again until cabal issue is fixed 2017-10-27 14:35:03 -04:00
Joey Hess
d6573dab1d
this is the custom-setup I want
Unfortunately, cabal fails to parse this.
https://github.com/haskell/cabal/issues/4852
2017-10-27 14:20:58 -04:00
Joey Hess
b7be4e13c2
Merge branch 'master' of ssh://git-annex.branchable.com 2017-10-27 14:04:36 -04:00
Joey Hess
15f680d33b
try putting back custom-setup
will this build on doze?
2017-10-27 14:03:50 -04:00
ynikitenko
769c1d3d37 Added a comment: not so slow 2017-10-27 12:29:12 +00:00
Joey Hess
024b52a624
add news item for git-annex 6.20171026 2017-10-26 14:03:07 -04:00
Joey Hess
43d011a524
releasing package git-annex version 6.20171026 2017-10-26 14:02:40 -04:00
Joey Hess
d1d027ca10
better describe autobuild 2017-10-26 13:47:47 -04:00
Joey Hess
3d42168364
fix path 2017-10-26 13:42:54 -04:00
Joey Hess
d451d333d8
use upgraded stack 2017-10-26 12:15:00 -04:00
Joey Hess
c3449ff91d
finish fix for gitAnnexLink on windows
dropDrive needed since if splitPath splits out the drives, they would
appear different.
2017-10-26 12:01:16 -04:00
Joey Hess
932d4211a4
upgrade stack to avoid https://github.com/commercialhaskell/stack/issues/2960 2017-10-26 11:40:28 -04:00
Joey Hess
099ff702ea
improve cleanup 2017-10-26 11:34:14 -04:00
Joey Hess
6e202b8dc9
Revert "debugging strange old version of git-annex in windows installer bundle"
This reverts commit 1a338ed920.
2017-10-26 11:32:04 -04:00
Joey Hess
1a338ed920
debugging strange old version of git-annex in windows installer bundle 2017-10-26 11:21:27 -04:00
Edward Betts
3a927a0345
correct spelling mistakes
A few spelling fixes for the git-annex devblog.
2017-10-26 10:51:17 -04:00
Joey Hess
50c0fb7336
unify stack build and stack install
For some reason, when stack install is run separately, it seems to be
installing a previous build from a different temp dir. WTF?
2017-10-26 10:10:02 -04:00
Joey Hess
c6fcbaf5b5
update win32 commit 2017-10-25 21:20:02 -04:00
Joey Hess
5aa9e2f4c0
devblog 2017-10-25 19:47:14 -04:00
Joey Hess
584dbfb892
terminateProcessId renamed
win32 upstream suggested a better name
2017-10-25 19:46:28 -04:00
Joey Hess
0ae2ac282e
fix gitAnnexLink to not be absolute on Windows
Windows: Fix reversion that caused the path used to link to annexed
content include the drive letter and full path, rather than being
relative. (`git annex fix` will fix up after this problem).

I've not identified the commit that brought the reversion (probably it
happened this spring when I was removing MisingH and last touched
Utility.Path). Likely commit 18b9a4b8024115db67ae309fdaf54e1553037529?

The problem is that relPathDirToFile got called two paths that had the
slashes different ways around. Since takeDrive includes the first slash,
this made two paths on the same drive seem different and it bailed.

(ifdefs around this to avoid doing extra work on non-windows)

This commit was sponsored by Jack Hill on Patreon.
2017-10-25 19:36:29 -04:00
Joey Hess
d428f66cdd
simplify build 2017-10-25 17:54:33 -04:00
Joey Hess
91cf80b8ec
fix fix 2017-10-25 17:28:05 -04:00
Joey Hess
c992c73843
add win32 to extra-dep 2017-10-25 17:25:52 -04:00
Joey Hess
96734ba350
allow building w/o rsync installed
rsync is needed to run, but may not be on the build machine; that's ok
2017-10-25 17:24:03 -04:00
Joey Hess
4a72b17bd0
bug 2017-10-25 15:57:08 -04:00
Joey Hess
b18e6997a1
update win32 to fixed version 2017-10-25 15:45:54 -04:00
Joey Hess
aa0388e37c
reply 2017-10-25 15:42:15 -04:00
Joey Hess
e8eacf96d5
Add day to metadata when annex.genmetadata is enabled.
Thanks, Sean T Parsons
2017-10-25 15:11:38 -04:00
Joey Hess
64f1c09526
stack.yaml: Added nix packages section.
Thanks, Sean T Parsons
2017-10-25 15:09:18 -04:00
Joey Hess
38c0e09de6
response 2017-10-25 15:04:55 -04:00
Joey Hess
ce6c46e643
fix path 2017-10-25 14:54:41 -04:00
Joey Hess
9be00f2537
try to put git for windows first
I think there'a a cygwin git in path confusing things
2017-10-25 14:52:08 -04:00
Joey Hess
357a6e6709
work around stack-work directory path bug
fatal: Invalid path '/cygdrive/c/jenkins/workspace/git-annex-master/git-annex/.stack-work/downloaded/C:\jenkins\workspace\git-annex-master\git-annex\.stack-work\downloaded\56E6vnUQljVi': No such file or directory
2017-10-25 14:49:35 -04:00
Joey Hess
833b3f06cd
build for windows with forked win32 package that has terminateProcessId
Get ugly reversion out of CHANGELOG.

Also, relocated the windows stack.yaml to top, and updated windows build
instructions.

This commit was sponsored by Henrik Riomar on Patreon.
2017-10-25 14:45:23 -04:00
Joey Hess
9f2b7dfc3e
rename this, to fix cloning on windows 2017-10-25 14:04:16 -04:00
Joey Hess
0156ea7f53
expand comment 2017-10-25 14:02:49 -04:00
Joey Hess
54e596894f
Windows: Remove wget from bundle; it needs libraries that are not included, and git for windows includes curl which git-annex will use instead.
wget was broken even in the previous old release of the windows bundle,
this is not new breakage. msys-idn-11.dll and probably more would be needed
to use it. git for windows includes msys-idn2-0.dll instead.
2017-10-25 13:51:31 -04:00
Joey Hess
7dc477a4fc
fix build-version creation 2017-10-25 13:37:51 -04:00
Joey Hess
dd6d0cc9af
fix path
git-annex is installed into . by Build/NullSoftInstaller, so use that
for running git-annex test
2017-10-25 00:23:18 -04:00
Joey Hess
2a2e30f729
make dir 2017-10-25 00:19:10 -04:00