From 7059322a6c524cce15d409d44101c51f27bd2084 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 26 Sep 2022 16:06:49 -0400 Subject: [PATCH] Support "inbackend" in preferred content expressions Well, actually, fix a typo that has always been in the implementation of that. "inbacked" used to work, but let's not tell users about that; they might try to use it and expect git-annex to keep supporting the typo.. Sponsored-by: Jack Hill on Patreon --- Annex/FileMatcher.hs | 2 +- CHANGELOG | 3 ++- ...comment_6_f10a0c185fa2f2b4b8ec9fceaed6e8e1._comment | 10 ++++++++++ git-annex.cabal | 2 +- 4 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 doc/git-annex-preferred-content/comment_6_f10a0c185fa2f2b4b8ec9fceaed6e8e1._comment diff --git a/Annex/FileMatcher.hs b/Annex/FileMatcher.hs index 7a876debcc..8f09658994 100644 --- a/Annex/FileMatcher.hs +++ b/Annex/FileMatcher.hs @@ -180,7 +180,7 @@ preferredContentKeyedTokens pcd = , ValueToken "copies" (usev limitCopies) , ValueToken "lackingcopies" (usev $ limitLackingCopies False) , ValueToken "approxlackingcopies" (usev $ limitLackingCopies True) - , ValueToken "inbacked" (usev limitInBackend) + , ValueToken "inbackend" (usev limitInBackend) , ValueToken "metadata" (usev limitMetaData) , ValueToken "inallgroup" (usev $ limitInAllGroup $ getGroupMap pcd) ] ++ commonKeyedTokens diff --git a/CHANGELOG b/CHANGELOG index 9a202ccaf6..6cecf4d250 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -git-annex (10.20220823) UNRELEASED; urgency=medium +git-annex (10.20220927) UNRELEASED; urgency=medium * Fix a bug in the last release that caused v8 repositories to upgrade immediately to v10, rather than taking the scheduled 1 year to do so. @@ -43,6 +43,7 @@ git-annex (10.20220823) UNRELEASED; urgency=medium in a repository owned by another user. * p2p: Pass wormhole the --appid option before the receive/send command, as it does not accept that option after the command + * Support "inbackend" in preferred content expressions. -- Joey Hess Mon, 29 Aug 2022 15:03:04 -0400 diff --git a/doc/git-annex-preferred-content/comment_6_f10a0c185fa2f2b4b8ec9fceaed6e8e1._comment b/doc/git-annex-preferred-content/comment_6_f10a0c185fa2f2b4b8ec9fceaed6e8e1._comment new file mode 100644 index 0000000000..11d9c25844 --- /dev/null +++ b/doc/git-annex-preferred-content/comment_6_f10a0c185fa2f2b4b8ec9fceaed6e8e1._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 6""" + date="2022-09-26T19:53:52Z" + content=""" +@rinomizu5 congrats, you found a bug! + +I've fixed this, so you'll want to upgrade to version 10.20220927 when +it's released tomorrow. +"""]] diff --git a/git-annex.cabal b/git-annex.cabal index bea054e907..6b902b116d 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -1,5 +1,5 @@ Name: git-annex -Version: 10.20220822 +Version: 10.20220927 Cabal-Version: 1.12 License: AGPL-3 Maintainer: Joey Hess