git-annex.git
6 years agodevblog
Joey Hess [Tue, 26 Nov 2019 20:12:14 +0000 (16:12 -0400)]
devblog

6 years agotodo for bs branch
Joey Hess [Tue, 26 Nov 2019 20:11:55 +0000 (16:11 -0400)]
todo for bs branch

6 years agoAdded a comment: even git mv -f seems to work correctly
Ilya_Shlyakhter [Sun, 24 Nov 2019 17:25:32 +0000 (17:25 +0000)]
Added a comment: even git mv -f seems to work correctly

6 years agoAdded a comment: moving unlocked file onto locked file isn't possible
Ilya_Shlyakhter [Sun, 24 Nov 2019 16:36:24 +0000 (16:36 +0000)]
Added a comment: moving unlocked file onto locked file isn't possible

6 years agoexplict export lists
Joey Hess [Sat, 23 Nov 2019 15:07:22 +0000 (11:07 -0400)]
explict export lists

A small amount of dead code removed.

All of Utility/ done now.

This commit was sponsored by Brock Spratlen on Patreon.

6 years agotypo
Joey Hess [Fri, 22 Nov 2019 23:48:34 +0000 (19:48 -0400)]
typo

6 years agotodo
Joey Hess [Fri, 22 Nov 2019 23:47:53 +0000 (19:47 -0400)]
todo

6 years agoupdated profiling
Joey Hess [Fri, 22 Nov 2019 23:13:35 +0000 (19:13 -0400)]
updated profiling

6 years agominor optimisation
Joey Hess [Fri, 22 Nov 2019 23:13:05 +0000 (19:13 -0400)]
minor optimisation

avoid repeated scan of the same bytestring

6 years agoMerge /home/joey/tmp/git-annex
Joey Hess [Fri, 22 Nov 2019 21:51:40 +0000 (17:51 -0400)]
Merge /home/joey/tmp/git-annex

6 years agocache the serialization of a Key
Joey Hess [Fri, 22 Nov 2019 20:24:04 +0000 (16:24 -0400)]
cache the serialization of a Key

This will speed up the common case where a Key is deserialized from
disk, but is then serialized to build eg, the path to the annex object.

Previously attempted in 4536c93bb2ecf114ab711beac33fa358facd6985
and reverted in 96aba8eff7597898f53bfbab5865ff30a927d355.
The problems mentioned in the latter commit are addressed now:

Read/Show of KeyData is backwards-compatible with Read/Show of Key from before
this change, so Types.Distribution will keep working.

The Eq instance is fixed.

Also, Key has smart constructors, avoiding needing to remember to update
the cached serialization.

Used git-annex benchmark:
  find is 7% faster
  whereis is 3% faster
  get when all files are already present is 5% faster
Generally, the benchmarks are running 0.1 seconds faster per 2000 files,
on a ram disk in my laptop.

6 years agoimprove hints about squelching output
Joey Hess [Fri, 22 Nov 2019 21:26:13 +0000 (17:26 -0400)]
improve hints about squelching output

6 years ago(Build-)depend on git >= 2.22 to avoid memory leaked git being bundled or used
Yaroslav Halchenko [Fri, 22 Nov 2019 14:26:01 +0000 (09:26 -0500)]
(Build-)depend on git >= 2.22 to avoid memory leaked git being bundled or used

Note from Joey:
  git-annex still supports git 2.1, but operates in a degraded fashion.
  It would be better for backports of the debian package to also
  backport a newer git. This dependency is mostly expressing that,
  also that any users who might upgrade git-annex should also upgrade
  git.

  Also worth noting that the i386ancient autobuilder has git 2.1 on it
  (best I have been able to manage there), but luckily the epoch is
  bumped to 2, so the dependencies will still be satisfied.

6 years agosquelch tab warnings
Joey Hess [Fri, 22 Nov 2019 16:49:41 +0000 (12:49 -0400)]
squelch tab warnings

6 years agomissed an export
Joey Hess [Fri, 22 Nov 2019 16:35:57 +0000 (12:35 -0400)]
missed an export

