Commit graph

35983 commits

Author SHA1 Message Date
Joey Hess
c2466a7612
Revert malicious removal of index page
This reverts commit 748a228ee7.
2019-11-19 12:36:48 -04:00
Joey Hess
6d04ba4efc
Merge branch 'master' of ssh://git-annex.branchable.com 2019-11-18 17:25:40 -04:00
satya.ortiz-gagne@a4c92de91eb4fd5ae8fc9893bb4fd674a19f2e59
d5feb4385a Added a comment: Re: using hardlinks 2019-11-18 20:46:22 +00:00
Joey Hess
49cf86cfc0
Merge branch 'master' of ssh://git-annex.branchable.com 2019-11-18 16:27:17 -04:00
Joey Hess
9b48620425
devblog 2019-11-18 16:27:06 -04:00
Joey Hess
b207d944f3
sync, assistant: Pull and push from git-lfs remotes.
Oversight, forgot to add it to gitSyncableRemote
2019-11-18 16:13:21 -04:00
Joey Hess
5877de5e80
git-lfs: remember urls, and autoenable remotes using known urls
* git-lfs: The url provided to initremote/enableremote will now be
  stored in the git-annex branch, allowing enableremote to be used without
  an url. initremote --sameas can be used to add additional urls.
* git-lfs: When there's a git remote with an url that's known to be
  used for git-lfs, automatically enable the special remote.
2019-11-18 16:09:09 -04:00
Ilya_Shlyakhter
a884629e84 Added a comment: using hardlinks 2019-11-18 19:21:18 +00:00
satya.ortiz-gagne@a4c92de91eb4fd5ae8fc9893bb4fd674a19f2e59
6a30d64e72 2019-11-18 18:56:31 +00:00
Joey Hess
d06b5bcd7b
todo 2019-11-18 13:57:16 -04:00
Joey Hess
89a9877704
update docs
http basic auth has been supported for some time, these docs predate
that support
2019-11-18 13:12:46 -04:00
VSV
748a228ee7 removed 2019-11-17 06:46:05 +00:00
stefan.huchler@5f110ab85a15aec7e2b38586eb7ec37b12e2e6aa
7fd870d78b 2019-11-16 05:53:02 +00:00
Ilya_Shlyakhter
4b5040818b added todo "change git-annex-import not to delete original files by default" 2019-11-15 18:53:16 +00:00
Joey Hess
cee14f147a
stop displaying rsync progress, and use git-annex's own progress display for local-to-local repo transfers
Reasons to do this include:

1. I've gotten pretty used to git-annex's own progress display, which is
   used for all transfers over ssh (except to old git-annex-shell),
   and for most special remote transfers. It's getting to seem weird to see
   the rsync progress display instead.
2. When -J was used, the rsync output could not be shown, and so there was
   no progress display. Now there will be.

Progress will also be displayed now when cp CoW is used. But I'd expect a CoW
copy to typically run so fast that the progress display will barely be
noticable.

This commit was sponsored by Peter on Patreon.
2019-11-15 13:21:06 -04:00
Joey Hess
85c5e51c53
fix build after Utility.Url changes 2019-11-14 22:25:06 -04:00
Joey Hess
4ab1f3ff02
add news item for git-annex 7.20191114 2019-11-14 21:59:04 -04:00
Joey Hess
a95efcbc55
releasing package git-annex version 7.20191114 2019-11-14 21:58:23 -04:00
Joey Hess
8ea269ef75
fix GIT_EXEC_PATH to point to bundle/git-core
This makes it be the same as in the linux runshell.

It may be that bundle/ used to have all the necessary binaries in it,
but that seems unlikely. I think that the breakage fixed by my previous
commit masked this other breakage, and anything git execs from git-core
(as opposed to being buitin) has never worked in the OSX dmg.
2019-11-14 19:20:28 -04:00
Joey Hess
b321526473
OSX link libs into git-core directory
So that binaries in that directory can find the library next to them,
where they get modified to look.

This is a hack; it would be better for OSXMkLibs to build a list of what
libraries are needed where.

