From 85c05c15f76fbd98a17041794951104f16862de8 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Tue, 14 Feb 2017 10:28:37 +0100
Subject: [PATCH] Use 'darcs show' rather than 'darcs query'.

darcs query has been removed from recent versions.
---
 Data/FileStore/Darcs.hs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Data/FileStore/Darcs.hs b/Data/FileStore/Darcs.hs
index 2f5269d..83c07cd 100644
--- a/Data/FileStore/Darcs.hs
+++ b/Data/FileStore/Darcs.hs
@@ -49,7 +49,7 @@ darcsFileStore repo = FileStore {
   , directory       = darcsDirectory repo
   , search          = darcsSearch repo
   , idsMatch        = const hashsMatch repo }
-                   
+
 -- | Run a darcs command and return error status, error output, standard output.  The repository
 -- is used as working directory.
 runDarcsCommand :: FilePath -> String -> [String] -> IO (ExitCode, String, B.ByteString)
@@ -187,13 +187,14 @@ darcsRetrieve repo name mbId = do
   let opts = case mbId of
               Nothing    -> ["contents", name]
               Just revid -> ["contents", "--match=hash " ++ revid, name]
-  (status, err, output) <- runDarcsCommand repo "query" opts
+  (status, err, output) <- runDarcsCommand repo "show" opts
   if B.null output
      then do
-       (_, _, out) <- runDarcsCommand repo "query" (["files", "--no-directories"] ++ opts)
+       (_, _, out) <- runDarcsCommand repo "show" (["files", "--no-directories"] ++ opts)
        if B.null out || null (filter (== name) . getNames $ output)
-         then throwIO NotFound else return ()
-         else return ()
+          then throwIO NotFound
+          else return ()
+     else return ()
   if status == ExitSuccess
      then return $ fromByteString output
      else throwIO $ UnknownError $ "Error in darcs query contents:\n" ++ err