6 years agoclose as dup
Joey Hess [Fri, 22 Nov 2019 16:11:04 +0000 (12:11 -0400)]
close as dup

6 years agoclose not viable
Joey Hess [Fri, 22 Nov 2019 16:08:41 +0000 (12:08 -0400)]
close not viable

6 years agosimplify the name of the test cases
Joey Hess [Thu, 21 Nov 2019 21:38:58 +0000 (17:38 -0400)]
simplify the name of the test cases

6 years agoWindows: Fix handling of changes to time zone.
Joey Hess [Wed, 6 Nov 2019 18:36:49 +0000 (14:36 -0400)]
Windows: Fix handling of changes to time zone.

Used to work but was broken in version 7.20181031, specifically commit
5ab0f48ffbd69029feb8cd101776c46ec86d6209.

That this was not noticed over at least 1 daylight savings time zone
changes makes me wonder if the TSDelta stuff is still needed.
Perhaps the mtime on Windows no longer changes when the time zone is changed?

(cherry picked from commit 09ee6b0ccb10059d44fd9a89f07646b35b718563)

6 years agoimprove benchmark --databases
Joey Hess [Thu, 21 Nov 2019 21:25:20 +0000 (17:25 -0400)]
improve benchmark --databases

* benchmark: Changed --databases to take a parameter specifiying the size
  of the database to benchmark.
* benchmark --databases: Display size of the populated database.
* benchmark --databases: Improve the "addAssociatedFile to (new)"
  benchmark to really add new values, not overwriting old values.

6 years agoexplict export lists
Joey Hess [Thu, 21 Nov 2019 19:38:06 +0000 (15:38 -0400)]
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'

6 years agoavoid running scanUnlockedFiles in bare repo
Joey Hess [Thu, 21 Nov 2019 18:31:12 +0000 (14:31 -0400)]
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.

6 years agoAdded a comment
xwvvvvwx [Thu, 21 Nov 2019 17:32:31 +0000 (17:32 +0000)]
Added a comment