Unsure if this is needed due to a recent reversion, or is an older
problem, so updated changelog accordingly.
2019-11-14 18:31:58 -04:00
Joey Hess
5cc8cfe57b
oops I the filename 2019-11-14 16:34:13 -04:00
Joey Hess
f037ad92ec
OSX git-annex.app: Fix a regression that broke git-remote-https, git-remote-http, and git-shell
Putting the binaries in bundle/git-core/bin didn't work on OSX,
linker can't find the libraries next to those binaries where it expects to.
So instead put the binaries in the progDir.
2019-11-14 16:15:42 -04:00
Joey Hess
28733a3f5a
remove thing I never meant to commit 2019-11-14 16:11:58 -04:00
Joey Hess
842449b086
linuxstandalone: Fix a regression that broke git-remote-https. 2019-11-14 15:08:23 -04:00
Joey Hess
dfd9f4e5a1
Merge branch 'master' of ssh://git-annex.branchable.com 2019-11-14 14:04:20 -04:00
Joey Hess
bf179f64d1
add regression test 2019-11-14 14:02:09 -04:00
Joey Hess
667d38a8f1
Fix a crash (STM deadlock) when -J is used with multiple files that point to the same key
See the comment for a trace of the deadlock.

Added a new StartStage. New worker threads begin in the StartStage.
Once a thread is ready to do work, it moves away from the StartStage,
and no thread will ever transition back to it.

A thread that blocks waiting on another thread that is processing
the same key will block while in the StartStage. That other thread
will never switch back to the StartStage, and so the deadlock is avoided.
2019-11-14 13:51:09 -04:00
git-annex@17927e6dc041ab425c14217a97a685adf3ecf44f
db99ab74fc removed 2019-11-14 17:40:36 +00:00
git-annex@17927e6dc041ab425c14217a97a685adf3ecf44f
c547b75c20 Added a comment: Sometimes it sorta works 2019-11-14 17:24:29 +00:00
git-annex@17927e6dc041ab425c14217a97a685adf3ecf44f
4934edc661 Added a comment: Sometimes it sorta works 2019-11-14 17:24:12 +00:00
Joey Hess
20d9a9b662
provide a Show instance that works for all WorkerPools 2019-11-14 11:00:59 -04:00
git-annex@17927e6dc041ab425c14217a97a685adf3ecf44f
621128cfe5 2019-11-14 04:36:07 +00:00
yarikoptic
45ad67c6f0 forgotten /details 2019-11-14 03:28:27 +00:00
yarikoptic
25af2da994 initial report of standalone build regression 2019-11-14 03:27:37 +00:00
git-annex@17927e6dc041ab425c14217a97a685adf3ecf44f
9f6924356d Added a comment 2019-11-14 00:38:56 +00:00
Ilya_Shlyakhter
5330e3772f Added a comment: catch-all deadlock breaker 2019-11-13 22:33:59 +00:00
Joey Hess
6e59c652d2
clues 2019-11-13 18:07:44 -04:00
Joey Hess
5899aaffdb
response 2019-11-13 16:05:57 -04:00
Joey Hess
20a4a468a7
Merge branch 'master' of ssh://git-annex.branchable.com 2019-11-13 15:57:22 -04:00
Joey Hess
98954aaf2c
followup 2019-11-13 15:56:59 -04:00
git-annex@17927e6dc041ab425c14217a97a685adf3ecf44f
389e9c35df accidental dup
This reverts commit ece9429f44
2019-11-13 19:40:29 +00:00
git-annex@17927e6dc041ab425c14217a97a685adf3ecf44f
ece9429f44 2019-11-13 19:39:21 +00:00
git-annex@17927e6dc041ab425c14217a97a685adf3ecf44f
8ebcc32745 2019-11-13 19:38:56 +00:00
Joey Hess
0096db7b42
much flailing 2019-11-13 15:23:10 -04:00
yarikoptic
58be3af084 Added a comment 2019-11-13 04:41:56 +00:00
yarikoptic
31444109a7 initial bug report on parallel get of the same key 2019-11-12 21:47:39 +00:00
Joey Hess
3129923867
comment 2019-11-12 16:37:24 -04:00
Joey Hess
48748acc87
Merge branch 'master' of ssh://git-annex.branchable.com 2019-11-12 14:14:54 -04:00
nhatkhai
b68d19238e 2019-11-12 18:05:56 +00:00
Joey Hess
890330f0fe
make --json-error-messages capture url download errors
Convert Utility.Url to return Either String so the error message can be
displated in the annex monad and so captured.

(When curl is used, its errors are still not caught.)
2019-11-12 13:52:38 -04:00