rework command dispatching for add and pre-commit

Both subcommands do two different operations on different sets of files, so
allowing a subcommand to perform a list of operations cleans things up.

1 files changed, 14 insertions, 0 deletions

diff --git a/Core.hs b/Core.hs
index 8497a7f36..0c06d2310 100644
--- a/Core.hs
+++ b/Core.hs
@@ -224,6 +224,20 @@ getKeysReferenced = do
 	keypairs <- mapM Backend.lookupFile files
 	return $ map fst $ catMaybes keypairs
 
+{- Passed a location (a directory or a single file, returns
+ - files there that are unlocked for editing. -}
+unlockedFiles :: FilePath -> Annex [FilePath]
+unlockedFiles l = do
+	-- unlocked files have changed type from a symlink to a regular file
+	g <- Annex.gitRepo
+	typechangedfiles <- liftIO $ Git.typeChangedFiles g l
+	unlockedfiles <- filterM notsymlink typechangedfiles
+	return unlockedfiles
+	where
+		notsymlink f = do
+			s <- liftIO $ getSymbolicLinkStatus f
+			return $ not $ isSymbolicLink s
+
 {- Uses the annex.version git config setting to automate upgrades. -}
 autoUpgrade :: Annex ()
 autoUpgrade = do