screened 2024-06-29 10:15:19+00:00

bfrk · Jun 29, 2024 · aadc35c · aadc35c
1 parent 22e80c5
commit aadc35c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/src/Darcs/Repository/Clone.hs b/src/Darcs/Repository/Clone.hs
@@ -24,7 +24,6 @@ import Darcs.Repository.Identify ( identifyRepositoryFor, ReadingOrWriting(..) )
 import Darcs.Repository.Pristine
     ( applyToTentativePristine
     , createPristineDirectoryTree
-    , writePristine
     )
 import Darcs.Repository.Hashed
     ( copyHashedInventory
@@ -136,7 +135,7 @@ import Darcs.Patch.Witnesses.Ordered
     )
 import Darcs.Patch.PatchInfoAnd ( PatchInfoAnd, extractHash )
 
-import Darcs.Util.Tree( Tree, emptyTree )
+import Darcs.Util.Tree( Tree )
 
 import Darcs.Util.Exception ( catchall )
 import Darcs.Util.English ( englishNum, Noun(..) )
@@ -389,7 +388,6 @@ copyRepoOldFashioned :: forall p wU wR. (RepoPatch p, ApplyState p ~ Tree)
                         -> IO ()
 copyRepoOldFashioned fromRepo _toRepo verb withWorkingDir = do
   _toRepo <- revertRepositoryChanges _toRepo
-  _ <- writePristine _toRepo emptyTree
   patches <- readPatches fromRepo
   let k = "Copying patch"
   beginTedious k

diff --git a/src/Darcs/UI/Commands/Diff.hs b/src/Darcs/UI/Commands/Diff.hs
@@ -62,7 +62,7 @@ import Darcs.Util.Lock ( withTempDir )
 import Darcs.Util.Path ( AbsolutePath, AnchoredPath, isPrefix, toFilePath )
 import Darcs.Util.Printer ( Doc, putDocLn, text, vcat )
 import Darcs.Util.Prompt ( askEnter )
-import Darcs.Util.Tree.Hashed ( hashedTreeIO, writeDarcsHashed )
+import Darcs.Util.Tree.Hashed ( hashedTreeIO )
 import Darcs.Util.Tree.Plain ( writePlainTree )
 import Darcs.Util.Workaround ( getCurrentDirectory )
 
@@ -199,8 +199,6 @@ doDiff opts mpaths = withRepository (useCache ? opts) $ RepoJob $ \repository ->
         -- during the 'apply' and 'unapply' operations below.
         let cache = mkDirCache tdir
         pristine <- readPristine repository
-        -- fill our temporary cache
-        _ <- writeDarcsHashed pristine cache
 
         -- @base@ will be like our working tree, /except/ that it contains only
         -- the unrecorded changes that affect the given file paths, see comment

diff --git a/src/Darcs/Util/Tree/Hashed.hs b/src/Darcs/Util/Tree/Hashed.hs
@@ -47,7 +47,7 @@ import Darcs.Util.Hash
     )
 import Darcs.Util.Parser
 import Darcs.Util.Path ( Name, decodeWhiteName, encodeWhiteName )
-import Darcs.Util.Progress ( debugMessage, finishedOneIO, withSizedProgress )
+import Darcs.Util.Progress ( debugMessage )
 import Darcs.Util.Tree
     ( Blob(..)
     , ItemType(..)
@@ -197,14 +197,13 @@ writeDarcsHashed tree' cache = do
   debugMessage "writeDarcsHashed"
   t <- darcsUpdateDirHashes <$> expand tree'
   let items = list t
-  withSizedProgress "Getting pristine" (length items) $ \k -> do
-    sequence_ [readAndWriteBlob k b | (_, File b) <- items]
-    let dirs = darcsFormatDir t : [darcsFormatDir d | (_, SubTree d) <- items]
-    mapM_ (dump k) dirs
+  sequence_ [readAndWriteBlob b | (_, File b) <- items]
+  let dirs = darcsFormatDir t : [darcsFormatDir d | (_, SubTree d) <- items]
+  mapM_ dump dirs
   return (fromHash (darcsTreeHash t))
   where
-    readAndWriteBlob k b = readBlob b >>= dump k
-    dump k x = fsCreateHashedFile cache x >>= finishedOneIO k . encodeValidHash
+    readAndWriteBlob b = readBlob b >>= dump
+    dump x = fsCreateHashedFile cache x
 
 -- | Create a hashed file from a 'Cache' and file content. In case the file
 -- exists it is kept untouched and is assumed to have the right content.