From 94d9c28a63ffaf1f7bc5163d75d7492bb66c4da4 Mon Sep 17 00:00:00 2001
From: Stephen Morgan <morgan.stephen99@gmail.com>
Date: Tue, 28 Sep 2021 10:35:41 +1000
Subject: [PATCH] cln: Replace all uses of deprecated !include with include.

Also include a test which makes sure !include is still parsed.
---
 examples/all.journal              | 12 ++++++------
 examples/current.journal          |  4 ++--
 hledger/Hledger/Cli/Commands.hs   |  2 +-
 hledger/test/journal/include.test | 12 +++++++++++-
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/examples/all.journal b/examples/all.journal
index e48a242c5..b18319b65 100644
--- a/examples/all.journal
+++ b/examples/all.journal
@@ -1,8 +1,8 @@
 ; all years
 
-!include 2006.journal
-!include 2007.journal
-!include 2008.journal
-!include 2009.journal
-!include 2010.journal
-!include 2011.journal
+include 2006.journal
+include 2007.journal
+include 2008.journal
+include 2009.journal
+include 2010.journal
+include 2011.journal
diff --git a/examples/current.journal b/examples/current.journal
index eb4fa4ff7..8d5e76501 100644
--- a/examples/current.journal
+++ b/examples/current.journal
@@ -1,4 +1,4 @@
 ; current/recent years
 
-;!include 2010.journal
-!include 2011.journal
+;include 2010.journal
+include 2011.journal
diff --git a/hledger/Hledger/Cli/Commands.hs b/hledger/Hledger/Cli/Commands.hs
index 4b92a2e91..f040006dc 100644
--- a/hledger/Hledger/Cli/Commands.hs
+++ b/hledger/Hledger/Cli/Commands.hs
@@ -492,7 +492,7 @@ defaultyear_journal_txt = T.unlines
 --  ]
 
 -- journal4_str = unlines
---  ["!include \"somefile\""
+--  ["include \"somefile\""
 --  ,"2007/01/27 * joes diner"
 --  ,"  expenses:food:dining                    $10.00"
 --  ,"  assets:checking                        $-47.18"
diff --git a/hledger/test/journal/include.test b/hledger/test/journal/include.test
index 6710dea9c..75cdf6676 100644
--- a/hledger/test/journal/include.test
+++ b/hledger/test/journal/include.test
@@ -1,5 +1,5 @@
 # 1. nested includes in subdirectories
- mkdir -p b/c/d ; printf '2010/1/1\n (D)  1\n' >b/c/d/d.journal ; printf '2010/1/1\n (C)  1\n!include d/d.journal\n' >b/c/c.journal ; printf '2010/1/1\n (B)  1\n!include c/c.journal\n' >b/b.journal ; printf '2010/1/1\n (A)  1\n!include b/b.journal\n' >a.journal ; hledger -f a.journal print; rm -rf a.journal b
+ mkdir -p b/c/d ; printf '2010/1/1\n (D)  1\n' >b/c/d/d.journal ; printf '2010/1/1\n (C)  1\ninclude d/d.journal\n' >b/c/c.journal ; printf '2010/1/1\n (B)  1\ninclude c/c.journal\n' >b/b.journal ; printf '2010/1/1\n (A)  1\ninclude b/b.journal\n' >a.journal ; hledger -f a.journal print; rm -rf a.journal bG
 >>>
 2010-01-01
     (A)               1
@@ -90,3 +90,13 @@ _c
 _d
 >>>2
 >>>=0
+
+# 9. include using old !include directive
+ printf '2018/01/01\n (A)  1\n' >f.journal; hledger -f - print; rm -f f.journal
+<<<
+!include f.journal
+>>>
+2018-01-01
+    (A)               1
+
+>>>=0