Bugfix: Keys could be received into v1 annexes from v2 annexes, via v1 git-annex-shell. This results in some oddly named keys in the v1 annex. Recognise and fix those keys when upgrading, instead of crashing.

3 files changed, 31 insertions, 19 deletions

diff --git a/Upgrade/V1.hs b/Upgrade/V1.hs
index a87614222..4ce2612d6 100644
--- a/Upgrade/V1.hs
+++ b/Upgrade/V1.hs
@@ -16,6 +16,7 @@ import System.FilePath
 import Data.String.Utils
 import System.Posix.Types
 import Data.Maybe
+import Data.Char
 
 import Key
 import Content
@@ -79,12 +80,11 @@ upgrade = do
 moveContent :: Annex ()
 moveContent = do
 	showNote "moving content..."
-	keys <- getKeysPresent1
-	forM_ keys move
+	files <- getKeyFilesPresent1
+	forM_ files move
 	where
-		move k = do
-			g <- Annex.gitRepo
-			let f = gitAnnexObjectDir g </> keyFile1 k </> keyFile1 k
+		move f = do
+			let k = fileKey1 (takeFileName f)
 			let d = parentDir f
 			liftIO $ allowWrite d
 			liftIO $ allowWrite f
@@ -154,8 +154,15 @@ oldlog2key l =
 
 -- WORM backend keys: "WORM:mtime:size:filename"
 -- all the rest: "backend:key"
+--
+-- If the file looks like "WORM:XXX-...", then it was created by mixing
+-- v2 and v1; that infelicity is worked around by treating the value
+-- as the v2 key that it is.
 readKey1 :: String -> Key
-readKey1 v = Key { keyName = n , keyBackendName = b, keySize = s, keyMtime = t }
+readKey1 v = 
+	if mixup
+		then fromJust $ readKey $ join ":" $ tail bits
+		else Key { keyName = n , keyBackendName = b, keySize = s, keyMtime = t }
 	where
 		bits = split ":" v
 		b = head bits
@@ -166,7 +173,8 @@ readKey1 v = Key { keyName = n , keyBackendName = b, keySize = s, keyMtime = t }
 		s = if wormy
 			then Just (read (bits !! 2) :: Integer)
 			else Nothing
-		wormy = b == "WORM"
+		wormy = head bits == "WORM"
+		mixup = wormy && (isUpper $ head $ bits !! 1)
 
 showKey1 :: Key -> String
 showKey1 Key { keyName = n , keyBackendName = b, keySize = s, keyMtime = t } =
@@ -211,24 +219,22 @@ lookupFile1 file = do
 				skip = "skipping " ++ file ++ 
 					" (unknown backend " ++ bname ++ ")"
 
-getKeysPresent1 :: Annex [Key]
-getKeysPresent1  = do
+getKeyFilesPresent1 :: Annex [FilePath]
+getKeyFilesPresent1  = do
 	g <- Annex.gitRepo
-	getKeysPresent1' $ gitAnnexObjectDir g
-getKeysPresent1' :: FilePath -> Annex [Key]
-getKeysPresent1' dir = do
+	getKeyFilesPresent1' $ gitAnnexObjectDir g
+getKeyFilesPresent1' :: FilePath -> Annex [FilePath]
+getKeyFilesPresent1' dir = do
 	exists <- liftIO $ doesDirectoryExist dir
 	if (not exists)
 		then return []
 		else do
-			contents <- liftIO $ getDirectoryContents dir
-			files <- liftIO $ filterM present contents
-			return $ map fileKey1 files
+			dirs <- liftIO $ getDirectoryContents dir
+			let files = map (\d -> dir ++ "/" ++ d ++ "/" ++ takeFileName d) dirs
+			liftIO $ filterM present files
 	where
-		present d = do
-			liftIO $ putStrLn $ dir ++ "/" ++ d ++ "/"  ++ takeFileName d
-			result <- try $
-				getFileStatus $ dir ++ "/" ++ d ++ "/"  ++ takeFileName d
+		present f = do
+			result <- try $ getFileStatus f
 			case result of
 				Right s -> return $ isRegularFile s
 				Left _ -> return False
diff --git a/debian/changelog b/debian/changelog
index 2f532784d..517cf5969 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ git-annex (0.20110326) UNRELEASED; urgency=low
   * Provide a less expensive version of `git annex copy --to`, enabled
     via --fast. This assumes that location tracking information is correct,
     rather than contacting the remote for every file.
+  * Bugfix: Keys could be received into v1 annexes from v2 annexes, via
+    v1 git-annex-shell. This results in some oddly named keys in the v1
+    annex. Recognise and fix those keys when upgrading, instead of crashing.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 26 Mar 2011 14:36:16 -0400
 
diff --git a/doc/bugs/backend_version_upgrade_leaves_repo_unusable.mdwn b/doc/bugs/backend_version_upgrade_leaves_repo_unusable.mdwn
index 64c18f202..1eebd9ecd 100644
--- a/doc/bugs/backend_version_upgrade_leaves_repo_unusable.mdwn
+++ b/doc/bugs/backend_version_upgrade_leaves_repo_unusable.mdwn
@@ -56,3 +56,6 @@ Running the copy job again, I am still getting the same error as above (as expec
 >>> you shouldn't delete anything. I'll simply make the v2 upgrade
 >>> detect and work around this bug.
 >>> --[[Joey]]
+
+>>>> This should be fixed in current git. The scambled keys will be 
+>>>> fixed up on upgrade. Thanks for your patience! [[done]] --[[Joey]]