v7 for all repositories

* Default to v7 for new repositories.
* Automatically upgrade v5 repositories to v7.

Assistant/Threads/Watcher.hs

@@ -36,7 +36,6 @@ import Annex.Link
 import Annex.FileMatcher
 import Annex.Content
 import Annex.ReplaceFile
-import Annex.Version
 import Annex.InodeSentinal
 import Git.Types
 import Git.FilePath
@@ -90,11 +89,8 @@ runWatcher :: Assistant ()
 runWatcher = do
 	startup <- asIO1 startupScan
 	matcher <- liftAnnex largeFilesMatcher
-	unlocked <- liftAnnex versionSupportsUnlockedPointers
 	symlinkssupported <- liftAnnex $ coreSymlinks <$> Annex.getGitConfig
-	addhook <- hook $ if unlocked
-		then onAddUnlocked symlinkssupported matcher
-		else onAdd matcher
+	addhook <- hook $ onAddUnlocked symlinkssupported matcher
 	delhook <- hook onDel
 	addsymlinkhook <- hook onAddSymlink
 	deldirhook <- hook onDelDir
@@ -205,13 +201,6 @@ add largefilematcher file = ifM (liftAnnex $ checkFileMatcher largefilematcher f
 		madeChange file AddFileChange
 	)
 
-onAdd :: GetFileMatcher -> Handler
-onAdd matcher file filestatus
-	| maybe False isRegularFile filestatus =
-		unlessIgnored file $
-			add matcher file
-	| otherwise = noChange
-
 shouldRestage :: DaemonStatus -> Bool
 shouldRestage ds = scanComplete ds || forceRestage ds
 
@@ -356,8 +345,7 @@ onDel file _ = do
 onDel' :: FilePath -> Annex ()
 onDel' file = do
 	topfile <- inRepo (toTopFilePath file)
-	whenM versionSupportsUnlockedPointers $
-		withkey $ flip Database.Keys.removeAssociatedFile topfile
+	withkey $ flip Database.Keys.removeAssociatedFile topfile
 	Annex.Queue.addUpdateIndex =<<
 		inRepo (Git.UpdateIndex.unstageFile file)
   where