mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

remove accidentially added debug prints

Browse source
This commit is contained in:
Joey Hess 2025-09-23 11:34:16 -04:00
commit a1cd61b1c4
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Annex/Import.hs
View file

@ -294,7 +294,6 @@ buildImportTrees
buildImportTrees basetree msubdir addunlockedmatcher (ImportedFull imported) = buildImportTrees basetree msubdir addunlockedmatcher (ImportedFull imported) =
buildImportTreesGeneric (convertImportTree addunlockedmatcher) basetree msubdir imported buildImportTreesGeneric (convertImportTree addunlockedmatcher) basetree msubdir imported
buildImportTrees basetree msubdir addunlockedmatcher (ImportedDiff (LastImportedTree oldtree) imported) = do buildImportTrees basetree msubdir addunlockedmatcher (ImportedDiff (LastImportedTree oldtree) imported) = do
liftIO $ print $ importableContents imported
importtree <- if null (importableContents imported) importtree <- if null (importableContents imported)
then pure oldtree then pure oldtree
else applydiff else applydiff
@ -309,7 +308,6 @@ buildImportTrees basetree msubdir addunlockedmatcher (ImportedDiff (LastImported
(importableContents imported) (importableContents imported)
newtreeitems <- catMaybes <$> mapM mktreeitem new newtreeitems <- catMaybes <$> mapM mktreeitem new
let removedfiles = map (mkloc . fst) removed let removedfiles = map (mkloc . fst) removed
liftIO $ print ("removed", removedfiles)
inRepo $ adjustTree inRepo $ adjustTree
(pure . Just) (pure . Just)
-- ^ keep files that are not added/removed the same -- ^ keep files that are not added/removed the same
@ -509,7 +507,7 @@ data ImportResult t
data Diffed t data Diffed t
= DiffChanged t = DiffChanged t
| DiffRemoved | DiffRemoved
deriving (Eq, Show) deriving (Eq)
data Imported data Imported
= ImportedFull (ImportableContentsChunkable Annex (Either Sha Key)) = ImportedFull (ImportableContentsChunkable Annex (Either Sha Key))
@ -579,9 +577,7 @@ importChanges remote importtreeconfig importcontent thirdpartypopulated importab
(diff, cleanup) <- inRepo $ Git.DiffTree.diffTreeRecursive (diff, cleanup) <- inRepo $ Git.DiffTree.diffTreeRecursive
prevcidtree prevcidtree
currcidtree currcidtree
liftIO $ print (diff, prevcidtree, currcidtree)
let (removed, changed) = partition isremoval diff let (removed, changed) = partition isremoval diff
liftIO $ print (removed, changed)
let mkicchanged ti = do let mkicchanged ti = do
v <- M.lookup (Git.DiffTree.dstsha ti) cidtreemap v <- M.lookup (Git.DiffTree.dstsha ti) cidtreemap
return (mkloc ti, v) return (mkloc ti, v)