From f47d423a67cbbf65e4660541ff9c732f9ca05b1c Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Thu, 21 Apr 2022 23:55:40 -1000
Subject: [PATCH] lib: error' now adds an Error: prefix

---
 hledger-lib/Hledger/Utils.hs           | 2 +-
 hledger/test/csv.test                  | 8 ++++----
 hledger/test/forecast.test             | 2 +-
 hledger/test/journal/parse-errors.test | 4 ++--
 hledger/test/roi.test                  | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/hledger-lib/Hledger/Utils.hs b/hledger-lib/Hledger/Utils.hs
index a80abc3ee..1f9a199ec 100644
--- a/hledger-lib/Hledger/Utils.hs
+++ b/hledger-lib/Hledger/Utils.hs
@@ -252,7 +252,7 @@ numDigitsInt n
 
 -- | Simpler alias for errorWithoutStackTrace
 error' :: String -> a
-error' = errorWithoutStackTrace
+error' = errorWithoutStackTrace . ("Error: " <>)
 
 -- | A version of errorWithoutStackTrace that adds a usage hint.
 usageError :: String -> a
diff --git a/hledger/test/csv.test b/hledger/test/csv.test
index b258d4f0d..7da5f240d 100644
--- a/hledger/test/csv.test
+++ b/hledger/test/csv.test
@@ -774,7 +774,7 @@ if|account2|comment
 %description Flubber|acct|
 $  ./csvtest.sh
 >2
-hledger: input.rules:6:1:
+hledger: Error: input.rules:6:1:
   |
 6 | %amount 150|acct2
   | ^
@@ -796,7 +796,7 @@ account2 acct
 comment cmt
 $  ./csvtest.sh
 >2
-hledger: input.rules:5:1:
+hledger: Error: input.rules:5:1:
   |
 5 | if Flubber
   | ^
@@ -822,7 +822,7 @@ if Flubber
 account2 %myaccount2
 $  ./csvtest.sh
 >2
-hledger: input.rules:6:3:
+hledger: Error: input.rules:6:3:
   |
 6 |   myaccount2 acct
   |   ^^^^^^^^^^^^
@@ -870,7 +870,7 @@ if account2 comment
 %description Flubber acct 
 $  ./csvtest.sh
 >2
-hledger: input.rules:5:1:
+hledger: Error: input.rules:5:1:
   |
 5 | if account2 comment
   | ^
diff --git a/hledger/test/forecast.test b/hledger/test/forecast.test
index 09a9a1e3c..3307d070e 100644
--- a/hledger/test/forecast.test
+++ b/hledger/test/forecast.test
@@ -172,7 +172,7 @@ Balance changes in 2016-10-01..2017-01-31:
 $ hledger bal -M -b 2016-10 -e 2017-02 -f - --forecast=20160801-foobar
 >
 >2
-hledger: could not parse forecast period : 1:10:
+hledger: Error: could not parse forecast period : 1:10:
   |
 1 | 20160801-foobar
   |          ^
diff --git a/hledger/test/journal/parse-errors.test b/hledger/test/journal/parse-errors.test
index 4d0b93df5..57ad081bd 100644
--- a/hledger/test/journal/parse-errors.test
+++ b/hledger/test/journal/parse-errors.test
@@ -8,7 +8,7 @@
 # 1.
 $ hledger -f - print
 >2
-hledger: -:1:5:
+hledger: Error: -:1:5:
   |
 1 | 2018
   |     ^
@@ -123,7 +123,7 @@ $ hledger -f- print
   b  1B
 $ hledger -f- print
 >2
-hledger: -:1-3
+hledger: Error: -:1-3
 could not balance this transaction:
 real postings all have the same sign
 2020-01-01
diff --git a/hledger/test/roi.test b/hledger/test/roi.test
index dfc1dcfdd..d360f06d0 100644
--- a/hledger/test/roi.test
+++ b/hledger/test/roi.test
@@ -238,7 +238,7 @@ hledger -f- roi -p 2019-11 --inv Investment --pnl PnL
   Assets:Checking    101 A
   Unrealized PnL
 >>>2
-hledger: Amounts could not be converted to a single cost basis: ["10 B","-10 B @@ 100 A"]
+hledger: Error: Amounts could not be converted to a single cost basis: ["10 B","-10 B @@ 100 A"]
 Consider using --value to force all costs to be in a single commodity.
 For example, "--cost --value=end,<commodity> --infer-market-prices", where commodity is the one that was used to pay for the investment.
 >>>=1