improve addurl --file behavior in a confusing corner case involving a ftp url

Command/AddUrl.hs

@@ -134,17 +134,20 @@ perform relaxed url file = ifAnnexed file addurl geturl
 		| relaxed = do
 			setUrlPresent key url
 			next $ return True
-		| otherwise = do
+		| otherwise = ifM (elem url <$> getUrls key)
-			(exists, samesize) <- Url.withUrlOptions $ Url.check url (keySize key)
+			( stop
-			if exists && samesize
+			, do
-				then do
+				(exists, samesize) <- Url.withUrlOptions $ Url.check url (keySize key)
-					setUrlPresent key url
+				if exists && samesize
-					next $ return True
+					then do
-				else do
+						setUrlPresent key url
-					warning $ if exists
+						next $ return True
-						then "url does not have expected file size (use --relaxed to bypass this check) " ++ url
+					else do
-						else "failed to verify url exists: " ++ url
+						warning $ "while adding a new url to an already annexed file, " ++ if exists
-					stop
+							then "url does not have expected file size (use --relaxed to bypass this check) " ++ url
+							else "failed to verify url exists: " ++ url
+						stop
+			)
 
 addUrlFile :: Bool -> URLString -> FilePath -> Annex Bool
 addUrlFile relaxed url file = do

doc/bugs/problem_to_addurl_--file_with_ftp.mdwn

@@ -64,3 +64,4 @@ I am using current git-annex binary linux version on Fedora 19.
     supported repository version: 5  
     upgrade supported from repository versions: 0 1 2 4  
 
+> [[done]] --[[Joey]]