From b663822b88f5c1d909e7816b5c2e954be01dbe3c Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Mon, 9 Dec 2024 13:42:11 -1000 Subject: [PATCH] fix: print: ignore --depth entirely Until now, a depth limit caused print to show only transactions referencing accounts as deep or deeper than that. --- hledger-lib/Hledger/Reports/EntriesReport.hs | 4 ++-- hledger/test/print/print.test | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/hledger-lib/Hledger/Reports/EntriesReport.hs b/hledger-lib/Hledger/Reports/EntriesReport.hs index ce4e8c33b..827d01548 100644 --- a/hledger-lib/Hledger/Reports/EntriesReport.hs +++ b/hledger-lib/Hledger/Reports/EntriesReport.hs @@ -21,7 +21,7 @@ import Data.Ord (comparing) import Data.Time (fromGregorian) import Hledger.Data -import Hledger.Query (Query(..)) +import Hledger.Query (Query(..), filterQuery, queryIsDepth) import Hledger.Reports.ReportOptions import Hledger.Utils @@ -37,7 +37,7 @@ entriesReport :: ReportSpec -> Journal -> EntriesReport entriesReport rspec@ReportSpec{_rsReportOpts=ropts} = sortBy (comparing $ transactionDateFn ropts) . jtxns . journalApplyValuationFromOpts (setDefaultConversionOp NoConversionOp rspec) - . filterJournalTransactions (_rsQuery rspec) + . filterJournalTransactions (filterQuery (not.queryIsDepth) $ _rsQuery rspec) tests_EntriesReport = testGroup "EntriesReport" [ testGroup "entriesReport" [ diff --git a/hledger/test/print/print.test b/hledger/test/print/print.test index 5ce88382d..1b2c850d2 100644 --- a/hledger/test/print/print.test +++ b/hledger/test/print/print.test @@ -27,3 +27,14 @@ $ hledger -f- print -x z 0 B >= + +# ** 3. --depth does not affect print. +< +2023-01-01 + A:AA 0 A + +$ hledger -f- print --depth 1 +2023-01-01 + A:AA 0 A + +>=