Commit graph

35774 commits

Author SHA1 Message Date
Joey Hess
8ea5f3ff99
explict export lists
Eliminated some dead code. In other cases, exported a currently unused
function, since it was a logical part of the API.

Of course this improves the API documentation. It may also sometimes
let ghc optimize code better, since it can know a function is internal
to a module.

364 modules still to go, according to
git grep -E 'module [A-Za-z.]+ where'
2019-11-21 16:08:37 -04:00
Joey Hess
740e0ddbfe
avoid running scanUnlockedFiles in bare repo
It's not necessary. And if the bare repo somehow has a pointer
file in it with the same name as a file in HEAD, that file would be
populated, which would be surprising since the file is not really under
git's control.
2019-11-21 14:31:12 -04:00
xwvvvvwx
f39e5a4219 Added a comment 2019-11-21 17:32:31 +00:00
Joey Hess
c1d88305d7
Merge branch 'master' of ssh://git-annex.branchable.com 2019-11-21 13:31:47 -04:00
Joey Hess
43f19ef00a
Fix bug that made bare repos be treated as non-bare when --git-dir was used.
Eg:

git clone url --bare r
git --git-dir r annex init

This resulted in worktree = Just "." and so several things that check
worktree to determine when the repo is bare ran code paths intended for
non-bare. One such code path[1] ran git checkout with --worktree=. which
actually makes it ignore core.bare config, and so the current directory
got populated with a checkout of the master branch in this example. There
was probably also other breakage.

The fix is a bit complicated because whether the repo is bare is not
known until after Git.Config reads the config, but Git.Config handles
setting the RepoLocations's worktree when core.worktree is set. So have
to assume the worktree is the cwd, let core.worktree override that,
and then if the repo turns out to be bare, it's set back to Nothing.
(And then GIT_WORK_TREE can still override all of that.)

[1] switchHEADBack, which runs even when the clone is not from a bare repo.
2019-11-21 13:26:02 -04:00
git-annex@17927e6dc041ab425c14217a97a685adf3ecf44f
d5ef7fec71 removed 2019-11-20 20:11:17 +00:00
git-annex@17927e6dc041ab425c14217a97a685adf3ecf44f
1f0b0fba0f Added a comment: git add or git commit does not trigger assistant, but git rm does 2019-11-20 01:37:42 +00:00
git-annex@17927e6dc041ab425c14217a97a685adf3ecf44f
96008092eb Added a comment: git add or git commit does not trigger assistant, but git rm does 2019-11-20 01:37:16 +00:00
Joey Hess
64e21f683c
Merge branch 'master' of ssh://git-annex.branchable.com 2019-11-19 14:13:22 -04:00
Joey Hess
c0117044ae
todo 2019-11-19 14:13:01 -04:00
Ilya_Shlyakhter
3e4b5d2d93 Added a comment: using hardlinks 2019-11-19 17:51:08 +00:00
Ilya_Shlyakhter
0822ee52dd Added a comment: import/export 2019-11-19 17:39:47 +00:00
Joey Hess
6f35b576d7
encourage use of import from directory special remote rather than legacy interface 2019-11-19 13:30:27 -04:00
Joey Hess
c8355a7416
Merge branch 'master' of ssh://git-annex.branchable.com 2019-11-19 13:20:31 -04:00
Joey Hess
3b64e35694
comments 2019-11-19 13:19:45 -04:00
git-annex@17927e6dc041ab425c14217a97a685adf3ecf44f
c1eee5f259 Added a comment 2019-11-19 17:18:18 +00:00
Joey Hess
24c69a3c1f
comment 2019-11-19 13:14:56 -04:00
Joey Hess
581eb7a3de
comments 2019-11-19 13:07:54 -04:00
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