From 4419ed21e64d5713e83503b1b9b6120ba10cd1b6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Tue, 15 Dec 2015 14:08:07 -0400
Subject: rename stuff for v5 unlocked files to indicate it's old

---
 Command/Add.hs       | 2 +-
 Command/Lock.hs      | 4 ++--
 Command/PreCommit.hs | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'Command')

diff --git a/Command/Add.hs b/Command/Add.hs
index 948a0d94c..a0bcf789e 100644
--- a/Command/Add.hs
+++ b/Command/Add.hs
@@ -69,7 +69,7 @@ seek o = allowConcurrentOutput $ do
 	ifM isDirect
 		( go withFilesMaybeModified
 		, unlessM versionSupportsUnlockedPointers $
-			go withFilesUnlocked
+			go withFilesOldUnlocked
 		)
 
 {- Pass file off to git-add. -}
diff --git a/Command/Lock.hs b/Command/Lock.hs
index 3eceaefe4..16ddce942 100644
--- a/Command/Lock.hs
+++ b/Command/Lock.hs
@@ -32,8 +32,8 @@ seek :: CmdParams -> CommandSeek
 seek ps = ifM versionSupportsUnlockedPointers
 	( withFilesInGit (whenAnnexed startNew) ps
 	, do
-		withFilesUnlocked startOld ps
-		withFilesUnlockedToBeCommitted startOld ps
+		withFilesOldUnlocked startOld ps
+		withFilesOldUnlockedToBeCommitted startOld ps
 	)
 
 startNew :: FilePath -> Key -> CommandStart
diff --git a/Command/PreCommit.hs b/Command/PreCommit.hs
index b6f52d01c..71a9f86f8 100644
--- a/Command/PreCommit.hs
+++ b/Command/PreCommit.hs
@@ -46,7 +46,7 @@ seek ps = lockPreCommitHook $ ifM isDirect
 		ifM (liftIO Git.haveFalseIndex)
 			( do
 				(fs, cleanup) <- inRepo $ Git.typeChangedStaged ps
-				whenM (anyM isUnlocked fs) $
+				whenM (anyM isOldUnlocked fs) $
 					error "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
@@ -58,7 +58,7 @@ seek ps = lockPreCommitHook $ ifM isDirect
 				-- (not needed when repo version uses
 				-- unlocked pointer files)
 				unlessM versionSupportsUnlockedPointers $
-					withFilesUnlockedToBeCommitted startInjectUnlocked ps
+					withFilesOldUnlockedToBeCommitted startInjectUnlocked ps
 			)
 		runAnnexHook preCommitAnnexHook
 		-- committing changes to a view updates metadata
-- 
cgit v1.2.3