mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' into sqlite

Browse source
This commit is contained in:
Joey Hess 2019-11-07 13:20:04 -04:00
commit aa010108cd
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
5 changed files with 36 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

24
CHANGELOG
View file

@ -1,17 +1,31 @@
git-annex (7.20191025) UNRELEASED; urgency=medium git-annex (8.20191107) UNRELEASED; urgency=medium
* init: Fix bug that lost modifications to unlocked files when init is * New v8 repository version.
re-ran in an already initialized repo. * v7 upgrades automatically to v8.
* benchmark: Add --databases to benchmark sqlite databases. * Any incremental fscks that were started in v7 won't resume where
they left off in v8, but will instead begin again from the first file.
* An interrupted export that was started in v7 won't resume where it left
off after upgrade to v8; files will be re-uploaded to the export remote.
* After the upgrade, git-annex will in some situations have to do extra
work while it finishes populating its sqlite databases.
* Add some missing indexes to sqlite databases. This will speed up * Add some missing indexes to sqlite databases. This will speed up
some things involving export and import remotes, and git-annex smudge. some things involving export and import remotes, and git-annex smudge.
Microbenchmarks show around 10-25% speedup of sqlite database operations.
* Improved serialization of filenames and keys to the sqlite databases, * Improved serialization of filenames and keys to the sqlite databases,
avoiding some encoding problems. avoiding encoding problems.
* Windows: Fix handling of changes to time zone. (Used to work but was * Windows: Fix handling of changes to time zone. (Used to work but was
broken in version 7.20181031.) broken in version 7.20181031.)
-- Joey Hess <id@joeyh.name> Tue, 29 Oct 2019 15:13:03 -0400 -- Joey Hess <id@joeyh.name> Tue, 29 Oct 2019 15:13:03 -0400
git-annex (7.20191106) upstream; urgency=medium
* init: Fix bug that lost modifications to unlocked files when init is
re-ran in an already initialized repo.
* benchmark: Add --databases to benchmark sqlite databases.
-- Joey Hess <id@joeyh.name> Wed, 06 Nov 2019 12:14:50 -0400
git-annex (7.20191024) upstream; urgency=medium git-annex (7.20191024) upstream; urgency=medium
* Changed git add/git commit -a default behavior back to what it was * Changed git add/git commit -a default behavior back to what it was

62
doc/news/version_7.20190912.mdwn
View file

@ -1,62 +0,0 @@
News for git-annex 7.20190912:
This version of git-annex uses repository version 7 for all repositories.
Existing v5 repositories will be automatically upgraded by default.
You can prevent this, by runing: git config annex.autoupgraderepository false
A v7 repository can can have some files locked while other files are
unlocked, and all git and git-annex commands can be used on both locked and
unlocked files. It's a good idea to make sure that all users of the
repository have upgraded git-annex and upgraded their repositories
to the new version before starting to use that feature, since old
versions of git-annex will ignore the new unlocked files.
The behavior of some commands changes in an upgraded repository:
* `git add` will add files to the annex, rather than adding them directly
to the git repository. To cause some files to be added directly
to git, you can configure `annex.largefiles`. For example:
git config annex.largefiles "largerthan=100kb and not (include=*.c or include=*.h)"
* `git annex unlock` and `git annex lock` change how the pointer to
the annexed content is stored in git. If you commit the change,
that will impact all clones of the repository.
git-annex 7.20190912 released with [[!toggle text="these changes"]]
[[!toggleable text="""
* Default to v7 for new repositories.
* Automatically upgrade v5 repositories to v7.
* Automatically convert direct mode repositories to v7 with adjusted
unlocked branches and set annex.thin.
* Added annex.autoupgraderepository configuration that can be set to false
to prevent any automatic repository upgrades.
* Refuse to upgrade direct mode repositories when git is older than 2.22,
which fixed a memory leak that could cause an OOM during the upgrade.
* Removed support for git versions older than 2.1.
* assistant: When creating a new repository, no longer use direct
mode, instead use v7 adjusted branches with annex.thin.
* init: When run on a crippled filesystem with --version=5,
will error out, since version 7 is needed for adjusted unlocked branch.
* direct: This command always errors out as direct mode is no longer
supported.
* indirect: This command has become a deprecated noop.
* proxy: This command is deprecated because it was only needed in direct
mode. (But it continues to work.)
* info: Removed the "repository mode" from its output (including the
--json output) since with the removal of direct mode, there is no
repository mode.
* info: When file matching options are specified when getting
info of something other than a directory, they won't have any effect,
so error out to avoid confusion.
* info: Display trust level when getting info on a uuid, same as a remote.
* When upgrading a direct mode repo to v7 with adjusted unlocked branches,
fix a bug that prevented annex.thin from taking effect for the files
in working tree.
* Avoid making a commit when upgrading from direct mode to v7.
* init: Catch more exceptions when testing locking.
* init: Fix a reversion that broke initialization on systems that
need to use pid locking.
* A git-annex-standalone rpm is now distributed along with the standalone
tarball.
* Added standalone/rpm/rpmbuild-from-standalone-tarball script."""]]

11
doc/news/version_7.20191024/comment_2_209826312977675475affe8f669dfa73._comment Normal file
View file

@ -0,0 +1,11 @@
[[!comment format=mdwn
username="nivek-retsof@97a405d1563af7581f6c8d1f7bae67b0ce896721"
nickname="nivek-retsof"
avatar="http://cdn.libravatar.org/avatar/3aec9a88897e105952a4ed38007fb224"
subject="Thanks!"
date="2019-11-05T22:18:49Z"
content="""
This behavior makes more sense to me. I like keeping my text files in git and binaries in git-annex, and treating them separately is no great mental burden.
Thanks for your great work. Git-annex has become one of the best parts of my computing experience. It is a great relief knowing that my files are in a robust distributed and redundant collection that is easy to maintain.
"""]]

5
doc/news/version_7.20191106.mdwn Normal file
View file

@ -0,0 +1,5 @@
git-annex 7.20191106 released with [[!toggle text="these changes"]]
[[!toggleable text="""
* init: Fix bug that lost modifications to unlocked files when init is
re-ran in an already initialized repo.
* benchmark: Add --databases to benchmark sqlite databases."""]]

2
git-annex.cabal
View file

@ -1,5 +1,5 @@
Name: git-annex Name: git-annex
Version: 7.20191024 Version: 7.20191106
Cabal-Version: >= 1.8 Cabal-Version: >= 1.8
License: AGPL-3 License: AGPL-3
Maintainer: Joey Hess <id@joeyh.name> Maintainer: Joey Hess <id@joeyh.name>