diff --git a/Annex/Direct.hs b/Annex/Direct.hs --- a/Annex/Direct.hs +++ b/Annex/Direct.hs @@ -153,7 +153,7 @@ - - A lock file is used to avoid races with any other caller of mergeDirect. - - - To avoid other git processes from making change to the index while our + - To avoid other git processes from making changes to the index while our - merge is in progress, the index lock file is used as the temp index - file. This is the same as what git does when updating the index - normally. @@ -162,7 +162,8 @@ mergeDirect startbranch oldref branch resolvemerge commitmode = exclusively $ do reali <- liftIO . absPath =<< fromRepo indexFile tmpi <- liftIO . absPath =<< fromRepo indexFileLock - liftIO $ copyFile reali tmpi + liftIO $ whenM (doesFileExist reali) $ + copyFile reali tmpi d <- fromRepo gitAnnexMergeDir liftIO $ do @@ -178,7 +179,8 @@ mergeDirectCleanup d (fromMaybe Git.Sha.emptyTree oldref) mergeDirectCommit merged startbranch branch commitmode - liftIO $ rename tmpi reali + liftIO $ whenM (doesFileExist tmpi) $ + rename tmpi reali return r where diff --git a/Assistant/WebApp/Configurators/AWS.hs b/Assistant/WebApp/Configurators/AWS.hs --- a/Assistant/WebApp/Configurators/AWS.hs +++ b/Assistant/WebApp/Configurators/AWS.hs @@ -41,11 +41,12 @@ where needglaciercli = $(widgetFile "configurators/needglaciercli") -data StorageClass = StandardRedundancy | ReducedRedundancy +data StorageClass = StandardRedundancy | StandardInfrequentAccess | ReducedRedundancy deriving (Eq, Enum, Bounded) instance Show StorageClass where show StandardRedundancy = "STANDARD" + show StandardInfrequentAccess = "STANDARD_IA" show ReducedRedundancy = "REDUCED_REDUNDANCY" data AWSInput = AWSInput @@ -75,6 +76,9 @@ storageclasses :: [(Text, StorageClass)] storageclasses = [ ("Standard redundancy", StandardRedundancy) +#if MIN_VERSION_aws(0,13,0) + , ("Infrequent access (cheaper for backups and archives)", StandardInfrequentAccess) +#endif , ("Reduced redundancy (costs less)", ReducedRedundancy) ] diff --git a/Assistant/WebApp/Configurators/Delete.hs b/Assistant/WebApp/Configurators/Delete.hs --- a/Assistant/WebApp/Configurators/Delete.hs +++ b/Assistant/WebApp/Configurators/Delete.hs @@ -47,11 +47,6 @@ then deletionPage $ $(widgetFile "configurators/delete/xmpp") else nonxmpp -getDisableRepositoryR :: UUID -> Handler Html -getDisableRepositoryR uuid = notCurrentRepo uuid $ handleXMPPRemoval uuid $ do - void $ liftAssistant $ disableRemote uuid - redirect DashboardR - getDeleteRepositoryR :: UUID -> Handler Html getDeleteRepositoryR uuid = notCurrentRepo uuid $ handleXMPPRemoval uuid $ do deletionPage $ do diff --git a/Assistant/WebApp/routes b/Assistant/WebApp/routes --- a/Assistant/WebApp/routes +++ b/Assistant/WebApp/routes @@ -87,7 +87,6 @@ /config/repository/reorder RepositoriesReorderR GET /config/repository/syncnow/#UUID SyncNowRepositoryR GET -/config/repository/disable/#UUID DisableRepositoryR GET /config/repository/delete/confirm/#UUID DeleteRepositoryR GET /config/repository/delete/start/#UUID StartDeleteRepositoryR GET diff --git a/Build/DistributionUpdate.hs b/Build/DistributionUpdate.hs --- a/Build/DistributionUpdate.hs +++ b/Build/DistributionUpdate.hs @@ -31,7 +31,7 @@ -- it in the repository. autobuilds :: [(URLString, FilePath)] autobuilds = - (map linuxarch ["i386", "amd64", "armel"]) ++ + (map linuxarch ["i386", "amd64", "armel", "i386-ancient"]) ++ (map androidversion ["4.0", "4.3", "5.0"]) ++ [ (autobuild "x86_64-apple-yosemite/git-annex.dmg", "git-annex/OSX/current/10.10_Yosemite/git-annex.dmg") , (autobuild "windows/git-annex-installer.exe", "git-annex/windows/current/git-annex-installer.exe") diff --git a/CHANGELOG b/CHANGELOG --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,25 @@ +git-annex (5.20150930) unstable; urgency=medium + + * Added new linux standalone "ancient" build to support kernels + like 2.6.32. + * info: Don't allow use in a non-git-annex repository, since it + uses the git-annex branch and would create it if it were missing. + * assistant: When updating ~/.ssh/config, preserve any symlinks. + * webapp: Remove the "disable remote" feature from the UI. + * S3: When built with aws-0.13.0, supports using more storage classes. + In particular, storageclass=STANDARD_IA to use Amazon's + new Infrequently Accessed storage, and storageclass=NEARLINE + to use Google's NearLine storage. + * Improve ~/.ssh/config modification code to not add trailing spaces + to lines it cannot parse. + * Fix a crash at direct mode merge time when .git/index doesn't exist + yet. Triggered by eg, git-annex sync --no-commit in a fresh clone of + a repository. + * status: Show added but not yet committed files. + * Added stack.yaml to support easy builds from source with stack. + + -- Joey Hess Wed, 30 Sep 2015 14:31:52 -0400 + git-annex (5.20150916) unstable; urgency=medium * Fix Windows build to work with ghc 7.10. diff --git a/Command/Info.hs b/Command/Info.hs --- a/Command/Info.hs +++ b/Command/Info.hs @@ -79,7 +79,7 @@ type StatState = StateT StatInfo Annex cmd :: Command -cmd = noCommit $ dontCheck repoExists $ withGlobalOptions (jsonOption : annexedMatchingOptions) $ +cmd = noCommit $ withGlobalOptions (jsonOption : annexedMatchingOptions) $ command "info" SectionQuery "shows information about the specified item or the repository as a whole" (paramRepeating paramItem) (seek <$$> optParser) diff --git a/Command/Status.hs b/Command/Status.hs --- a/Command/Status.hs +++ b/Command/Status.hs @@ -1,6 +1,6 @@ {- git-annex command - - - Copyright 2013 Joey Hess + - Copyright 2013-2015 Joey Hess - - Licensed under the GNU GPL version 3 or higher. -} @@ -12,9 +12,9 @@ import Annex.CatFile import Annex.Content.Direct import Config -import qualified Git.LsFiles as LsFiles +import Git.Status import qualified Git.Ref -import qualified Git +import Git.FilePath cmd :: Command cmd = notBareRepo $ noCommit $ noMessages $ withGlobalOptions [jsonOption] $ @@ -24,68 +24,51 @@ seek :: CmdParams -> CommandSeek seek = withWords start - -start :: [FilePath] -> CommandStart -start [] = do - -- Like git status, when run without a directory, behave as if - -- given the path to the top of the repository. - top <- fromRepo Git.repoPath - d <- liftIO $ relPathCwdToFile top - start' [d] -start locs = start' locs -start' :: [FilePath] -> CommandStart -start' locs = do - (l, cleanup) <- inRepo $ LsFiles.modifiedOthers locs +start :: [FilePath] -> CommandStart +start locs = do + (l, cleanup) <- inRepo $ getStatus locs getstatus <- ifM isDirect ( return statusDirect - , return $ Just <$$> statusIndirect + , return $ \s -> pure (Just s) ) - forM_ l $ \f -> maybe noop (showFileStatus f) =<< getstatus f + forM_ l $ \s -> maybe noop displayStatus =<< getstatus s void $ liftIO cleanup stop -data Status - = NewFile - | DeletedFile - | ModifiedFile - -showStatus :: Status -> String -showStatus NewFile = "?" -showStatus DeletedFile = "D" -showStatus ModifiedFile = "M" - -showFileStatus :: FilePath -> Status -> Annex () -showFileStatus f s = unlessM (showFullJSON [("status", ss), ("file", f)]) $ - liftIO $ putStrLn $ ss ++ " " ++ f - where - ss = showStatus s +displayStatus :: Status -> Annex () +-- renames not shown in this simplified status +displayStatus (Renamed _ _) = noop +displayStatus s = do + let c = statusChar s + absf <- fromRepo $ fromTopFilePath (statusFile s) + f <- liftIO $ relPathCwdToFile absf + unlessM (showFullJSON [("status", [c]), ("file", f)]) $ + liftIO $ putStrLn $ [c] ++ " " ++ f -statusDirect :: FilePath -> Annex (Maybe Status) -statusDirect f = checkstatus =<< liftIO (catchMaybeIO $ getFileStatus f) +-- Git thinks that present direct mode files are typechanged; +-- check their content to see if they are modified or not. +statusDirect :: Status -> Annex (Maybe Status) +statusDirect (TypeChanged t) = do + absf <- fromRepo $ fromTopFilePath t + f <- liftIO $ relPathCwdToFile absf + v <- liftIO (catchMaybeIO $ getFileStatus f) + case v of + Nothing -> return $ Just $ Deleted t + Just s + | not (isSymbolicLink s) -> + checkkey f s =<< catKeyFile f + | otherwise -> Just <$> checkNew f t where - checkstatus Nothing = return $ Just DeletedFile - checkstatus (Just s) - -- Git thinks that present direct mode files are modifed, - -- so have to check. - | not (isSymbolicLink s) = checkkey s =<< catKeyFile f - | otherwise = Just <$> checkNew f - - checkkey s (Just k) = ifM (sameFileStatus k f s) + checkkey f s (Just k) = ifM (sameFileStatus k f s) ( return Nothing - , return $ Just ModifiedFile + , return $ Just $ Modified t ) - checkkey _ Nothing = Just <$> checkNew f - -statusIndirect :: FilePath -> Annex Status -statusIndirect f = ifM (liftIO $ isJust <$> catchMaybeIO (getFileStatus f)) - ( checkNew f - , return DeletedFile - ) - where + checkkey f _ Nothing = Just <$> checkNew f t +statusDirect s = pure (Just s) -checkNew :: FilePath -> Annex Status -checkNew f = ifM (isJust <$> catObjectDetails (Git.Ref.fileRef f)) - ( return ModifiedFile - , return NewFile +checkNew :: FilePath -> TopFilePath -> Annex Status +checkNew f t = ifM (isJust <$> catObjectDetails (Git.Ref.fileRef f)) + ( return (Modified t) + , return (Untracked t) ) diff --git a/Git/Status.hs b/Git/Status.hs new file mode 100644 --- /dev/null +++ b/Git/Status.hs @@ -0,0 +1,76 @@ +{- git status interface + - + - Copyright 2015 Joey Hess + - + - Licensed under the GNU GPL version 3 or higher. + -} + +module Git.Status where + +import Common +import Git +import Git.Command +import Git.FilePath + +data Status + = Modified TopFilePath + | Deleted TopFilePath + | Added TopFilePath + | Renamed TopFilePath TopFilePath + | TypeChanged TopFilePath + | Untracked TopFilePath + +statusChar :: Status -> Char +statusChar (Modified _) = 'M' +statusChar (Deleted _) = 'D' +statusChar (Added _) = 'A' +statusChar (Renamed _ _) = 'R' +statusChar (TypeChanged _) = 'T' +statusChar (Untracked _) = '?' + +statusFile :: Status -> TopFilePath +statusFile (Modified f) = f +statusFile (Deleted f) = f +statusFile (Added f) = f +statusFile (Renamed _oldf newf) = newf +statusFile (TypeChanged f) = f +statusFile (Untracked f) = f + +parseStatusZ :: [String] -> [Status] +parseStatusZ = go [] + where + go c [] = reverse c + go c (x:xs) = case x of + (sindex:sworktree:' ':f) -> + -- Look at both the index and worktree status, + -- preferring worktree. + case cparse sworktree <|> cparse sindex of + Just mks -> go (mks (asTopFilePath f) : c) xs + Nothing -> if sindex == 'R' + -- In -z mode, the name the + -- file was renamed to comes + -- first, and the next component + -- is the old filename. + then case xs of + (oldf:xs') -> go (Renamed (asTopFilePath oldf) (asTopFilePath f) : c) xs' + _ -> go c [] + else go c xs + _ -> go c xs + + cparse 'M' = Just Modified + cparse 'A' = Just Added + cparse 'D' = Just Deleted + cparse 'T' = Just TypeChanged + cparse '?' = Just Untracked + cparse _ = Nothing + +getStatus :: [FilePath] -> Repo -> IO ([Status], IO Bool) +getStatus l r = do + (ls, cleanup) <- pipeNullSplit params r + return (parseStatusZ ls, cleanup) + where + params = + [ Param "status" + , Param "-uall" + , Param "-z" + ] ++ map File l diff --git a/Remote/S3.hs b/Remote/S3.hs --- a/Remote/S3.hs +++ b/Remote/S3.hs @@ -500,6 +500,9 @@ getStorageClass :: RemoteConfig -> S3.StorageClass getStorageClass c = case M.lookup "storageclass" c of Just "REDUCED_REDUNDANCY" -> S3.ReducedRedundancy +#if MIN_VERSION_aws(0,13,0) + Just s -> S3.OtherStorageClass (T.pack s) +#endif _ -> S3.Standard getPartSize :: RemoteConfig -> Maybe Integer diff --git a/Utility/Bloom.hs b/Utility/Bloom.hs --- a/Utility/Bloom.hs +++ b/Utility/Bloom.hs @@ -53,7 +53,7 @@ notElemB = Bloom.notElemB elemB :: a -> Bloom a -> Bool -elemB = Bloom.elem +elemB = Bloom.elemB newMB :: (a -> [Bloom.Hash]) -> Int -> ST s (Bloom.MBloom s a) newMB = Bloom.newMB diff --git a/Utility/SshConfig.hs b/Utility/SshConfig.hs --- a/Utility/SshConfig.hs +++ b/Utility/SshConfig.hs @@ -81,7 +81,8 @@ gen (GlobalConfig s) = [setting s] gen (HostConfig h cs) = ("Host " ++ h) : map (either comment setting) cs - setting (SshSetting indent k v) = indent ++ k ++ " " ++ v + setting (SshSetting indent k v) = indent ++ k ++ + if null v then "" else " " ++ v comment (Comment indent c) = indent ++ c findHostConfigKey :: SshConfig -> Key -> Maybe Value @@ -117,8 +118,11 @@ whenM (doesFileExist configfile) $ do c <- readFileStrict configfile let c' = modifier c - when (c /= c') $ - viaTmp writeSshConfig configfile c' + when (c /= c') $ do + -- If it's a symlink, replace the file it + -- points to. + f <- catchDefaultIO configfile (canonicalizePath configfile) + viaTmp writeSshConfig f c' writeSshConfig :: FilePath -> String -> IO () writeSshConfig f s = do diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,25 @@ +git-annex (5.20150930) unstable; urgency=medium + + * Added new linux standalone "ancient" build to support kernels + like 2.6.32. + * info: Don't allow use in a non-git-annex repository, since it + uses the git-annex branch and would create it if it were missing. + * assistant: When updating ~/.ssh/config, preserve any symlinks. + * webapp: Remove the "disable remote" feature from the UI. + * S3: When built with aws-0.13.0, supports using more storage classes. + In particular, storageclass=STANDARD_IA to use Amazon's + new Infrequently Accessed storage, and storageclass=NEARLINE + to use Google's NearLine storage. + * Improve ~/.ssh/config modification code to not add trailing spaces + to lines it cannot parse. + * Fix a crash at direct mode merge time when .git/index doesn't exist + yet. Triggered by eg, git-annex sync --no-commit in a fresh clone of + a repository. + * status: Show added but not yet committed files. + * Added stack.yaml to support easy builds from source with stack. + + -- Joey Hess Wed, 30 Sep 2015 14:31:52 -0400 + git-annex (5.20150916) unstable; urgency=medium * Fix Windows build to work with ghc 7.10. diff --git a/doc/bugs/Support_non-default_storage_classes_with_Google_Cloud_Storage.mdwn b/doc/bugs/Support_non-default_storage_classes_with_Google_Cloud_Storage.mdwn --- a/doc/bugs/Support_non-default_storage_classes_with_Google_Cloud_Storage.mdwn +++ b/doc/bugs/Support_non-default_storage_classes_with_Google_Cloud_Storage.mdwn @@ -1,6 +1,9 @@ ### Please describe the problem. -The S3 remote does not support Google Cloud Storage buckets with the Durable Reduced Availability or Nearline storage classes. These are less-expensive alternatives to the Standard storage class, which would otherwise be a good fit for git-annex. +The S3 remote does not support Google Cloud Storage buckets with the +Durable Reduced Availability or Nearline storage classes. These are +less-expensive alternatives to the Standard storage class, which would +otherwise be a good fit for git-annex. ### What steps will reproduce the problem? @@ -87,5 +90,3 @@ [2015-05-31 17:38:22 EDT] Response metadata: S3: request ID=, x-amz-id-2= git-annex: S3Error {s3StatusCode = Status {statusCode = 400, statusMessage = "Bad Request"}, s3ErrorCode = "InvalidArgument", s3ErrorMessage = "Invalid argument.", s3ErrorResource = Nothing, s3ErrorHostId = Nothing, s3ErrorAccessKeyId = Nothing, s3ErrorStringToSign = Nothing} """]] - -> This is a dup of [[todo/Nearline_support]] ; [[done]] --[[Joey]] diff --git a/doc/bugs/cannot_change_locale___40__en__95__US.UTF-8__41__.mdwn b/doc/bugs/cannot_change_locale___40__en__95__US.UTF-8__41__.mdwn --- a/doc/bugs/cannot_change_locale___40__en__95__US.UTF-8__41__.mdwn +++ b/doc/bugs/cannot_change_locale___40__en__95__US.UTF-8__41__.mdwn @@ -26,7 +26,3 @@ he_IL.iso88598 he_IL.utf8 POSIX - -> Closing since I've seen nothing to indicate this is anything other than a -> misconfigured OS that doesn't have the requested locale available. -> [[done]] --[[Joey]] diff --git a/doc/bugs/git-annex_rewrites_.ssh__47__config.mdwn b/doc/bugs/git-annex_rewrites_.ssh__47__config.mdwn new file mode 100644 --- /dev/null +++ b/doc/bugs/git-annex_rewrites_.ssh__47__config.mdwn @@ -0,0 +1,17 @@ +### Please describe the problem. +Running git annex assistant, my .ssh/config file is rewritten. First, it is a symlink, but then git-annex makes it into an actual file. Second, it adds a trailing whitespace to a generic host block: + + Host + ForwardAgent no + ... + +### What steps will reproduce the problem? +For the symlink, just make .ssh/config a symlink to the real thing. Have a generic host block will add trailing whitespace. Starting git annex assistant will rewrite .ssh/config. + +### What version of git-annex are you using? On what operating system? +git-annex-5.20140717-8.fc24.x86_64 + +### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders) +Has worked wonders for syncing keepass files between devices; just now setting up assistant to do things automatically though :) . + +> [[fixed|done]] --[[Joey]] diff --git a/doc/bugs/unannexed_files_are_immediately_re-annexed_by_assistant.mdwn b/doc/bugs/unannexed_files_are_immediately_re-annexed_by_assistant.mdwn --- a/doc/bugs/unannexed_files_are_immediately_re-annexed_by_assistant.mdwn +++ b/doc/bugs/unannexed_files_are_immediately_re-annexed_by_assistant.mdwn @@ -2,3 +2,5 @@ When using “git annex unlock”, the assistant is clever enough not to immediately re-add the corresponding files. When using “git annex unannex”, however, the assistant goes on to re-add the files right away. It would be convenient if this case were also handled likewise. git-annex 5.20150508 + +> [[done]]; cannot be implemented. --[[Joey]] diff --git a/doc/bugs/windows_installer_seems_have_been_broken.mdwn b/doc/bugs/windows_installer_seems_have_been_broken.mdwn new file mode 100644 --- /dev/null +++ b/doc/bugs/windows_installer_seems_have_been_broken.mdwn @@ -0,0 +1,10 @@ +### Please describe the problem. + +decided to upgrade git-annex in our test virtualbox windows... upon upgrade (just running installer again with the default location for git), annex is not longer available: http://www.onerussian.com/tmp/gkrellShoot_09-17-15_105547.png +Replicated on another similar instance + +### What steps will reproduce the problem? + +download exe from https://downloads.kitenet.net/git-annex/windows/current/ (btw I think I noted it reduced in size noteably) + +> [[done]] per my comment --[[Joey]] diff --git a/doc/builds.mdwn b/doc/builds.mdwn --- a/doc/builds.mdwn +++ b/doc/builds.mdwn @@ -12,6 +12,9 @@

Linux armel

+

Linux i386-ancient

+

Android

@@ -33,6 +36,9 @@

Linux armel

+

Linux i386-ancient

+

Android