summaryrefslogtreecommitdiff
path: root/Command
diff options
context:
space:
mode:
Diffstat (limited to 'Command')
-rw-r--r--Command/Add.hs3
-rw-r--r--Command/Copy.hs2
-rw-r--r--Command/Drop.hs2
-rw-r--r--Command/Find.hs2
-rw-r--r--Command/Fix.hs3
-rw-r--r--Command/Fsck.hs2
-rw-r--r--Command/Get.hs2
-rw-r--r--Command/List.hs3
-rw-r--r--Command/Lock.hs14
-rw-r--r--Command/Log.hs3
-rw-r--r--Command/MetaData.hs2
-rw-r--r--Command/Migrate.hs2
-rw-r--r--Command/Mirror.hs2
-rw-r--r--Command/Move.hs2
-rw-r--r--Command/Multicast.hs2
-rw-r--r--Command/PreCommit.hs5
-rw-r--r--Command/Sync.hs5
-rw-r--r--Command/Unannex.hs3
-rw-r--r--Command/Uninit.hs5
-rw-r--r--Command/Unlock.hs2
-rw-r--r--Command/Whereis.hs2
21 files changed, 40 insertions, 28 deletions
diff --git a/Command/Add.hs b/Command/Add.hs
index beea48e0b..d1b2fbc7d 100644
--- a/Command/Add.hs
+++ b/Command/Add.hs
@@ -63,7 +63,8 @@ seek o = allowConcurrentOutput $ do
giveup "--update --batch is not supported"
| otherwise -> batchFiles gofile
NoBatch -> do
- let go a = a gofile (addThese o)
+ l <- workTreeItems (addThese o)
+ let go a = a gofile l
unless (updateOnly o) $
go (withFilesNotInGit (not $ includeDotFiles o))
go withFilesMaybeModified
diff --git a/Command/Copy.hs b/Command/Copy.hs
index f071bf2dd..b3b860fef 100644
--- a/Command/Copy.hs
+++ b/Command/Copy.hs
@@ -43,7 +43,7 @@ seek o = allowConcurrentOutput $ do
(Command.Move.keyOptions $ moveOptions o) (autoMode o)
(Command.Move.startKey (moveOptions o) False)
(withFilesInGit go)
- (Command.Move.moveFiles $ moveOptions o)
+ =<< workTreeItems (Command.Move.moveFiles $ moveOptions o)
{- A copy is just a move that does not delete the source file.
- However, auto mode avoids unnecessary copies, and avoids getting or
diff --git a/Command/Drop.hs b/Command/Drop.hs
index 7603a4f54..b03e3e080 100644
--- a/Command/Drop.hs
+++ b/Command/Drop.hs
@@ -58,7 +58,7 @@ seek o = allowConcurrentOutput $
NoBatch -> withKeyOptions (keyOptions o) (autoMode o)
(startKeys o)
(withFilesInGit go)
- (dropFiles o)
+ =<< workTreeItems (dropFiles o)
where
go = whenAnnexed $ start o
diff --git a/Command/Find.hs b/Command/Find.hs
index d3571c6f8..03ac72f96 100644
--- a/Command/Find.hs
+++ b/Command/Find.hs
@@ -50,7 +50,7 @@ parseFormatOption =
seek :: FindOptions -> CommandSeek
seek o = case batchOption o of
- NoBatch -> withFilesInGit go (findThese o)
+ NoBatch -> withFilesInGit go =<< workTreeItems (findThese o)
Batch -> batchFiles go
where
go = whenAnnexed $ start o
diff --git a/Command/Fix.hs b/Command/Fix.hs
index 6ef942be8..5b8630654 100644
--- a/Command/Fix.hs
+++ b/Command/Fix.hs
@@ -34,7 +34,8 @@ seek ps = unlessM crippledFileSystem $ do
( return FixAll
, return FixSymlinks
)
- flip withFilesInGit ps $ whenAnnexed $ start fixwhat
+ l <- workTreeItems ps
+ flip withFilesInGit l $ whenAnnexed $ start fixwhat
data FixWhat = FixSymlinks | FixAll
diff --git a/Command/Fsck.hs b/Command/Fsck.hs
index e38a10843..514421e93 100644
--- a/Command/Fsck.hs
+++ b/Command/Fsck.hs
@@ -93,7 +93,7 @@ seek o = allowConcurrentOutput $ do
withKeyOptions (keyOptions o) False
(\k ai -> startKey from i k ai =<< getNumCopies)
(withFilesInGit $ whenAnnexed $ start from i)
- (fsckFiles o)
+ =<< workTreeItems (fsckFiles o)
cleanupIncremental i
void $ tryIO $ recordActivity Fsck u
diff --git a/Command/Get.hs b/Command/Get.hs
index 3a4a4606a..5cb0245d9 100644
--- a/Command/Get.hs
+++ b/Command/Get.hs
@@ -46,7 +46,7 @@ seek o = allowConcurrentOutput $ do
NoBatch -> withKeyOptions (keyOptions o) (autoMode o)
(startKeys from)
(withFilesInGit go)
- (getFiles o)
+ =<< workTreeItems (getFiles o)
start :: GetOptions -> Maybe Remote -> FilePath -> Key -> CommandStart
start o from file key = start' expensivecheck from key afile (mkActionItem afile)
diff --git a/Command/List.hs b/Command/List.hs
index 05f12822a..e949c2ff0 100644
--- a/Command/List.hs
+++ b/Command/List.hs
@@ -44,7 +44,8 @@ seek :: ListOptions -> CommandSeek
seek o = do
list <- getList o
printHeader list
- withFilesInGit (whenAnnexed $ start list) (listThese o)
+ withFilesInGit (whenAnnexed $ start list)
+ =<< workTreeItems (listThese o)
getList :: ListOptions -> Annex [(UUID, RemoteName, TrustLevel)]
getList o
diff --git a/Command/Lock.hs b/Command/Lock.hs
index a3fc25117..90d293799 100644
--- a/Command/Lock.hs
+++ b/Command/Lock.hs
@@ -29,12 +29,14 @@ cmd = notDirect $ withGlobalOptions annexedMatchingOptions $
paramPaths (withParams seek)
seek :: CmdParams -> CommandSeek
-seek ps = ifM versionSupportsUnlockedPointers
- ( withFilesInGit (whenAnnexed startNew) ps
- , do
- withFilesOldUnlocked startOld ps
- withFilesOldUnlockedToBeCommitted startOld ps
- )
+seek ps = do
+ l <- workTreeItems ps
+ ifM versionSupportsUnlockedPointers
+ ( withFilesInGit (whenAnnexed startNew) l
+ , do
+ withFilesOldUnlocked startOld l
+ withFilesOldUnlockedToBeCommitted startOld l
+ )
startNew :: FilePath -> Key -> CommandStart
startNew file key = ifM (isJust <$> isAnnexLink file)
diff --git a/Command/Log.hs b/Command/Log.hs
index 357bcf1f3..7265ef6ba 100644
--- a/Command/Log.hs
+++ b/Command/Log.hs
@@ -91,7 +91,8 @@ seek o = do
zone <- liftIO getCurrentTimeZone
let outputter = mkOutputter m zone o
case (logFiles o, allOption o) of
- (fs, False) -> withFilesInGit (whenAnnexed $ start o outputter) fs
+ (fs, False) -> withFilesInGit (whenAnnexed $ start o outputter)
+ =<< workTreeItems fs
([], True) -> commandAction (startAll o outputter)
(_, True) -> giveup "Cannot specify both files and --all"
diff --git a/Command/MetaData.hs b/Command/MetaData.hs
index f3a39dee9..fd5fd0838 100644
--- a/Command/MetaData.hs
+++ b/Command/MetaData.hs
@@ -81,7 +81,7 @@ seek o = case batchOption o of
withKeyOptions (keyOptions o) False
(startKeys c o)
(seeker $ whenAnnexed $ start c o)
- (forFiles o)
+ =<< workTreeItems (forFiles o)
Batch -> withMessageState $ \s -> case outputType s of
JSONOutput _ -> batchInput parseJSONInput $
commandAction . startBatch
diff --git a/Command/Migrate.hs b/Command/Migrate.hs
index a68aee695..582839117 100644
--- a/Command/Migrate.hs
+++ b/Command/Migrate.hs
@@ -26,7 +26,7 @@ cmd = notDirect $ withGlobalOptions annexedMatchingOptions $
paramPaths (withParams seek)
seek :: CmdParams -> CommandSeek
-seek = withFilesInGit $ whenAnnexed start
+seek ps = withFilesInGit (whenAnnexed start) =<< workTreeItems ps
start :: FilePath -> Key -> CommandStart
start file key = do
diff --git a/Command/Mirror.hs b/Command/Mirror.hs
index 7d33d80e9..a8f4307a2 100644
--- a/Command/Mirror.hs
+++ b/Command/Mirror.hs
@@ -45,7 +45,7 @@ seek o = allowConcurrentOutput $
withKeyOptions (keyOptions o) False
(startKey o (AssociatedFile Nothing))
(withFilesInGit $ whenAnnexed $ start o)
- (mirrorFiles o)
+ =<< workTreeItems (mirrorFiles o)
start :: MirrorOptions -> FilePath -> Key -> CommandStart
start o file k = startKey o afile k (mkActionItem afile)
diff --git a/Command/Move.hs b/Command/Move.hs
index c8867e391..b9e0b6548 100644
--- a/Command/Move.hs
+++ b/Command/Move.hs
@@ -63,7 +63,7 @@ seek o = allowConcurrentOutput $ do
NoBatch -> withKeyOptions (keyOptions o) False
(startKey o True)
(withFilesInGit go)
- (moveFiles o)
+ =<< workTreeItems (moveFiles o)
start :: MoveOptions -> Bool -> FilePath -> Key -> CommandStart
start o move f k = start' o move afile k (mkActionItem afile)
diff --git a/Command/Multicast.hs b/Command/Multicast.hs
index 5588a0a50..7b0d54e8e 100644
--- a/Command/Multicast.hs
+++ b/Command/Multicast.hs
@@ -131,7 +131,7 @@ send ups fs = withTmpFile "send" $ \t h -> do
giveup "Sorry, multicast send cannot be done from a direct mode repository."
showStart "generating file list" ""
- fs' <- seekHelper LsFiles.inRepo fs
+ fs' <- seekHelper LsFiles.inRepo =<< workTreeItems fs
matcher <- Limit.getMatcher
let addlist f o = whenM (matcher $ MatchingFile $ FileInfo f f) $
liftIO $ hPutStrLn h o
diff --git a/Command/PreCommit.hs b/Command/PreCommit.hs
index 1ff2227d8..b6bf2c71c 100644
--- a/Command/PreCommit.hs
+++ b/Command/PreCommit.hs
@@ -49,15 +49,16 @@ seek ps = lockPreCommitHook $ ifM isDirect
giveup "Cannot make a partial commit with unlocked annexed files. You should `git annex add` the files you want to commit, and then run git commit."
void $ liftIO cleanup
, do
+ l <- workTreeItems ps
-- fix symlinks to files being committed
- flip withFilesToBeCommitted ps $ \f ->
+ flip withFilesToBeCommitted l $ \f ->
maybe stop (Command.Fix.start Command.Fix.FixSymlinks f)
=<< isAnnexLink f
-- inject unlocked files into the annex
-- (not needed when repo version uses
-- unlocked pointer files)
unlessM versionSupportsUnlockedPointers $
- withFilesOldUnlockedToBeCommitted startInjectUnlocked ps
+ withFilesOldUnlockedToBeCommitted startInjectUnlocked l
)
runAnnexHook preCommitAnnexHook
-- committing changes to a view updates metadata
diff --git a/Command/Sync.hs b/Command/Sync.hs
index 4c3b90969..1bd8e623c 100644
--- a/Command/Sync.hs
+++ b/Command/Sync.hs
@@ -576,7 +576,10 @@ seekSyncContent o rs = do
mvar <- liftIO newEmptyMVar
bloom <- case keyOptions o of
Just WantAllKeys -> Just <$> genBloomFilter (seekworktree mvar [])
- _ -> seekworktree mvar (contentOfOption o) (const noop) >> pure Nothing
+ _ -> do
+ l <- workTreeItems (contentOfOption o)
+ seekworktree mvar l (const noop)
+ pure Nothing
withKeyOptions' (keyOptions o) False
(return (seekkeys mvar bloom))
(const noop)
diff --git a/Command/Unannex.hs b/Command/Unannex.hs
index e3e8d51ab..7c693a088 100644
--- a/Command/Unannex.hs
+++ b/Command/Unannex.hs
@@ -30,7 +30,8 @@ cmd = withGlobalOptions annexedMatchingOptions $
paramPaths (withParams seek)
seek :: CmdParams -> CommandSeek
-seek = wrapUnannex . (withFilesInGit $ whenAnnexed start)
+seek ps = wrapUnannex $
+ (withFilesInGit $ whenAnnexed start) =<< workTreeItems ps
wrapUnannex :: Annex a -> Annex a
wrapUnannex a = ifM (versionSupportsUnlockedPointers <||> isDirect)
diff --git a/Command/Uninit.hs b/Command/Uninit.hs
index af628d7a9..0445201fa 100644
--- a/Command/Uninit.hs
+++ b/Command/Uninit.hs
@@ -40,9 +40,10 @@ check = do
seek :: CmdParams -> CommandSeek
seek ps = do
- withFilesNotInGit False (whenAnnexed startCheckIncomplete) ps
+ l <- workTreeItems ps
+ withFilesNotInGit False (whenAnnexed startCheckIncomplete) l
Annex.changeState $ \s -> s { Annex.fast = True }
- withFilesInGit (whenAnnexed Command.Unannex.start) ps
+ withFilesInGit (whenAnnexed Command.Unannex.start) l
finish
{- git annex symlinks that are not checked into git could be left by an
diff --git a/Command/Unlock.hs b/Command/Unlock.hs
index 0ac221c1f..274f4af3c 100644
--- a/Command/Unlock.hs
+++ b/Command/Unlock.hs
@@ -30,7 +30,7 @@ mkcmd n d = notDirect $ withGlobalOptions annexedMatchingOptions $
command n SectionCommon d paramPaths (withParams seek)
seek :: CmdParams -> CommandSeek
-seek = withFilesInGit $ whenAnnexed start
+seek ps = withFilesInGit (whenAnnexed start) =<< workTreeItems ps
{- Before v6, the unlock subcommand replaces the symlink with a copy of
- the file's content. In v6 and above, it converts the file from a symlink
diff --git a/Command/Whereis.hs b/Command/Whereis.hs
index a08b94422..c5543bc66 100644
--- a/Command/Whereis.hs
+++ b/Command/Whereis.hs
@@ -44,7 +44,7 @@ seek o = do
withKeyOptions (keyOptions o) False
(startKeys m)
(withFilesInGit go)
- (whereisFiles o)
+ =<< workTreeItems (whereisFiles o)
start :: M.Map UUID Remote -> FilePath -> Key -> CommandStart
start remotemap file key = startKeys remotemap key (mkActionItem afile)
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-13 14:36:43 +0000