6 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Thu, 21 Nov 2019 17:31:47 +0000 (13:31 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

6 years agoFix bug that made bare repos be treated as non-bare when --git-dir was used.
Joey Hess [Thu, 21 Nov 2019 17:16:42 +0000 (13:16 -0400)]
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.

6 years agoremoved
git-annex@17927e6dc041ab425c14217a97a685adf3ecf44f [Wed, 20 Nov 2019 20:11:17 +0000 (20:11 +0000)]
removed

6 years agoAdded a comment: git add or git commit does not trigger assistant, but git rm does
git-annex@17927e6dc041ab425c14217a97a685adf3ecf44f [Wed, 20 Nov 2019 01:37:42 +0000 (01:37 +0000)]
Added a comment: git add or git commit does not trigger assistant, but git rm does

6 years agoAdded a comment: git add or git commit does not trigger assistant, but git rm does
git-annex@17927e6dc041ab425c14217a97a685adf3ecf44f [Wed, 20 Nov 2019 01:37:16 +0000 (01:37 +0000)]
Added a comment: git add or git commit does not trigger assistant, but git rm does

6 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Tue, 19 Nov 2019 18:13:22 +0000 (14:13 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

6 years agotodo
Joey Hess [Tue, 19 Nov 2019 18:13:01 +0000 (14:13 -0400)]
todo

6 years agoAdded a comment: using hardlinks
Ilya_Shlyakhter [Tue, 19 Nov 2019 17:51:08 +0000 (17:51 +0000)]
Added a comment: using hardlinks

6 years agoAdded a comment: import/export
Ilya_Shlyakhter [Tue, 19 Nov 2019 17:39:47 +0000 (17:39 +0000)]
Added a comment: import/export

6 years agoencourage use of import from directory special remote rather than legacy interface
Joey Hess [Tue, 19 Nov 2019 17:26:27 +0000 (13:26 -0400)]
encourage use of import from directory special remote rather than legacy interface

6 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Tue, 19 Nov 2019 17:20:31 +0000 (13:20 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

6 years agocomments
Joey Hess [Tue, 19 Nov 2019 17:19:45 +0000 (13:19 -0400)]
comments

6 years agoAdded a comment
git-annex@17927e6dc041ab425c14217a97a685adf3ecf44f [Tue, 19 Nov 2019 17:18:18 +0000 (17:18 +0000)]
Added a comment

6 years agocomment
Joey Hess [Tue, 19 Nov 2019 17:14:56 +0000 (13:14 -0400)]
comment

6 years agocomments
Joey Hess [Tue, 19 Nov 2019 17:07:54 +0000 (13:07 -0400)]
comments

6 years agoRevert malicious removal of index page
Joey Hess [Tue, 19 Nov 2019 16:36:48 +0000 (12:36 -0400)]
Revert malicious removal of index page

This reverts commit 748a228ee7c22f17ebae3387bbd1d3528672fc46.

6 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Mon, 18 Nov 2019 21:25:40 +0000 (17:25 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

6 years agoAdded a comment: Re: using hardlinks
satya.ortiz-gagne@a4c92de91eb4fd5ae8fc9893bb4fd674a19f2e59 [Mon, 18 Nov 2019 20:46:22 +0000 (20:46 +0000)]
Added a comment: Re: using hardlinks

6 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Mon, 18 Nov 2019 20:27:17 +0000 (16:27 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

6 years agodevblog
Joey Hess [Mon, 18 Nov 2019 20:27:06 +0000 (16:27 -0400)]
devblog

6 years agosync, assistant: Pull and push from git-lfs remotes.
Joey Hess [Mon, 18 Nov 2019 20:13:21 +0000 (16:13 -0400)]
sync, assistant: Pull and push from git-lfs remotes.

Oversight, forgot to add it to gitSyncableRemote

6 years agogit-lfs: remember urls, and autoenable remotes using known urls
Joey Hess [Mon, 18 Nov 2019 20:09:09 +0000 (16:09 -0400)]
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.

6 years agoAdded a comment: using hardlinks
Ilya_Shlyakhter [Mon, 18 Nov 2019 19:21:18 +0000 (19:21 +0000)]
Added a comment: using hardlinks

6 years ago(no commit message)
satya.ortiz-gagne@a4c92de91eb4fd5ae8fc9893bb4fd674a19f2e59 [Mon, 18 Nov 2019 18:56:31 +0000 (18:56 +0000)]

6 years agotodo
Joey Hess [Mon, 18 Nov 2019 17:57:16 +0000 (13:57 -0400)]
todo

6 years agoupdate docs
Joey Hess [Mon, 18 Nov 2019 17:12:46 +0000 (13:12 -0400)]
update docs

http basic auth has been supported for some time, these docs predate
that support

6 years agoremoved
VSV [Sun, 17 Nov 2019 06:46:05 +0000 (06:46 +0000)]
removed

6 years ago(no commit message)
stefan.huchler@5f110ab85a15aec7e2b38586eb7ec37b12e2e6aa [Sat, 16 Nov 2019 05:53:02 +0000 (05:53 +0000)]

6 years agoadded todo "change git-annex-import not to delete original files by default"
Ilya_Shlyakhter [Fri, 15 Nov 2019 18:53:16 +0000 (18:53 +0000)]
added todo "change git-annex-import not to delete original files by default"

6 years agostop displaying rsync progress, and use git-annex's own progress display for local...
Joey Hess [Fri, 15 Nov 2019 16:01:30 +0000 (12:01 -0400)]
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.

6 years agofix build after Utility.Url changes
Joey Hess [Fri, 15 Nov 2019 02:25:06 +0000 (22:25 -0400)]
fix build after Utility.Url changes

6 years agoadd news item for git-annex 7.20191114
Joey Hess [Fri, 15 Nov 2019 01:59:04 +0000 (21:59 -0400)]
add news item for git-annex 7.20191114

6 years agoreleasing package git-annex version 7.20191114
Joey Hess [Fri, 15 Nov 2019 01:58:23 +0000 (21:58 -0400)]
releasing package git-annex version 7.20191114

6 years agofix GIT_EXEC_PATH to point to bundle/git-core
Joey Hess [Thu, 14 Nov 2019 23:20:28 +0000 (19:20 -0400)]
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.

6 years agoOSX link libs into git-core directory
Joey Hess [Thu, 14 Nov 2019 22:31:58 +0000 (18:31 -0400)]
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.

6 years agooops I the filename
Joey Hess [Thu, 14 Nov 2019 20:34:13 +0000 (16:34 -0400)]
oops I the filename

6 years agoOSX git-annex.app: Fix a regression that broke git-remote-https, git-remote-http...
Joey Hess [Thu, 14 Nov 2019 20:15:42 +0000 (16:15 -0400)]
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.

6 years agoremove thing I never meant to commit
Joey Hess [Thu, 14 Nov 2019 20:11:58 +0000 (16:11 -0400)]
remove thing I never meant to commit

6 years agolinuxstandalone: Fix a regression that broke git-remote-https.
Joey Hess [Thu, 14 Nov 2019 19:08:23 +0000 (15:08 -0400)]
linuxstandalone: Fix a regression that broke git-remote-https.

6 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Thu, 14 Nov 2019 18:04:20 +0000 (14:04 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

6 years agoadd regression test
Joey Hess [Thu, 14 Nov 2019 18:02:09 +0000 (14:02 -0400)]
add regression test

6 years agoFix a crash (STM deadlock) when -J is used with multiple files that point to the...
Joey Hess [Thu, 14 Nov 2019 15:31:43 +0000 (11:31 -0400)]
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.

6 years agoremoved
git-annex@17927e6dc041ab425c14217a97a685adf3ecf44f [Thu, 14 Nov 2019 17:40:36 +0000 (17:40 +0000)]
removed

6 years agoAdded a comment: Sometimes it sorta works
git-annex@17927e6dc041ab425c14217a97a685adf3ecf44f [Thu, 14 Nov 2019 17:24:29 +0000 (17:24 +0000)]
Added a comment: Sometimes it sorta works

6 years agoAdded a comment: Sometimes it sorta works
git-annex@17927e6dc041ab425c14217a97a685adf3ecf44f [Thu, 14 Nov 2019 17:24:12 +0000 (17:24 +0000)]
Added a comment: Sometimes it sorta works

6 years agoprovide a Show instance that works for all WorkerPools
Joey Hess [Thu, 14 Nov 2019 15:00:59 +0000 (11:00 -0400)]
provide a Show instance that works for all WorkerPools

6 years ago(no commit message)
git-annex@17927e6dc041ab425c14217a97a685adf3ecf44f [Thu, 14 Nov 2019 04:36:07 +0000 (04:36 +0000)]

6 years agoforgotten /details
yarikoptic [Thu, 14 Nov 2019 03:28:27 +0000 (03:28 +0000)]
forgotten /details

6 years agoinitial report of standalone build regression
yarikoptic [Thu, 14 Nov 2019 03:27:37 +0000 (03:27 +0000)]
initial report of standalone build regression

6 years agoAdded a comment
git-annex@17927e6dc041ab425c14217a97a685adf3ecf44f [Thu, 14 Nov 2019 00:38:56 +0000 (00:38 +0000)]
Added a comment

6 years agoAdded a comment: catch-all deadlock breaker
Ilya_Shlyakhter [Wed, 13 Nov 2019 22:33:59 +0000 (22:33 +0000)]
Added a comment: catch-all deadlock breaker

6 years agoclues
Joey Hess [Wed, 13 Nov 2019 22:07:44 +0000 (18:07 -0400)]
clues

6 years agoresponse
Joey Hess [Wed, 13 Nov 2019 20:05:57 +0000 (16:05 -0400)]
response

6 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Wed, 13 Nov 2019 19:57:22 +0000 (15:57 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

6 years agofollowup
Joey Hess [Wed, 13 Nov 2019 19:56:59 +0000 (15:56 -0400)]
followup

6 years agoaccidental dup
git-annex@17927e6dc041ab425c14217a97a685adf3ecf44f [Wed, 13 Nov 2019 19:40:29 +0000 (19:40 +0000)]
accidental dup

This reverts commit ece9429f4441345d6568ba1284054068d1c52ec1

6 years ago(no commit message)
git-annex@17927e6dc041ab425c14217a97a685adf3ecf44f [Wed, 13 Nov 2019 19:39:21 +0000 (19:39 +0000)]

6 years ago(no commit message)
git-annex@17927e6dc041ab425c14217a97a685adf3ecf44f [Wed, 13 Nov 2019 19:38:56 +0000 (19:38 +0000)]

6 years agomuch flailing
Joey Hess [Wed, 13 Nov 2019 19:23:10 +0000 (15:23 -0400)]
much flailing

6 years agoAdded a comment
yarikoptic [Wed, 13 Nov 2019 04:41:56 +0000 (04:41 +0000)]
Added a comment

6 years agoinitial bug report on parallel get of the same key
yarikoptic [Tue, 12 Nov 2019 21:47:39 +0000 (21:47 +0000)]
initial bug report on parallel get of the same key

6 years agocomment
Joey Hess [Tue, 12 Nov 2019 20:37:24 +0000 (16:37 -0400)]
comment

6 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Tue, 12 Nov 2019 18:14:54 +0000 (14:14 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

6 years ago(no commit message)
nhatkhai [Tue, 12 Nov 2019 18:05:56 +0000 (18:05 +0000)]

6 years agomake --json-error-messages capture url download errors
Joey Hess [Tue, 12 Nov 2019 17:33:41 +0000 (13:33 -0400)]
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.)

6 years agoAdded a comment: Another use case -- http_proxy
yarikoptic [Tue, 12 Nov 2019 17:51:25 +0000 (17:51 +0000)]
Added a comment: Another use case -- http_proxy

6 years agoremove one more warningIO
Joey Hess [Tue, 12 Nov 2019 14:44:51 +0000 (10:44 -0400)]
remove one more warningIO

Had to generalize Git.Queue so it can run an Annex action, yipes.

Only remaining warningIO are in the legacy chunk code.

6 years agouse fromRepo
Joey Hess [Tue, 12 Nov 2019 14:32:14 +0000 (10:32 -0400)]
use fromRepo

6 years agoremove some unncessary uses of warningIO
Joey Hess [Tue, 12 Nov 2019 14:07:27 +0000 (10:07 -0400)]
remove some unncessary uses of warningIO

warningIO is not concurrent output safe, and it doesn't go to
--json-error-messages

There are a few more that would be too hard to remove, and there are also
several dozen direct prints to stderr still.

6 years agorefactor
Joey Hess [Mon, 11 Nov 2019 22:20:35 +0000 (18:20 -0400)]
refactor

Better to not have a single function module, and better to have a more
specific type than Bool.

This commit was sponsored by Jack Hill on Patreon

6 years agoAdded annex.allowsign option.
Joey Hess [Mon, 11 Nov 2019 20:15:05 +0000 (16:15 -0400)]
Added annex.allowsign option.

This commit was sponsored by Ilya Shlyakhter on Patreon.

6 years agomention special remotes
Joey Hess [Mon, 11 Nov 2019 17:15:01 +0000 (13:15 -0400)]
mention special remotes

6 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Mon, 11 Nov 2019 16:53:00 +0000 (12:53 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

6 years agosome improvements to docs
Joey Hess [Mon, 11 Nov 2019 16:52:45 +0000 (12:52 -0400)]
some improvements to docs

6 years agotypo
Joey Hess [Mon, 11 Nov 2019 16:39:51 +0000 (12:39 -0400)]
typo

6 years agofix language
Joey Hess [Mon, 11 Nov 2019 16:36:57 +0000 (12:36 -0400)]
fix language

6 years agotypo
Joey Hess [Mon, 11 Nov 2019 16:36:05 +0000 (12:36 -0400)]
typo