diff --git a/0001-Adapt-code-to-optparse-applicative-0.18.1-and-later.patch b/0001-Adapt-code-to-optparse-applicative-0.18.1-and-later.patch deleted file mode 100644 index b5b5591..0000000 --- a/0001-Adapt-code-to-optparse-applicative-0.18.1-and-later.patch +++ /dev/null @@ -1,42 +0,0 @@ -From e2c69174088403e41fd4988082509f7bc2bc39dd Mon Sep 17 00:00:00 2001 -From: Peter Simons -Date: Wed, 21 Jun 2023 16:46:54 +0200 -Subject: [PATCH] Adapt code to optparse-applicative 0.18.1 and later. - -optparse-applicative switched to the 'prettyprinter' library in its latest -release, which means the 'H.text' function has disappeared. Instead, 'H.pretty' -can be used to convert all 'Pretty a' types into a renderable document. ---- - CmdLine.hs | 2 +- - git-annex.cabal | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CmdLine.hs b/CmdLine.hs -index a170434107..004198c40a 100644 ---- a/CmdLine.hs -+++ b/CmdLine.hs -@@ -116,7 +116,7 @@ parseCmd progname progdesc allargs allcmds getparser = - <*> getparser c - <*> parserAnnexOptions (cmdannexoptions c) - synopsis n d = n ++ " - " ++ d -- intro = mconcat $ concatMap (\l -> [H.text l, H.line]) -+ intro = mconcat $ concatMap (\l -> [H.pretty l, H.line]) - (synopsis progname progdesc : commandList allcmds) - - {- Selects the Command that matches the subcommand name. -diff --git a/git-annex.cabal b/git-annex.cabal -index 53270e572a..4abbc7b686 100644 ---- a/git-annex.cabal -+++ b/git-annex.cabal -@@ -311,7 +311,7 @@ Executable git-annex - Build-Depends: - base (>= 4.11.1.0 && < 5.0), - network-uri (>= 2.6), -- optparse-applicative (>= 0.14.1), -+ optparse-applicative (>= 0.18.1), - containers (>= 0.5.8), - exceptions (>= 0.6), - stm (>= 2.3), --- -2.40.1 - diff --git a/git-annex-10.20230407.tar.gz b/git-annex-10.20230407.tar.gz deleted file mode 100644 index df59027..0000000 --- a/git-annex-10.20230407.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8aa3efbb77df1a047b538162ebb796c2249103d50e4af7ed1725aac40709cc80 -size 8768264 diff --git a/git-annex-10.20230626.tar.gz b/git-annex-10.20230626.tar.gz new file mode 100644 index 0000000..5e1e520 --- /dev/null +++ b/git-annex-10.20230626.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:acb92f104c10dfe8f0790af4d6d758e6e971bd908a87588f600d8ae9b2b27e57 +size 8880902 diff --git a/git-annex.changes b/git-annex.changes index ab4f499..dfe1d2c 100644 --- a/git-annex.changes +++ b/git-annex.changes @@ -1,3 +1,108 @@ +------------------------------------------------------------------- +Mon Jun 26 15:55:00 UTC 2023 - Peter Simons + +- Update git-annex to version 10.20230626. + git-annex (10.20230626) upstream; urgency=medium + + * Split out two new commands, git-annex pull and git-annex push. + Those plus a git commit are equivilant to git-annex sync. + (Note that the new commands default to syncing content, unless + annex.synccontent is explicitly set to false.) + * assist: New command, which is the same as git-annex sync but with + new files added and content transferred by default. + * sync: Started a transition to --content being enabled by default. + When used without --content or --no-content, warn about the upcoming + transition, and suggest using one of the options, or setting + annex.synccontent. + * sync: Added -g as a short option for --no-content. + * Many commands now quote filenames that contain unusual characters the + same way that git does, to avoid exposing control characters to the + terminal. + * Support core.quotePath, which can be set to false to display utf8 + characters as-is in filenames. + * Control characters in non-filename data coming from the repository or + other possible untrusted sources are filtered out of the display of many + commands. When the command output is intended for use in scripting, + control characters are only filtered out when displaying to the + terminal. + * find, findkeys, examinekey: When outputting to a terminal and --format + is not used, quote control characters. Output to a pipe is unchanged. + (Similar to the behavior of GNU find.) + * addurl --preserve-filename now rejects filenames that contain other + control characters, besides the escape sequences it already rejected. + * init: Avoid autoenabling special remotes that have control characters + in their names. + * Support core.sharedRepository=0xxx at long last. + * Support --json and --json-error-messages in many more commands + (addunused, configremote, dead, describe, dropunused, enableremote, + expire, fix, importfeed, init, initremote, log, merge, migrate, reinit, + reinject, rekey, renameremote, rmurl, semitrust, setpresentkey, trust, + unannex, undo, uninit, untrust, unused, upgrade) + * importfeed: Support -J + * importfeed: Support --json-progress + * httpalso: Support being used with special remotes that use chunking. + * Several significant speedups to importing large trees from special + remotes. Imports that took over an hour now take only a few minutes. + * Cache negative lookups of global numcopies and mincopies. + Speeds up eg git-annex sync --content by up to 50%. + * Speed up sync in an adjusted branch by avoiding re-adjusting the branch + unncessarily, particularly when it is adjusted with --hide-missing + or --unlock-present. + * config: Added the --show-origin and --for-file options. + * config: Support annex.numcopies and annex.mincopies. + * whereused: Fix display of branch:file when run in a subdirectory. + * enableremote: Support enableremote of a git remote (that was previously + set up with initremote) when additional parameters such as autoenable= + are passed. + * configremote: New command, currently limited to changing autoenable= + setting of a special remote. + * Honor --force option when operating on a local git remote. + * When a nonexistant file is passed to a command and + --json-error-messages is enabled, output a JSON object indicating the + problem. (But git ls-files --error-unmatch still displays errors about + such files in some situations.) + * Bug fix: Create .git/annex/, .git/annex/fsckdb, + .git/annex/sentinal, .git/annex/sentinal.cache, and + .git/annex/journal/* with permissions configured by core.sharedRepository. + * Bug fix: Lock files were created with wrong modes for some combinations + of core.sharedRepository and umask. + * initremote: Avoid creating a remote that is not encrypted when gpg is + broken. + * log: When --raw-date is used, display only seconds from the epoch, as + documented, omitting a trailing "s" that was included in the output + before. + * addunused: Displays the names of the files that it adds. + * reinject: Fix support for operating on multiple pairs of files and keys. + * sync: Fix buggy handling of --no-pull and --no-push when syncing + --content. With --no-pull, avoid downloading content, and with + --no-push avoid uploading content. This was done before, but + inconsistently. + * uninit: Avoid buffering the names of all annexed files in memory. + * Fix bug in -z handling of trailing NUL in input. + * version: Avoid error message when entire output is not read. + * Fix excessive CPU usage when parsing yt-dlp (or youtube-dl) progress + output fails. + * Use --progress-template with yt-dlp to fix a failure to parse + progress output when only an estimated total size is known. + * When yt-dlp is available, default to using it in preference to + youtube-dl. Using youtube-dl is now deprecated, and git-annex no longer + tries to parse its output to display download progress + * Improve resuming interrupted download when using yt-dlp or youtube-dl. + * assistant: Add dotfiles to git by default, unless annex.dotfiles + is configured, the same as git-annex add does. + * assistant --autostop: Avoid crashing when ~/.config/git-annex/autostart + lists a directory that it cannot chdir to. + * Fix display when run with -J1. + * assistant: Fix a crash when a small file is deleted immediately after + being created. + * repair: Fix handling of git ref names on Windows. + * repair: Fix a crash when .git/annex/journal/ does not exist. + * Support building with optparse-applicative 0.18.1 + (Thanks, Peter Simons) + +- Drop "0001-Adapt-code-to-optparse-applicative-0.18.1-and-later.patch", + which has become obsolete. + ------------------------------------------------------------------- Wed Jun 21 14:52:10 UTC 2023 - Peter Simons diff --git a/git-annex.spec b/git-annex.spec index 055b971..c82ccb9 100644 --- a/git-annex.spec +++ b/git-annex.spec @@ -17,14 +17,13 @@ Name: git-annex -Version: 10.20230407 +Version: 10.20230626 Release: 0 Summary: Manage files with git, without checking their contents into git License: AGPL-3.0-or-later AND GPL-3.0-or-later AND BSD-2-Clause AND MIT AND GPL-2.0-only URL: https://hackage.haskell.org/package/%{name} Source0: https://github.com/opensuse-haskell/git-annex/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Patch0: 0001-persistent-2.12.0.1-include-the-code-from-persistent.patch -Patch1: 0001-Adapt-code-to-optparse-applicative-0.18.1-and-later.patch BuildRequires: bash-completion BuildRequires: chrpath BuildRequires: curl