diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-12-15 14:08:07 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-12-15 14:08:07 -0400 |
| commit | 4419ed21e64d5713e83503b1b9b6120ba10cd1b6 (patch) | |
| tree | bfe1dbbcf8d48463a4c39420dc9c1dfdd71197b4 /Command | |
| parent | 65b70a1164f69e198ef135e62bdc92e8c4332582 (diff) | |
rename stuff for v5 unlocked files to indicate it's old
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/Add.hs | 2 | ||||
| -rw-r--r-- | Command/Lock.hs | 4 | ||||
| -rw-r--r-- | Command/PreCommit.hs | 4 |
3 files changed, 5 insertions, 5 deletions
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 |