diff --git a/.gitignore b/.gitignore --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ Build/Standalone Build/OSXMkLibs Build/LinuxMkLibs +Build/BuildVersion git-annex git-annex.1 git-annex-shell.1 diff --git a/Annex/AutoMerge.hs b/Annex/AutoMerge.hs --- a/Annex/AutoMerge.hs +++ b/Annex/AutoMerge.hs @@ -12,12 +12,12 @@ import Annex.Direct import Annex.CatFile import Annex.Link -import qualified Git.Command import qualified Git.LsFiles as LsFiles import qualified Git.UpdateIndex as UpdateIndex import qualified Git.Merge import qualified Git.Ref import qualified Git +import qualified Git.Branch import Git.Types (BlobType(..)) import Config import Annex.ReplaceFile @@ -28,18 +28,22 @@ {- Merges from a branch into the current branch - (which may not exist yet), - - with automatic merge conflict resolution. -} -autoMergeFrom :: Git.Ref -> (Maybe Git.Ref) -> Annex Bool -autoMergeFrom branch currbranch = do + - with automatic merge conflict resolution. + - + - Callers should use Git.Branch.changed first, to make sure that + - there are changed from the current branch to the branch being merged in. + -} +autoMergeFrom :: Git.Ref -> (Maybe Git.Ref) -> Git.Branch.CommitMode -> Annex Bool +autoMergeFrom branch currbranch commitmode = do showOutput case currbranch of Nothing -> go Nothing Just b -> go =<< inRepo (Git.Ref.sha b) where go old = ifM isDirect - ( mergeDirect currbranch old branch (resolveMerge old branch) - , inRepo (Git.Merge.mergeNonInteractive branch) - <||> (resolveMerge old branch <&&> commitResolvedMerge) + ( mergeDirect currbranch old branch (resolveMerge old branch) commitmode + , inRepo (Git.Merge.mergeNonInteractive branch commitmode) + <||> (resolveMerge old branch <&&> commitResolvedMerge commitmode) ) {- Resolves a conflicted merge. It's important that any conflicts be @@ -166,10 +170,9 @@ matchesresolved f = S.member (base f) s base f = reverse $ drop 1 $ dropWhile (/= '~') $ reverse f -commitResolvedMerge :: Annex Bool -commitResolvedMerge = inRepo $ Git.Command.runBool - [ Param "commit" - , Param "--no-verify" +commitResolvedMerge :: Git.Branch.CommitMode -> Annex Bool +commitResolvedMerge commitmode = inRepo $ Git.Branch.commitCommand commitmode + [ Param "--no-verify" , Param "-m" , Param "git-annex automatic merge conflict fix" ] diff --git a/Annex/Branch.hs b/Annex/Branch.hs --- a/Annex/Branch.hs +++ b/Annex/Branch.hs @@ -92,7 +92,7 @@ fromMaybe (error $ "failed to create " ++ fromRef name) <$> branchsha go False = withIndex' True $ - inRepo $ Git.Branch.commitAlways "branch created" fullname [] + inRepo $ Git.Branch.commitAlways Git.Branch.AutomaticCommit "branch created" fullname [] use sha = do setIndexSha sha return sha @@ -252,7 +252,7 @@ commitIndex' :: JournalLocked -> Git.Ref -> String -> [Git.Ref] -> Annex () commitIndex' jl branchref message parents = do updateIndex jl branchref - committedref <- inRepo $ Git.Branch.commitAlways message fullname parents + committedref <- inRepo $ Git.Branch.commitAlways Git.Branch.AutomaticCommit message fullname parents setIndexSha committedref parentrefs <- commitparents <$> catObject committedref when (racedetected branchref parentrefs) $ @@ -390,18 +390,34 @@ g <- gitRepo let dir = gitAnnexJournalDir g fs <- getJournalFiles jl + (jlogf, jlogh) <- openjlog liftIO $ do h <- hashObjectStart g Git.UpdateIndex.streamUpdateIndex g - [genstream dir h fs] + [genstream dir h fs jlogh] hashObjectStop h - return $ liftIO $ mapM_ (removeFile . (dir )) fs + return $ cleanup dir jlogh jlogf where - genstream dir h fs streamer = forM_ fs $ \file -> do + genstream dir h fs jlogh streamer = forM_ fs $ \file -> do let path = dir file sha <- hashFile h path + hPutStrLn jlogh file streamer $ Git.UpdateIndex.updateIndexLine sha FileBlob (asTopFilePath $ fileJournal file) + -- Clean up the staged files, as listed in the temp log file. + -- The temp file is used to avoid needing to buffer all the + -- filenames in memory. + cleanup dir jlogh jlogf = do + hFlush jlogh + hSeek jlogh AbsoluteSeek 0 + stagedfs <- lines <$> hGetContents jlogh + mapM_ (removeFile . (dir )) stagedfs + hClose jlogh + nukeFile jlogf + openjlog = do + tmpdir <- fromRepo gitAnnexTmpMiscDir + createAnnexDirectory tmpdir + liftIO $ openTempFile tmpdir "jlog" {- This is run after the refs have been merged into the index, - but before the result is committed to the branch. @@ -471,7 +487,7 @@ Annex.Queue.flush if neednewlocalbranch then do - committedref <- inRepo $ Git.Branch.commitAlways message fullname transitionedrefs + committedref <- inRepo $ Git.Branch.commitAlways Git.Branch.AutomaticCommit message fullname transitionedrefs setIndexSha committedref else do ref <- getBranch diff --git a/Annex/Content.hs b/Annex/Content.hs --- a/Annex/Content.hs +++ b/Annex/Content.hs @@ -218,7 +218,7 @@ getViaTmpChecked :: Annex Bool -> Key -> (FilePath -> Annex Bool) -> Annex Bool getViaTmpChecked check key action = - prepGetViaTmpChecked key $ + prepGetViaTmpChecked key False $ finishGetViaTmp check key action {- Prepares to download a key via a tmp file, and checks that there is @@ -229,8 +229,8 @@ - - Wen there's enough free space, runs the download action. -} -prepGetViaTmpChecked :: Key -> Annex Bool -> Annex Bool -prepGetViaTmpChecked key getkey = do +prepGetViaTmpChecked :: Key -> a -> Annex a -> Annex a +prepGetViaTmpChecked key unabletoget getkey = do tmp <- fromRepo $ gitAnnexTmpObjectLocation key e <- liftIO $ doesFileExist tmp @@ -242,7 +242,7 @@ -- The tmp file may not have been left writable when e $ thawContent tmp getkey - , return False + , return unabletoget ) finishGetViaTmp :: Annex Bool -> Key -> (FilePath -> Annex Bool) -> Annex Bool diff --git a/Annex/Direct.hs b/Annex/Direct.hs --- a/Annex/Direct.hs +++ b/Annex/Direct.hs @@ -151,8 +151,8 @@ - Then the work tree is updated to reflect the merge, and - finally, the merge is committed and the real index updated. -} -mergeDirect :: Maybe Git.Ref -> Maybe Git.Ref -> Git.Branch -> Annex Bool -> Annex Bool -mergeDirect startbranch oldref branch resolvemerge = do +mergeDirect :: Maybe Git.Ref -> Maybe Git.Ref -> Git.Branch -> Annex Bool -> Git.Branch.CommitMode -> Annex Bool +mergeDirect startbranch oldref branch resolvemerge commitmode = do -- Use the index lock file as the temp index file. -- This is actually what git does when updating the index, -- and so it will prevent other git processes from making @@ -168,19 +168,19 @@ createDirectoryIfMissing True d withIndexFile tmpi $ do - merged <- stageMerge d branch + merged <- stageMerge d branch commitmode r <- if merged then return True else resolvemerge mergeDirectCleanup d (fromMaybe Git.Sha.emptyTree oldref) - mergeDirectCommit merged startbranch branch + mergeDirectCommit merged startbranch branch commitmode liftIO $ rename tmpi reali return r {- Stage a merge into the index, avoiding changing HEAD or the current - branch. -} -stageMerge :: FilePath -> Git.Branch -> Annex Bool -stageMerge d branch = do +stageMerge :: FilePath -> Git.Branch -> Git.Branch.CommitMode -> Annex Bool +stageMerge d branch commitmode = do -- XXX A bug in git makes stageMerge unsafe to use if the git repo -- is configured with core.symlinks=false -- Using mergeNonInteractive is not ideal though, since it will @@ -190,7 +190,7 @@ -- merger <- ifM (coreSymlinks <$> Annex.getGitConfig) ( return Git.Merge.stageMerge - , return Git.Merge.mergeNonInteractive + , return $ \ref -> Git.Merge.mergeNonInteractive ref commitmode ) inRepo $ \g -> merger branch $ g { location = Local { gitdir = Git.localGitDir g, worktree = Just d } } @@ -198,8 +198,8 @@ {- Commits after a direct mode merge is complete, and after the work - tree has been updated by mergeDirectCleanup. -} -mergeDirectCommit :: Bool -> Maybe Git.Ref -> Git.Branch -> Annex () -mergeDirectCommit allowff old branch = do +mergeDirectCommit :: Bool -> Maybe Git.Ref -> Git.Branch -> Git.Branch.CommitMode -> Annex () +mergeDirectCommit allowff old branch commitmode = do void preCommitDirect d <- fromRepo Git.localGitDir let merge_head = d "MERGE_HEAD" @@ -211,7 +211,7 @@ msg <- liftIO $ catchDefaultIO ("merge " ++ fromRef branch) $ readFile merge_msg - void $ inRepo $ Git.Branch.commit False msg + void $ inRepo $ Git.Branch.commit commitmode False msg Git.Ref.headRef [Git.Ref.headRef, branch] ) liftIO $ mapM_ nukeFile [merge_head, merge_msg, merge_mode] diff --git a/Annex/Journal.hs b/Annex/Journal.hs --- a/Annex/Journal.hs +++ b/Annex/Journal.hs @@ -77,7 +77,7 @@ getJournalFilesStale = do g <- gitRepo fs <- liftIO $ catchDefaultIO [] $ - getDirectoryContents $ gitAnnexJournalDir g + getDirectoryContents' $ gitAnnexJournalDir g return $ filter (`notElem` [".", ".."]) fs {- Checks if there are changes in the journal. -} diff --git a/Annex/MakeRepo.hs b/Annex/MakeRepo.hs new file mode 100644 --- /dev/null +++ b/Annex/MakeRepo.hs @@ -0,0 +1,88 @@ +{- making local repositories (used by webapp mostly) + - + - Copyright 2012-2014 Joey Hess + - + - Licensed under the GNU GPL version 3 or higher. + -} + +module Annex.MakeRepo where + +import Assistant.WebApp.Common +import Annex.Init +import qualified Git.Construct +import qualified Git.Config +import qualified Git.Command +import qualified Git.Branch +import qualified Annex +import Annex.UUID +import Annex.Direct +import Types.StandardGroups +import Logs.PreferredContent +import qualified Annex.Branch + +{- Makes a new git repository. Or, if a git repository already + - exists, returns False. -} +makeRepo :: FilePath -> Bool -> IO Bool +makeRepo path bare = ifM (probeRepoExists path) + ( return False + , do + (transcript, ok) <- + processTranscript "git" (toCommand params) Nothing + unless ok $ + error $ "git init failed!\nOutput:\n" ++ transcript + return True + ) + where + baseparams = [Param "init", Param "--quiet"] + params + | bare = baseparams ++ [Param "--bare", File path] + | otherwise = baseparams ++ [File path] + +{- Runs an action in the git repository in the specified directory. -} +inDir :: FilePath -> Annex a -> IO a +inDir dir a = do + state <- Annex.new =<< Git.Config.read =<< Git.Construct.fromPath dir + Annex.eval state a + +{- Creates a new repository, and returns its UUID. -} +initRepo :: Bool -> Bool -> FilePath -> Maybe String -> Maybe StandardGroup -> IO UUID +initRepo True primary_assistant_repo dir desc mgroup = inDir dir $ do + initRepo' desc mgroup + {- Initialize the master branch, so things that expect + - to have it will work, before any files are added. -} + unlessM (Git.Config.isBare <$> gitRepo) $ + void $ inRepo $ Git.Branch.commitCommand Git.Branch.AutomaticCommit + [ Param "--quiet" + , Param "--allow-empty" + , Param "-m" + , Param "created repository" + ] + {- Repositories directly managed by the assistant use direct mode. + - + - Automatic gc is disabled, as it can be slow. Insted, gc is done + - once a day. + -} + when primary_assistant_repo $ do + setDirect True + inRepo $ Git.Command.run + [Param "config", Param "gc.auto", Param "0"] + getUUID +{- Repo already exists, could be a non-git-annex repo though so + - still initialize it. -} +initRepo False _ dir desc mgroup = inDir dir $ do + initRepo' desc mgroup + getUUID + +initRepo' :: Maybe String -> Maybe StandardGroup -> Annex () +initRepo' desc mgroup = unlessM isInitialized $ do + initialize desc + u <- getUUID + maybe noop (defaultStandardGroup u) mgroup + {- Ensure branch gets committed right away so it is + - available for merging immediately. -} + Annex.Branch.commit "update" + +{- Checks if a git repo exists at a location. -} +probeRepoExists :: FilePath -> IO Bool +probeRepoExists dir = isJust <$> + catchDefaultIO Nothing (Git.Construct.checkForRepo dir) diff --git a/Annex/MetaData.hs b/Annex/MetaData.hs --- a/Annex/MetaData.hs +++ b/Annex/MetaData.hs @@ -7,6 +7,7 @@ module Annex.MetaData ( genMetaData, + dateMetaData, module X ) where @@ -37,20 +38,18 @@ genMetaData key file status = do maybe noop (flip copyMetaData key) =<< catKeyFileHEAD file whenM (annexGenMetaData <$> Annex.getGitConfig) $ do - metadata <- getCurrentMetaData key - let metadata' = genMetaData' status metadata - unless (metadata' == emptyMetaData) $ - addMetaData key metadata' + curr <- getCurrentMetaData key + addMetaData key (dateMetaData mtime curr) + where + mtime = posixSecondsToUTCTime $ realToFrac $ modificationTime status -{- Generates metadata from the FileStatus. +{- Generates metadata for a file's date stamp. - Does not overwrite any existing metadata values. -} -genMetaData' :: FileStatus -> MetaData -> MetaData -genMetaData' status old = MetaData $ M.fromList $ filter isnew +dateMetaData :: UTCTime -> MetaData -> MetaData +dateMetaData mtime old = MetaData $ M.fromList $ filter isnew [ (yearMetaField, S.singleton $ toMetaValue $ show y) , (monthMetaField, S.singleton $ toMetaValue $ show m) ] where isnew (f, _) = S.null (currentMetaDataValues f old) - (y, m, _d) = toGregorian $ utctDay $ - posixSecondsToUTCTime $ realToFrac $ - modificationTime status + (y, m, _d) = toGregorian $ utctDay $ mtime diff --git a/Annex/View.hs b/Annex/View.hs --- a/Annex/View.hs +++ b/Annex/View.hs @@ -433,7 +433,7 @@ genViewBranch view a = withIndex $ do a let branch = branchView view - void $ inRepo $ Git.Branch.commit True (fromRef branch) branch [] + void $ inRepo $ Git.Branch.commit Git.Branch.AutomaticCommit True (fromRef branch) branch [] return branch {- Runs an action using the view index file. diff --git a/Assistant.hs b/Assistant.hs --- a/Assistant.hs +++ b/Assistant.hs @@ -52,9 +52,12 @@ import Utility.ThreadScheduler import Utility.HumanTime import qualified Build.SysConfig as SysConfig -#ifndef mingw32_HOST_OS -import Utility.LogFile import Annex.Perms +import Utility.LogFile +#ifdef mingw32_HOST_OS +import Utility.Env +import Config.Files +import System.Environment (getArgs) #endif import System.Log.Logger @@ -72,10 +75,10 @@ startDaemon assistant foreground startdelay cannotrun listenhost startbrowser = do Annex.changeState $ \s -> s { Annex.daemon = True } pidfile <- fromRepo gitAnnexPidFile -#ifndef mingw32_HOST_OS logfile <- fromRepo gitAnnexLogFile +#ifndef mingw32_HOST_OS createAnnexDirectory (parentDir logfile) - logfd <- liftIO $ openLog logfile + logfd <- liftIO $ handleToFd =<< openLog logfile if foreground then do origout <- liftIO $ catchMaybeIO $ @@ -92,13 +95,32 @@ else start (Utility.Daemon.daemonize logfd (Just pidfile) False) Nothing #else - -- Windows is always foreground, and has no log file. + -- Windows doesn't daemonize, but does redirect output to the + -- log file. The only way to do so is to restart the program. when (foreground || not foreground) $ do - liftIO $ Utility.Daemon.lockPidFile pidfile - start id $ do - case startbrowser of - Nothing -> Nothing - Just a -> Just $ a Nothing Nothing + let flag = "GIT_ANNEX_OUTPUT_REDIR" + createAnnexDirectory (parentDir logfile) + ifM (liftIO $ isNothing <$> getEnv flag) + ( liftIO $ withFile devNull WriteMode $ \nullh -> do + Utility.Daemon.lockPidFile pidfile + when (not foreground) $ + debugM desc $ "logging to " ++ logfile + loghandle <- openLog logfile + e <- getEnvironment + cmd <- readProgramFile + ps <- getArgs + (_, _, _, pid) <- createProcess (proc cmd ps) + { env = Just (addEntry flag "1" e) + , std_in = UseHandle nullh + , std_out = UseHandle loghandle + , std_err = UseHandle loghandle + } + exitWith =<< waitForProcess pid + , start id $ do + case startbrowser of + Nothing -> Nothing + Just a -> Just $ a Nothing Nothing + ) #endif where desc diff --git a/Assistant/Sync.hs b/Assistant/Sync.hs --- a/Assistant/Sync.hs +++ b/Assistant/Sync.hs @@ -96,7 +96,7 @@ =<< fromMaybe [] . M.lookup (Remote.uuid r) . connectRemoteNotifiers <$> getDaemonStatus -{- Updates the local sync branch, then pushes it to all remotes, in +{- Pushes the local sync branch to all remotes, in - parallel, along with the git-annex branch. This is the same - as "git annex sync", except in parallel, and will co-exist with use of - "git annex sync". @@ -148,7 +148,6 @@ go _ _ _ _ [] = return [] -- no remotes, so nothing to do go shouldretry (Just branch) g u rs = do debug ["pushing to", show rs] - liftIO $ Command.Sync.updateBranch (Command.Sync.syncBranch branch) g (succeeded, failed) <- liftIO $ inParallel (push g branch) rs updatemap succeeded [] if null failed diff --git a/Assistant/Threads/Committer.hs b/Assistant/Threads/Committer.hs --- a/Assistant/Threads/Committer.hs +++ b/Assistant/Threads/Committer.hs @@ -35,6 +35,7 @@ import Utility.InodeCache import Annex.Content.Direct import qualified Command.Sync +import qualified Git.Branch import Data.Time.Clock import Data.Tuple.Utils @@ -219,7 +220,11 @@ v <- tryAnnex Annex.Queue.flush case v of Left _ -> return False - Right _ -> Command.Sync.commitStaged "" + Right _ -> do + ok <- Command.Sync.commitStaged Git.Branch.AutomaticCommit "" + when ok $ + Command.Sync.updateSyncBranch =<< inRepo Git.Branch.current + return ok {- OSX needs a short delay after a file is added before locking it down, - when using a non-direct mode repository, as pasting a file seems to diff --git a/Assistant/Threads/Merger.hs b/Assistant/Threads/Merger.hs --- a/Assistant/Threads/Merger.hs +++ b/Assistant/Threads/Merger.hs @@ -79,11 +79,13 @@ mergecurrent (Just current) | equivBranches changedbranch current = do - debug - [ "merging", Git.fromRef changedbranch - , "into", Git.fromRef current - ] - void $ liftAnnex $ autoMergeFrom changedbranch (Just current) + void $ liftAnnex $ autoMergeFrom changedbranch (Just current) Git.Branch.AutomaticCommit + whenM (liftAnnex $ inRepo $ Git.Branch.changed current changedbranch) $ do + debug + [ "merging", Git.fromRef changedbranch + , "into", Git.fromRef current + ] + void $ liftAnnex $ autoMergeFrom changedbranch (Just current) Git.Branch.AutomaticCommit mergecurrent _ = noop handleDesynced = case fromTaggedBranch changedbranch of diff --git a/Assistant/Threads/SanityChecker.hs b/Assistant/Threads/SanityChecker.hs --- a/Assistant/Threads/SanityChecker.hs +++ b/Assistant/Threads/SanityChecker.hs @@ -23,7 +23,7 @@ import Assistant.Types.UrlRenderer import qualified Annex.Branch import qualified Git.LsFiles -import qualified Git.Command +import qualified Git.Command.Batch import qualified Git.Config import Utility.ThreadScheduler import qualified Assistant.Threads.Watcher as Watcher @@ -167,7 +167,7 @@ - to have a lot of small objects and they should not be a - significant size. -} when (Git.Config.getMaybe "gc.auto" g == Just "0") $ - liftIO $ void $ Git.Command.runBatch batchmaker + liftIO $ void $ Git.Command.Batch.run batchmaker [ Param "-c", Param "gc.auto=670000" , Param "gc" , Param "--auto" @@ -224,7 +224,7 @@ totalsize <- liftIO $ sum <$> mapM filesize logs when (totalsize > 2 * oneMegabyte) $ do notice ["Rotated logs due to size:", show totalsize] - liftIO $ openLog f >>= redirLog + liftIO $ openLog f >>= handleToFd >>= redirLog when (n < maxLogs + 1) $ do df <- liftIO $ getDiskFree $ takeDirectory f case df of diff --git a/Assistant/Upgrade.hs b/Assistant/Upgrade.hs --- a/Assistant/Upgrade.hs +++ b/Assistant/Upgrade.hs @@ -33,6 +33,7 @@ import Utility.Tmp import Utility.UserInfo import Utility.Gpg +import Utility.FileMode import qualified Utility.Lsof as Lsof import qualified Build.SysConfig import qualified Utility.Url as Url @@ -348,7 +349,7 @@ verifyDistributionSig sig = do p <- readProgramFile if isAbsolute p - then withTmpDir "git-annex-gpg.tmp" $ \gpgtmp -> do + then withUmask 0o0077 $ withTmpDir "git-annex-gpg.tmp" $ \gpgtmp -> do let trustedkeys = takeDirectory p "trustedkeys.gpg" boolSystem gpgcmd [ Param "--no-default-keyring" diff --git a/Assistant/WebApp/Configurators/Local.hs b/Assistant/WebApp/Configurators/Local.hs --- a/Assistant/WebApp/Configurators/Local.hs +++ b/Assistant/WebApp/Configurators/Local.hs @@ -14,13 +14,11 @@ import Assistant.WebApp.MakeRemote import Assistant.Sync import Assistant.Restart -import Annex.Init +import Annex.MakeRepo import qualified Git -import qualified Git.Construct import qualified Git.Config import qualified Git.Command import qualified Git.Branch -import qualified Annex import Config.Files import Utility.FreeDesktop import Utility.DiskFree @@ -30,14 +28,12 @@ import Utility.DataUnits import Remote (prettyUUID) import Annex.UUID -import Annex.Direct import Types.StandardGroups import Logs.PreferredContent import Logs.UUID import Utility.UserInfo import Config import Utility.Gpg -import qualified Annex.Branch import qualified Remote.GCrypt as GCrypt import qualified Types.Remote @@ -413,69 +409,6 @@ fromJust $ postFirstRun webapp redirect $ T.pack url -{- Makes a new git repository. Or, if a git repository already - - exists, returns False. -} -makeRepo :: FilePath -> Bool -> IO Bool -makeRepo path bare = ifM (probeRepoExists path) - ( return False - , do - (transcript, ok) <- - processTranscript "git" (toCommand params) Nothing - unless ok $ - error $ "git init failed!\nOutput:\n" ++ transcript - return True - ) - where - baseparams = [Param "init", Param "--quiet"] - params - | bare = baseparams ++ [Param "--bare", File path] - | otherwise = baseparams ++ [File path] - -{- Runs an action in the git repository in the specified directory. -} -inDir :: FilePath -> Annex a -> IO a -inDir dir a = do - state <- Annex.new =<< Git.Config.read =<< Git.Construct.fromPath dir - Annex.eval state a - -{- Creates a new repository, and returns its UUID. -} -initRepo :: Bool -> Bool -> FilePath -> Maybe String -> Maybe StandardGroup -> IO UUID -initRepo True primary_assistant_repo dir desc mgroup = inDir dir $ do - initRepo' desc mgroup - {- Initialize the master branch, so things that expect - - to have it will work, before any files are added. -} - unlessM (Git.Config.isBare <$> gitRepo) $ - void $ inRepo $ Git.Command.runBool - [ Param "commit" - , Param "--quiet" - , Param "--allow-empty" - , Param "-m" - , Param "created repository" - ] - {- Repositories directly managed by the assistant use direct mode. - - - - Automatic gc is disabled, as it can be slow. Insted, gc is done - - once a day. - -} - when primary_assistant_repo $ do - setDirect True - inRepo $ Git.Command.run - [Param "config", Param "gc.auto", Param "0"] - getUUID -{- Repo already exists, could be a non-git-annex repo though so - - still initialize it. -} -initRepo False _ dir desc mgroup = inDir dir $ do - initRepo' desc mgroup - getUUID - -initRepo' :: Maybe String -> Maybe StandardGroup -> Annex () -initRepo' desc mgroup = unlessM isInitialized $ do - initialize desc - u <- getUUID - maybe noop (defaultStandardGroup u) mgroup - {- Ensure branch gets committed right away so it is - - available for merging immediately. -} - Annex.Branch.commit "update" - {- Checks if the user can write to a directory. - - The directory may be in the process of being created; if so @@ -485,11 +418,6 @@ tocheck <- ifM (doesDirectoryExist dir) (return dir, return $ parentDir dir) catchBoolIO $ fileAccess tocheck False True False - -{- Checks if a git repo exists at a location. -} -probeRepoExists :: FilePath -> IO Bool -probeRepoExists dir = isJust <$> - catchDefaultIO Nothing (Git.Construct.checkForRepo dir) {- Gets the UUID of the git repo at a location, which may not exist, or - not be a git-annex repo. -} diff --git a/Assistant/WebApp/DashBoard.hs b/Assistant/WebApp/DashBoard.hs --- a/Assistant/WebApp/DashBoard.hs +++ b/Assistant/WebApp/DashBoard.hs @@ -118,20 +118,22 @@ path <- liftAnnex $ fromRepo Git.repoPath #ifdef darwin_HOST_OS let cmd = "open" - let params = [Param path] + let p = proc cmd [path] #else #ifdef mingw32_HOST_OS + {- Changing to the directory and then opening . works around + - spaces in directory name, etc. -} let cmd = "cmd" - let params = [Param $ "/c start " ++ path] + let p = (proc cmd ["/c start ."]) { cwd = Just path } #else let cmd = "xdg-open" - let params = [Param path] + let p = proc cmd [path] #endif #endif ifM (liftIO $ inPath cmd) ( do let run = void $ liftIO $ forkIO $ void $ - boolSystem cmd params + createProcess p run #ifdef mingw32_HOST_OS {- On windows, if the file browser is not diff --git a/Build/BuildVersion.hs b/Build/BuildVersion.hs new file mode 100644 --- /dev/null +++ b/Build/BuildVersion.hs @@ -0,0 +1,6 @@ +{- Outputs the version of git-annex that was built, for use by + - autobuilders. Note that this includes the git rev. -} + +import Build.Version + +main = putStr =<< getVersion diff --git a/Build/Configure.hs b/Build/Configure.hs --- a/Build/Configure.hs +++ b/Build/Configure.hs @@ -17,7 +17,7 @@ tests :: [TestCase] tests = - [ TestCase "version" getVersion + [ TestCase "version" (Config "packageversion" . StringConfig <$> getVersion) , TestCase "UPGRADE_LOCATION" getUpgradeLocation , TestCase "git" $ requireCmd "git" "git --version >/dev/null" , TestCase "git version" getGitVersion diff --git a/Build/DistributionUpdate.hs b/Build/DistributionUpdate.hs --- a/Build/DistributionUpdate.hs +++ b/Build/DistributionUpdate.hs @@ -1,7 +1,10 @@ -{- Builds distributon info files for each git-annex release in a directory - - tree, which must itself be part of a git-annex repository. Only files - - that are present have their info file created. +{- Downloads git-annex autobuilds and installs them into the git-annex + - repository in ~/lib/downloads that is used to distribute git-annex + - releases. - + - Generates info files, containing the version (of the corresponding file + - from the autobuild). + - - Also gpg signs the files. -} @@ -9,25 +12,87 @@ import Types.Distribution import Build.Version import Utility.UserInfo -import Utility.Path +import Utility.Url import qualified Git.Construct import qualified Annex import Annex.Content import Backend import Git.Command +import Data.Default import Data.Time.Clock +import Data.Char -- git-annex distribution signing key (for Joey Hess) signingKey :: String signingKey = "89C809CB" +-- URL to an autobuilt git-annex file, and the place to install +-- it in the repository. +autobuilds :: [(URLString, FilePath)] +autobuilds = + (map linuxarch ["i386", "amd64", "armel"]) ++ + (map androidversion ["4.0", "4.3"]) ++ + [ (autobuild "x86_64-apple-mavericks/git-annex.dmg", "git-annex/OSX/current/10.9_Mavericks/git-annex.dmg") + , (autobuild "windows/git-annex-installer.exe", "git-annex/windows/current/git-annex-installer.exe") + ] + where + linuxarch a = + ( autobuild (a ++ "/git-annex-standalone-" ++ a ++ ".tar.gz") + , "git-annex/linux/current/git-annex-standalone-" ++ a ++ ".tar.gz" + ) + androidversion v = + ( autobuild ("android/" ++ v ++ "/git-annex.apk") + , "git-annex/android/current/" ++ v ++ "/git-annex.apk" + ) + autobuld f = "https://downloads.kitenet.net/git-annex/autobuild/" ++ f + +main :: IO () main = do - state <- Annex.new =<< Git.Construct.fromPath =<< getRepoDir - Annex.eval state makeinfos + repodir <- getRepoDir + updated <- catMaybes <$> mapM (getbuild repodir) autobuilds + state <- Annex.new =<< Git.Construct.fromPath repodir + Annex.eval state (makeinfos updated) -makeinfos :: Annex () -makeinfos = do +-- Download a build from the autobuilder, and return its version. +-- It's very important that the version matches the build, otherwise +-- auto-upgrades can loop reatedly. So, check build-version before +-- and after downloading the file. +getbuild :: FilePath -> (URLString, FilePath) -> IO (Maybe (FilePath, Version)) +getbuild repodir (url, f) = do + bv1 <- getbv + let dest = repodir f + let tmp = dest ++ ".tmp" + nukeFile tmp + createDirectoryIfMissing True (parentDir dest) + let oops s = do + nukeFile tmp + putStrLn $ "*** " ++ s + return Nothing + ifM (download url tmp def) + ( do + bv2 <- getbv + case bv2 of + Nothing -> oops $ "no build-version file for " ++ url + (Just v) + | bv2 == bv1 -> do + nukeFile dest + renameFile tmp dest + -- remove git rev part of version + let v' = takeWhile (/= '-') v + return $ Just (f, v') + | otherwise -> oops $ "build version changed while downloading " ++ url ++ " " ++ show (bv1, bv2) + , oops $ "failed to download " ++ url + ) + where + bvurl = takeDirectory url ++ "/build-version" + getbv = do + bv <- catchDefaultIO "" $ readProcess "curl" ["--silent", bvurl] + return $ if null bv || any (not . versionchar) bv then Nothing else Just bv + versionchar c = isAlphaNum c || c == '.' || c == '-' + +makeinfos :: [(FilePath, Version)] -> Annex () +makeinfos updated = do version <- liftIO getChangelogVersion void $ inRepo $ runBool [ Param "commit" @@ -37,25 +102,24 @@ ] basedir <- liftIO getRepoDir now <- liftIO getCurrentTime - liftIO $ putStrLn $ "building info files for version " ++ version ++ " in " ++ basedir - fs <- liftIO $ dirContentsRecursiveSkipping (const False) True (basedir "git-annex") - forM_ fs $ \f -> do - v <- lookupFile f + liftIO $ putStrLn $ "building info files in " ++ basedir + forM_ updated $ \(f, bv) -> do + v <- lookupFile (basedir f) case v of Nothing -> noop Just k -> whenM (inAnnex k) $ do liftIO $ putStrLn f - let infofile = f ++ ".info" + let infofile = basedir f ++ ".info" liftIO $ writeFile infofile $ show $ GitAnnexDistribution - { distributionUrl = mkUrl basedir f + { distributionUrl = mkUrl f , distributionKey = k - , distributionVersion = version + , distributionVersion = bv , distributionReleasedate = now , distributionUrgentUpgrade = Nothing } void $ inRepo $ runBool [Param "add", File infofile] signFile infofile - signFile f + signFile (basedir f) void $ inRepo $ runBool [ Param "commit" , Param "-m" @@ -70,7 +134,7 @@ , Params "sync" ] - {- Check for out of date info files. -} + -- Check for out of date info files. infos <- liftIO $ filter (".info" `isSuffixOf`) <$> dirContentsRecursive (basedir "git-annex") ds <- liftIO $ forM infos (readish <$$> readFile) @@ -88,8 +152,8 @@ home <- liftIO myHomeDir return $ home "lib" "downloads" -mkUrl :: FilePath -> FilePath -> String -mkUrl basedir f = "https://downloads.kitenet.net/" ++ relPathDirToFile basedir f +mkUrl :: FilePath -> String +mkUrl f = "https://downloads.kitenet.net/" ++ f signFile :: FilePath -> Annex () signFile f = do diff --git a/Build/EvilLinker.hs b/Build/EvilLinker.hs --- a/Build/EvilLinker.hs +++ b/Build/EvilLinker.hs @@ -20,7 +20,7 @@ import Data.List import Utility.Monad -import Utility.Process +import Utility.Process hiding (env) import Utility.Env data CmdParams = CmdParams diff --git a/Build/NullSoftInstaller.hs b/Build/NullSoftInstaller.hs --- a/Build/NullSoftInstaller.hs +++ b/Build/NullSoftInstaller.hs @@ -42,8 +42,12 @@ when (isNothing p) $ print ("unable to find in PATH", f) return p + let webappscript = tmpdir "git-annex-webapp.vbs" + webappscript <- vbsLauncher tmpdir "git-annex-webapp" "git-annex webapp" + autostartscript <- vbsLauncher tmpdir "git-annex-autostart" "git annex assistant --autostart" writeFile nsifile $ makeInstaller gitannex license $ - catMaybes extrafiles + catMaybes extrafiles ++ + [ webappscript, autostartscript ] mustSucceed "makensis" [File nsifile] removeFile nsifile -- left behind if makensis fails where @@ -54,6 +58,17 @@ True -> return () False -> error $ cmd ++ " failed" +{- Generates a .vbs launcher which runs a command without any visible DOS + - box. -} +vbsLauncher :: FilePath -> String -> String -> IO String +vbsLauncher tmpdir basename cmd = do + let f = tmpdir basename ++ ".vbs" + writeFile f $ unlines + [ "Set objshell=CreateObject(\"Wscript.Shell\")" + , "objShell.Run(\"" ++ cmd ++ "\"), 0, False" + ] + return f + gitannexprogram :: FilePath gitannexprogram = "git-annex.exe" @@ -72,6 +87,9 @@ startMenuItem :: Exp FilePath startMenuItem = "$SMPROGRAMS/git-annex.lnk" +autoStartItem :: Exp FilePath +autoStartItem = "$SMSTARTUP/git-annex-autostart.lnk" + needGit :: Exp String needGit = strConcat [ fromString "You need git installed to use git-annex. Looking at " @@ -101,14 +119,22 @@ -- Start menu shortcut Development.NSIS.createDirectory "$SMPROGRAMS" createShortcut startMenuItem - [ Target "$INSTDIR/git-annex.exe" - , Parameters "webapp" + [ Target "wscript.exe" + , Parameters "\"$INSTDIR/git-annex-webapp.vbs\"" + , StartOptions "SW_SHOWNORMAL" , IconFile "$INSTDIR/git-annex.exe" , IconIndex 2 - , StartOptions "SW_SHOWMINIMIZED" , KeyboardShortcut "ALT|CONTROL|a" , Description "git-annex webapp" ] + createShortcut autoStartItem + [ Target "wscript.exe" + , Parameters "\"$INSTDIR/git-annex-autostart.vbs\"" + , StartOptions "SW_SHOWNORMAL" + , IconFile "$INSTDIR/git-annex.exe" + , IconIndex 2 + , Description "git-annex autostart" + ] -- Groups of files to install section "main" [] $ do setOutPath "$INSTDIR" @@ -118,11 +144,12 @@ writeUninstaller $ str uninstaller uninstall $ do delete [RebootOK] $ startMenuItem + delete [RebootOK] $ autoStartItem mapM_ (\f -> delete [RebootOK] $ fromString $ "$INSTDIR/" ++ f) $ [ gitannexprogram , licensefile , uninstaller - ] ++ cygwinPrograms ++ cygwinDlls + ] ++ cygwinPrograms ++ cygwinDlls ++ extrafiles where addfile f = file [] (str f) diff --git a/Build/Version.hs b/Build/Version.hs --- a/Build/Version.hs +++ b/Build/Version.hs @@ -10,10 +10,11 @@ import Data.Char import System.Process -import Build.TestConfig import Utility.Monad import Utility.Exception +type Version = String + {- Set when making an official release. (Distribution vendors should set - this too.) -} isReleaseBuild :: IO Bool @@ -25,10 +26,10 @@ - - If git or a git repo is not available, or something goes wrong, - or this is a release build, just use the version from the changelog. -} -getVersion :: Test +getVersion :: IO Version getVersion = do changelogversion <- getChangelogVersion - version <- ifM (isReleaseBuild) + ifM (isReleaseBuild) ( return changelogversion , catchDefaultIO changelogversion $ do let major = takeWhile (/= '.') changelogversion @@ -40,9 +41,8 @@ then return changelogversion else return $ concat [ major, ".", autoversion ] ) - return $ Config "packageversion" (StringConfig version) -getChangelogVersion :: IO String +getChangelogVersion :: IO Version getChangelogVersion = do changelog <- readFile "debian/changelog" let verline = takeWhile (/= '\n') changelog diff --git a/CHANGELOG b/CHANGELOG --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,29 @@ +git-annex (5.20140707) unstable; urgency=medium + + * assistant: Fix bug, introduced in last release, that caused the assistant + to make many unncessary empty merge commits. + * assistant: Fix one-way assistant->assistant sync in direct mode. + * Fix bug in annex.queuesize calculation that caused much more + queue flushing than necessary. + * importfeed: When annex.genmetadata is set, metadata from the feed + is added to files that are imported from it. + * Support users who have set commit.gpgsign, by disabling gpg signatures + for git-annex branch commits and commits made by the assistant. + * Fix memory leak when committing millions of changes to the git-annex + branch, eg after git-annex add has run on 2 million files in one go. + * Support building with bloomfilter 2.0.0. + * Run standalone install process when the assistant is started + (was only being run when the webapp was opened). + * Android: patch git to avoid fchmod, which fails on /sdcard. + * Windows: Got rid of that pesky DOS box when starting the webapp. + * Windows: Added Startup menu item so assistant starts automatically + on login. + * Windows: Fix opening file browser from webapp when repo is in a + directory with spaces. + * Windows: Assistant now logs to daemon.log. + + -- Joey Hess Mon, 07 Jul 2014 12:24:13 -0400 + git-annex (5.20140613) unstable; urgency=medium * Ignore setsid failures. diff --git a/Command/AddUrl.hs b/Command/AddUrl.hs --- a/Command/AddUrl.hs +++ b/Command/AddUrl.hs @@ -97,15 +97,17 @@ where quviurl = setDownloader pageurl QuviDownloader addurl key = next $ cleanup quviurl file key Nothing - geturl = next $ addUrlFileQuvi relaxed quviurl videourl file + geturl = next $ isJust <$> addUrlFileQuvi relaxed quviurl videourl file #endif #ifdef WITH_QUVI -addUrlFileQuvi :: Bool -> URLString -> URLString -> FilePath -> Annex Bool +addUrlFileQuvi :: Bool -> URLString -> URLString -> FilePath -> Annex (Maybe Key) addUrlFileQuvi relaxed quviurl videourl file = do key <- Backend.URL.fromUrl quviurl Nothing ifM (pure relaxed <||> Annex.getState Annex.fast) - ( cleanup quviurl file key Nothing + ( do + cleanup' quviurl file key Nothing + return (Just key) , do {- Get the size, and use that to check - disk space. However, the size info is not @@ -113,7 +115,7 @@ - might change and we want to be able to download - it later. -} sizedkey <- addSizeUrlKey videourl key - prepGetViaTmpChecked sizedkey $ do + prepGetViaTmpChecked sizedkey Nothing $ do tmp <- fromRepo $ gitAnnexTmpObjectLocation key showOutput ok <- Transfer.notifyTransfer Transfer.Download (Just file) $ @@ -121,15 +123,17 @@ liftIO $ createDirectoryIfMissing True (parentDir tmp) downloadUrl [videourl] tmp if ok - then cleanup quviurl file key (Just tmp) - else return False + then do + cleanup' quviurl file key (Just tmp) + return (Just key) + else return Nothing ) #endif perform :: Bool -> URLString -> FilePath -> CommandPerform perform relaxed url file = ifAnnexed file addurl geturl where - geturl = next $ addUrlFile relaxed url file + geturl = next $ isJust <$> addUrlFile relaxed url file addurl key | relaxed = do setUrlPresent key url @@ -149,7 +153,7 @@ stop ) -addUrlFile :: Bool -> URLString -> FilePath -> Annex Bool +addUrlFile :: Bool -> URLString -> FilePath -> Annex (Maybe Key) addUrlFile relaxed url file = do liftIO $ createDirectoryIfMissing True (parentDir file) ifM (Annex.getState Annex.fast <||> pure relaxed) @@ -159,13 +163,13 @@ download url file ) -download :: URLString -> FilePath -> Annex Bool +download :: URLString -> FilePath -> Annex (Maybe Key) download url file = do {- Generate a dummy key to use for this download, before we can - examine the file and find its real key. This allows resuming - downloads, as the dummy key for a given url is stable. -} dummykey <- addSizeUrlKey url =<< Backend.URL.fromUrl url Nothing - prepGetViaTmpChecked dummykey $ do + prepGetViaTmpChecked dummykey Nothing $ do tmp <- fromRepo $ gitAnnexTmpObjectLocation dummykey showOutput ifM (runtransfer dummykey tmp) @@ -178,9 +182,11 @@ } k <- genKey source backend case k of - Nothing -> return False - Just (key, _) -> cleanup url file key (Just tmp) - , return False + Nothing -> return Nothing + Just (key, _) -> do + cleanup' url file key (Just tmp) + return (Just key) + , return Nothing ) where runtransfer dummykey tmp = Transfer.notifyTransfer Transfer.Download (Just file) $ @@ -200,6 +206,11 @@ cleanup :: URLString -> FilePath -> Key -> Maybe FilePath -> Annex Bool cleanup url file key mtmp = do + cleanup' url file key mtmp + return True + +cleanup' :: URLString -> FilePath -> Key -> Maybe FilePath -> Annex () +cleanup' url file key mtmp = do when (isJust mtmp) $ logStatus key InfoPresent setUrlPresent key url @@ -210,9 +221,8 @@ - must already exist, so flush the queue. -} Annex.Queue.flush maybe noop (moveAnnex key) mtmp - return True -nodownload :: Bool -> URLString -> FilePath -> Annex Bool +nodownload :: Bool -> URLString -> FilePath -> Annex (Maybe Key) nodownload relaxed url file = do (exists, size) <- if relaxed then pure (True, Nothing) @@ -220,10 +230,11 @@ if exists then do key <- Backend.URL.fromUrl url size - cleanup url file key Nothing + cleanup' url file key Nothing + return (Just key) else do warning $ "unable to access url: " ++ url - return False + return Nothing url2file :: URI -> Maybe Int -> Int -> FilePath url2file url pathdepth pathmax = case pathdepth of diff --git a/Command/Assistant.hs b/Command/Assistant.hs --- a/Command/Assistant.hs +++ b/Command/Assistant.hs @@ -14,6 +14,7 @@ import Config.Files import qualified Build.SysConfig import Utility.HumanTime +import Assistant.Install import System.Environment @@ -50,6 +51,7 @@ liftIO $ autoStart startdelay stop | otherwise = do + liftIO ensureInstalled ensureInitialized Command.Watch.start True foreground stopdaemon startdelay diff --git a/Command/Direct.hs b/Command/Direct.hs --- a/Command/Direct.hs +++ b/Command/Direct.hs @@ -12,8 +12,8 @@ import Common.Annex import Command import qualified Git -import qualified Git.Command import qualified Git.LsFiles +import qualified Git.Branch import Config import Annex.Direct import Annex.Exception @@ -33,9 +33,8 @@ perform = do showStart "commit" "" showOutput - _ <- inRepo $ Git.Command.runBool - [ Param "commit" - , Param "-a" + _ <- inRepo $ Git.Branch.commitCommand Git.Branch.ManualCommit + [ Param "-a" , Param "-m" , Param "commit before switching to direct mode" ] diff --git a/Command/ImportFeed.hs b/Command/ImportFeed.hs --- a/Command/ImportFeed.hs +++ b/Command/ImportFeed.hs @@ -33,6 +33,9 @@ import qualified Utility.Quvi as Quvi import Command.AddUrl (addUrlFileQuvi) #endif +import Types.MetaData +import Logs.MetaData +import Annex.MetaData def :: [Command] def = [notBareRepo $ withOptions [templateOption, relaxedOption] $ @@ -165,12 +168,14 @@ Nothing -> return True Just f -> do showStart "addurl" f - ok <- getter f - if ok - then do + mk <- getter f + case mk of + Just key -> do + whenM (annexGenMetaData <$> Annex.getGitConfig) $ + addMetaData key $ extractMetaData todownload showEndOk return True - else do + Nothing -> do showEndFail checkFeedBroken (feedurl todownload) @@ -198,32 +203,19 @@ ( return Nothing , tryanother ) - + defaultTemplate :: String defaultTemplate = "${feedtitle}/${itemtitle}${extension}" {- Generates a filename to use for a feed item by filling out the template. - The filename may not be unique. -} feedFile :: Utility.Format.Format -> ToDownload -> String -> FilePath -feedFile tmpl i extension = Utility.Format.format tmpl $ M.fromList - [ field "feedtitle" $ getFeedTitle $ feed i - , fieldMaybe "itemtitle" $ getItemTitle $ item i - , fieldMaybe "feedauthor" $ getFeedAuthor $ feed i - , fieldMaybe "itemauthor" $ getItemAuthor $ item i - , fieldMaybe "itemsummary" $ getItemSummary $ item i - , fieldMaybe "itemdescription" $ getItemDescription $ item i - , fieldMaybe "itemrights" $ getItemRights $ item i - , fieldMaybe "itemid" $ snd <$> getItemId (item i) - , fieldMaybe "itempubdate" $ pubdate $ item i - , ("extension", sanitizeFilePath extension) - ] +feedFile tmpl i extension = Utility.Format.format tmpl $ + M.map sanitizeFilePath $ M.fromList $ extractFields i ++ + [ ("extension", extension) + , extractField "itempubdate" [pubdate $ item i] + ] where - field k v = - let s = sanitizeFilePath v in - if null s then (k, "none") else (k, s) - fieldMaybe k Nothing = (k, "none") - fieldMaybe k (Just v) = field k v - #if MIN_VERSION_feed(0,3,9) pubdate itm = case getItemPublishDate itm :: Maybe (Maybe UTCTime) of Just (Just d) -> Just $ @@ -233,6 +225,41 @@ #else pubdate _ = Nothing #endif + +extractMetaData :: ToDownload -> MetaData +extractMetaData i = case getItemPublishDate (item i) :: Maybe (Maybe UTCTime) of + Just (Just d) -> unionMetaData meta (dateMetaData d meta) + _ -> meta + where + tometa (k, v) = (mkMetaFieldUnchecked k, S.singleton (toMetaValue v)) + meta = MetaData $ M.fromList $ map tometa $ extractFields i + +{- Extract fields from the feed and item, that are both used as metadata, + - and to generate the filename. -} +extractFields :: ToDownload -> [(String, String)] +extractFields i = map (uncurry extractField) + [ ("feedtitle", [feedtitle]) + , ("itemtitle", [itemtitle]) + , ("feedauthor", [feedauthor]) + , ("itemauthor", [itemauthor]) + , ("itemsummary", [getItemSummary $ item i]) + , ("itemdescription", [getItemDescription $ item i]) + , ("itemrights", [getItemRights $ item i]) + , ("itemid", [snd <$> getItemId (item i)]) + , ("title", [itemtitle, feedtitle]) + , ("author", [itemauthor, feedauthor]) + ] + where + feedtitle = Just $ getFeedTitle $ feed i + itemtitle = getItemTitle $ item i + feedauthor = getFeedAuthor $ feed i + itemauthor = getItemAuthor $ item i + +extractField :: String -> [Maybe String] -> (String, String) +extractField k [] = (k, "none") +extractField k (Just v:_) + | not (null v) = (k, v) +extractField k (_:rest) = extractField k rest {- Called when there is a problem with a feed. - Throws an error if the feed is broken, otherwise shows a warning. -} diff --git a/Command/Indirect.hs b/Command/Indirect.hs --- a/Command/Indirect.hs +++ b/Command/Indirect.hs @@ -12,7 +12,7 @@ import Common.Annex import Command import qualified Git -import qualified Git.Command +import qualified Git.Branch import qualified Git.LsFiles import Git.FileMode import Config @@ -49,9 +49,8 @@ showStart "commit" "" whenM stageDirect $ do showOutput - void $ inRepo $ Git.Command.runBool - [ Param "commit" - , Param "-m" + void $ inRepo $ Git.Branch.commitCommand Git.Branch.ManualCommit + [ Param "-m" , Param "commit before switching to indirect mode" ] showEndOk diff --git a/Command/Sync.hs b/Command/Sync.hs --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -127,14 +127,12 @@ showStart "commit" "" void stageDirect void preCommitDirect - commitStaged commitmessage + commitStaged Git.Branch.ManualCommit commitmessage , do showStart "commit" "" Annex.Branch.commit "update" - -- Commit will fail when the tree is clean, so ignore failure. - _ <- inRepo $ tryIO . Git.Command.runQuiet - [ Param "commit" - , Param "-a" + inRepo $ Git.Branch.commitQuiet Git.Branch.ManualCommit + [ Param "-a" , Param "-m" , Param commitmessage ] @@ -143,14 +141,14 @@ where commitmessage = "git-annex automatic sync" -commitStaged :: String -> Annex Bool -commitStaged commitmessage = go =<< inRepo Git.Branch.currentUnsafe +commitStaged :: Git.Branch.CommitMode -> String -> Annex Bool +commitStaged commitmode commitmessage = go =<< inRepo Git.Branch.currentUnsafe where go Nothing = return False go (Just branch) = do runAnnexHook preCommitAnnexHook parent <- inRepo $ Git.Ref.sha branch - void $ inRepo $ Git.Branch.commit False commitmessage branch + void $ inRepo $ Git.Branch.commit commitmode False commitmessage branch (maybeToList parent) return True @@ -169,11 +167,16 @@ go False = stop go True = do showStart "merge" $ Git.Ref.describe syncbranch - next $ next $ autoMergeFrom syncbranch (Just branch) + next $ next $ autoMergeFrom syncbranch (Just branch) Git.Branch.ManualCommit pushLocal :: Maybe Git.Ref -> CommandStart -pushLocal Nothing = stop -pushLocal (Just branch) = do +pushLocal b = do + updateSyncBranch b + stop + +updateSyncBranch :: Maybe Git.Ref -> Annex () +updateSyncBranch Nothing = noop +updateSyncBranch (Just branch) = do -- Update the sync branch to match the new state of the branch inRepo $ updateBranch $ syncBranch branch -- In direct mode, we're operating on some special direct mode @@ -181,7 +184,6 @@ -- branch. whenM isDirect $ inRepo $ updateBranch $ fromDirectBranch branch - stop updateBranch :: Git.Ref -> Git.Repo -> IO () updateBranch syncbranch g = @@ -217,7 +219,7 @@ Just thisbranch -> and <$> (mapM (merge (Just thisbranch)) =<< tomerge (branchlist b)) where - merge thisbranch = flip autoMergeFrom thisbranch . remoteBranch remote + merge thisbranch br = autoMergeFrom (remoteBranch remote br) thisbranch Git.Branch.ManualCommit tomerge = filterM (changed remote) branchlist Nothing = [] branchlist (Just branch) = [branch, syncBranch branch] diff --git a/Command/Unannex.hs b/Command/Unannex.hs --- a/Command/Unannex.hs +++ b/Command/Unannex.hs @@ -16,6 +16,7 @@ import Annex.Content import Annex.Content.Direct import qualified Git.Command +import qualified Git.Branch import qualified Git.Ref import qualified Git.DiffTree as DiffTree import Utility.CopyFile @@ -45,9 +46,8 @@ ) ) where - commit = inRepo $ Git.Command.run - [ Param "commit" - , Param "-q" + commit = inRepo $ Git.Branch.commitCommand Git.Branch.ManualCommit + [ Param "-q" , Param "--allow-empty" , Param "--no-verify" , Param "-m", Param "content removed from git annex" diff --git a/Command/Unused.hs b/Command/Unused.hs --- a/Command/Unused.hs +++ b/Command/Unused.hs @@ -10,9 +10,6 @@ module Command.Unused where import qualified Data.Set as S -import Data.BloomFilter -import Data.BloomFilter.Easy -import Data.BloomFilter.Hash import Control.Monad.ST import qualified Data.Map as M @@ -36,6 +33,7 @@ import Types.Key import Git.FilePath import Logs.View (is_branchView) +import Utility.Bloom def :: [Command] def = [withOptions [unusedFromOption] $ command "unused" paramNothing seek diff --git a/Git/Branch.hs b/Git/Branch.hs --- a/Git/Branch.hs +++ b/Git/Branch.hs @@ -14,6 +14,7 @@ import Git.Sha import Git.Command import qualified Git.Ref +import qualified Git.BuildVersion {- The currently checked out branch. - @@ -103,6 +104,31 @@ (False, True) -> findbest c rs -- worse (False, False) -> findbest c rs -- same +{- The user may have set commit.gpgsign, indending all their manual + - commits to be signed. But signing automatic/background commits could + - easily lead to unwanted gpg prompts or failures. + -} +data CommitMode = ManualCommit | AutomaticCommit + deriving (Eq) + +applyCommitMode :: CommitMode -> [CommandParam] -> [CommandParam] +applyCommitMode commitmode ps + | commitmode == AutomaticCommit && not (Git.BuildVersion.older "1.8.5") = + Param "--no-gpg-sign" : ps + | otherwise = ps + +{- Commit via the usual git command. -} +commitCommand :: CommitMode -> [CommandParam] -> Repo -> IO Bool +commitCommand = commitCommand' runBool + +{- Commit will fail when the tree is clean. This suppresses that error. -} +commitQuiet :: CommitMode -> [CommandParam] -> Repo -> IO () +commitQuiet commitmode ps = void . tryIO . commitCommand' runQuiet commitmode ps + +commitCommand' :: ([CommandParam] -> Repo -> IO a) -> CommitMode -> [CommandParam] -> Repo -> IO a +commitCommand' runner commitmode ps = runner $ + Param "commit" : applyCommitMode commitmode ps + {- Commits the index into the specified branch (or other ref), - with the specified parent refs, and returns the committed sha. - @@ -112,30 +138,31 @@ - Unlike git-commit, does not run any hooks, or examine the work tree - in any way. -} -commit :: Bool -> String -> Branch -> [Ref] -> Repo -> IO (Maybe Sha) -commit allowempty message branch parentrefs repo = do +commit :: CommitMode -> Bool -> String -> Branch -> [Ref] -> Repo -> IO (Maybe Sha) +commit commitmode allowempty message branch parentrefs repo = do tree <- getSha "write-tree" $ pipeReadStrict [Param "write-tree"] repo ifM (cancommit tree) ( do - sha <- getSha "commit-tree" $ pipeWriteRead - (map Param $ ["commit-tree", fromRef tree] ++ ps) - (Just $ flip hPutStr message) repo + sha <- getSha "commit-tree" $ + pipeWriteRead ([Param "commit-tree", Param (fromRef tree)] ++ ps) sendmsg repo update branch sha repo return $ Just sha , return Nothing ) where - ps = concatMap (\r -> ["-p", fromRef r]) parentrefs + ps = applyCommitMode commitmode $ + map Param $ concatMap (\r -> ["-p", fromRef r]) parentrefs cancommit tree | allowempty = return True | otherwise = case parentrefs of [p] -> maybe False (tree /=) <$> Git.Ref.tree p repo _ -> return True + sendmsg = Just $ flip hPutStr message -commitAlways :: String -> Branch -> [Ref] -> Repo -> IO Sha -commitAlways message branch parentrefs repo = fromJust - <$> commit True message branch parentrefs repo +commitAlways :: CommitMode -> String -> Branch -> [Ref] -> Repo -> IO Sha +commitAlways commitmode message branch parentrefs repo = fromJust + <$> commit commitmode True message branch parentrefs repo {- A leading + makes git-push force pushing a branch. -} forcePush :: String -> String diff --git a/Git/Command.hs b/Git/Command.hs --- a/Git/Command.hs +++ b/Git/Command.hs @@ -13,7 +13,6 @@ import Git import Git.Types import qualified Utility.CoProcess as CoProcess -import Utility.Batch {- Constructs a git command line operating on the specified repo. -} gitCommandLine :: [CommandParam] -> Repo -> [CommandParam] @@ -30,12 +29,6 @@ runBool :: [CommandParam] -> Repo -> IO Bool runBool params repo = assertLocal repo $ boolSystemEnv "git" (gitCommandLine params repo) (gitEnv repo) - -{- Runs git in batch mode. -} -runBatch :: BatchCommandMaker -> [CommandParam] -> Repo -> IO Bool -runBatch batchmaker params repo = assertLocal repo $ do - let (cmd, params') = batchmaker ("git", gitCommandLine params repo) - boolSystemEnv cmd params' (gitEnv repo) {- Runs git in the specified repo, throwing an error if it fails. -} run :: [CommandParam] -> Repo -> IO () diff --git a/Git/Command/Batch.hs b/Git/Command/Batch.hs new file mode 100644 --- /dev/null +++ b/Git/Command/Batch.hs @@ -0,0 +1,19 @@ +{- running batch git commands + - + - Copyright 2010-2013 Joey Hess + - + - Licensed under the GNU GPL version 3 or higher. + -} + +module Git.Command.Batch where + +import Common +import Git +import Git.Command +import Utility.Batch + +{- Runs git in batch mode. -} +run :: BatchCommandMaker -> [CommandParam] -> Repo -> IO Bool +run batchmaker params repo = assertLocal repo $ do + let (cmd, params') = batchmaker ("git", gitCommandLine params repo) + boolSystemEnv cmd params' (gitEnv repo) diff --git a/Git/Merge.hs b/Git/Merge.hs --- a/Git/Merge.hs +++ b/Git/Merge.hs @@ -11,14 +11,19 @@ import Git import Git.Command import Git.BuildVersion +import Git.Branch (CommitMode(..)) {- Avoids recent git's interactive merge. -} -mergeNonInteractive :: Ref -> Repo -> IO Bool -mergeNonInteractive branch +mergeNonInteractive :: Ref -> CommitMode -> Repo -> IO Bool +mergeNonInteractive branch commitmode | older "1.7.7.6" = merge [Param $ fromRef branch] - | otherwise = merge [Param "--no-edit", Param $ fromRef branch] + | otherwise = merge $ [Param "--no-edit", Param $ fromRef branch] where - merge ps = runBool $ Param "merge" : ps + merge ps = runBool $ cp ++ [Param "merge"] ++ ps + cp + | commitmode == AutomaticCommit = + [Param "-c", Param "commit.gpgsign=false"] + | otherwise = [] {- Stage the merge into the index, but do not commit it.-} stageMerge :: Ref -> Repo -> IO Bool diff --git a/Git/Queue.hs b/Git/Queue.hs --- a/Git/Queue.hs +++ b/Git/Queue.hs @@ -82,16 +82,16 @@ -} addCommand :: String -> [CommandParam] -> [FilePath] -> Queue -> Repo -> IO Queue addCommand subcommand params files q repo = - updateQueue action different (length newfiles) q repo + updateQueue action different (length files) q repo where key = actionKey action action = CommandAction { getSubcommand = subcommand , getParams = params - , getFiles = newfiles + , getFiles = allfiles } - newfiles = map File files ++ maybe [] getFiles (M.lookup key $ items q) - + allfiles = map File files ++ maybe [] getFiles (M.lookup key $ items q) + different (CommandAction { getSubcommand = s }) = s /= subcommand different _ = True diff --git a/Logs/MetaData.hs b/Logs/MetaData.hs --- a/Logs/MetaData.hs +++ b/Logs/MetaData.hs @@ -95,10 +95,12 @@ - will tend to be generated across the different log files, and so - git will be able to pack the data more efficiently. -} addMetaData' :: Key -> MetaData -> POSIXTime -> Annex () -addMetaData' k (MetaData m) now = Annex.Branch.change (metaDataLogFile k) $ - showLog . simplifyLog - . S.insert (LogEntry now metadata) - . parseLog +addMetaData' k d@(MetaData m) now + | d == emptyMetaData = noop + | otherwise = Annex.Branch.change (metaDataLogFile k) $ + showLog . simplifyLog + . S.insert (LogEntry now metadata) + . parseLog where metadata = MetaData $ M.filterWithKey (\f _ -> not (isLastChangedField f)) m diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -59,7 +59,7 @@ # hothasktags chokes on some template haskell etc, so ignore errors tags: - find . | grep -v /.git/ | grep -v /tmp/ | grep -v /dist/ | grep -v /doc/ | egrep '\.hs$$' | xargs hothasktags > tags 2>/dev/null + (for f in $$(find . | grep -v /.git/ | grep -v /tmp/ | grep -v /dist/ | grep -v /doc/ | egrep '\.hs$$'); do hothasktags -c --cpp -c -traditional -c --include=dist/build/autogen/cabal_macros.h $$f; done) 2>/dev/null | sort > tags # If ikiwiki is available, build static html docs suitable for being # shipped in the software package. @@ -83,7 +83,8 @@ rm -rf tmp dist git-annex $(mans) configure *.tix .hpc \ doc/.ikiwiki html dist tags Build/SysConfig.hs build-stamp \ Setup Build/InstallDesktopFile Build/EvilSplicer \ - Build/Standalone Build/OSXMkLibs Build/LinuxMkLibs Build/DistributionUpdate \ + Build/Standalone Build/OSXMkLibs Build/LinuxMkLibs \ + Build/DistributionUpdate Build/BuildVersion \ git-union-merge .tasty-rerun-log find . -name \*.o -exec rm {} \; find . -name \*.hi -exec rm {} \; @@ -255,7 +256,7 @@ distributionupdate: git pull cabal configure - ghc --make Build/DistributionUpdate -XPackageImports -optP-include -optPdist/build/autogen/cabal_macros.h + ghc -Wall --make Build/DistributionUpdate -XPackageImports -optP-include -optPdist/build/autogen/cabal_macros.h ./Build/DistributionUpdate .PHONY: git-annex git-union-merge git-recover-repository tags build-stamp diff --git a/Test.hs b/Test.hs --- a/Test.hs +++ b/Test.hs @@ -1406,9 +1406,9 @@ ensuretmpdir let b = if bare then " --bare" else "" boolSystem "git" [Params ("clone -q" ++ b), File old, File new] @? "git clone failed" + configrepo testenv new indir testenv new $ git_annex testenv "init" ["-q", new] @? "git annex init failed" - configrepo testenv new unless bare $ indir testenv new $ handleforcedirect testenv @@ -1416,8 +1416,11 @@ configrepo :: TestEnv -> FilePath -> IO () configrepo testenv dir = indir testenv dir $ do + -- ensure git is set up to let commits happen boolSystem "git" [Params "config user.name", Param "Test User"] @? "git config failed" boolSystem "git" [Params "config user.email test@example.com"] @? "git config failed" + -- avoid signed commits by test suite + boolSystem "git" [Params "config commit.gpgsign false"] @? "git config failed" handleforcedirect :: TestEnv -> IO () handleforcedirect testenv = when (M.lookup "FORCEDIRECT" testenv == Just "1") $ diff --git a/Utility/Bloom.hs b/Utility/Bloom.hs new file mode 100644 --- /dev/null +++ b/Utility/Bloom.hs @@ -0,0 +1,60 @@ +{- bloomfilter compatability wrapper + - + - Copyright 2014 Joey Hess + - + - License: BSD-2-clause + -} + +{-# LANGUAGE CPP #-} + +module Utility.Bloom ( + Bloom, + suggestSizing, + Hashable, + cheapHashes, + notElemB, + + newMB, + insertMB, + unsafeFreezeMB, +) where + +#if MIN_VERSION_bloomfilter(2,0,0) +import qualified Data.BloomFilter.Mutable as MBloom +import qualified Data.BloomFilter as Bloom +#else +import qualified Data.BloomFilter as Bloom +#endif +import Data.BloomFilter.Easy (suggestSizing, Bloom) +import Data.BloomFilter.Hash (Hashable, cheapHashes) +import Control.Monad.ST.Safe (ST) + +#if MIN_VERSION_bloomfilter(2,0,0) + +notElemB :: a -> Bloom a -> Bool +notElemB = Bloom.notElem + +newMB :: (a -> [Bloom.Hash]) -> Int -> ST s (MBloom.MBloom s a) +newMB = MBloom.new + +insertMB :: MBloom.MBloom s a -> a -> ST s () +insertMB = MBloom.insert + +unsafeFreezeMB :: MBloom.MBloom s a -> ST s (Bloom a) +unsafeFreezeMB = Bloom.unsafeFreeze + +#else + +notElemB :: a -> Bloom a -> Bool +notElemB = Bloom.notElemB + +newMB :: (a -> [Bloom.Hash]) -> Int -> ST s (Bloom.MBloom s a) +newMB = Bloom.newMB + +insertMB :: Bloom.MBloom s a -> a -> ST s () +insertMB = Bloom.insertMB + +unsafeFreezeMB :: Bloom.MBloom s a -> ST s (Bloom a) +unsafeFreezeMB = Bloom.unsafeFreezeMB + +#endif diff --git a/Utility/Directory.hs b/Utility/Directory.hs --- a/Utility/Directory.hs +++ b/Utility/Directory.hs @@ -18,12 +18,56 @@ import Control.Applicative import System.IO.Unsafe (unsafeInterleaveIO) +#ifdef mingw32_HOST_OS +import qualified System.Win32 as Win32 +#else +import qualified System.Posix as Posix +#endif + import Utility.PosixFiles import Utility.SafeCommand import Utility.Tmp import Utility.Exception import Utility.Monad import Utility.Applicative + +{- Unlike getDirectoryContents, this can be used in arbitrarily + - large directories without using much memory; the list steams lazily. + - + - However, any errors that may be encountered while reading the directory + - contents are *ignored*, rather than throw them in the context of + - whatever code consumes the lazy list. + - + - See https://ghc.haskell.org/trac/ghc/ticket/9266 + -} +getDirectoryContents' :: FilePath -> IO [FilePath] +getDirectoryContents' path = loop =<< opendir + where +#ifndef mingw32_HOST_OS + opendir = Posix.openDirStream path + loop dirp = do + v <- tryNonAsync $ Posix.readDirStream dirp + case v of + (Right ent) | not (null ent) -> do + rest <- unsafeInterleaveIO (loop dirp) + return (ent:rest) + _ -> do + void $ tryNonAsync $ Posix.closeDirStream dirp + return [] +#else + opendir = Win32.findFirstFile (path "*") + loop (h, fdat) = do + -- there is always at least 1 file ("." and "..") + ent <- Win32.getFindDataFileName fdat + v <- tryNonAsync $ Win32.findNextFile h fdat + case v of + Right True -> do + rest <- unsafeInterleaveIO (loop (h, fdat)) + return (ent:rest) + _ -> do + void $ tryNonAsync $ Win32.findClose h + return [ent] +#endif dirCruft :: FilePath -> Bool dirCruft "." = True diff --git a/Utility/LogFile.hs b/Utility/LogFile.hs --- a/Utility/LogFile.hs +++ b/Utility/LogFile.hs @@ -15,13 +15,10 @@ import System.Posix.Types #endif -#ifndef mingw32_HOST_OS -openLog :: FilePath -> IO Fd +openLog :: FilePath -> IO Handle openLog logfile = do rotateLog logfile - openFd logfile WriteOnly (Just stdFileMode) - defaultFileFlags { append = True } -#endif + openFile logfile AppendMode rotateLog :: FilePath -> IO () rotateLog logfile = go 0 diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,29 @@ +git-annex (5.20140707) unstable; urgency=medium + + * assistant: Fix bug, introduced in last release, that caused the assistant + to make many unncessary empty merge commits. + * assistant: Fix one-way assistant->assistant sync in direct mode. + * Fix bug in annex.queuesize calculation that caused much more + queue flushing than necessary. + * importfeed: When annex.genmetadata is set, metadata from the feed + is added to files that are imported from it. + * Support users who have set commit.gpgsign, by disabling gpg signatures + for git-annex branch commits and commits made by the assistant. + * Fix memory leak when committing millions of changes to the git-annex + branch, eg after git-annex add has run on 2 million files in one go. + * Support building with bloomfilter 2.0.0. + * Run standalone install process when the assistant is started + (was only being run when the webapp was opened). + * Android: patch git to avoid fchmod, which fails on /sdcard. + * Windows: Got rid of that pesky DOS box when starting the webapp. + * Windows: Added Startup menu item so assistant starts automatically + on login. + * Windows: Fix opening file browser from webapp when repo is in a + directory with spaces. + * Windows: Assistant now logs to daemon.log. + + -- Joey Hess Mon, 07 Jul 2014 12:24:13 -0400 + git-annex (5.20140613) unstable; urgency=medium * Ignore setsid failures. diff --git a/doc/backends/comment_7_de7ac3e84273d92b6907c694db54fb36._comment b/doc/backends/comment_7_de7ac3e84273d92b6907c694db54fb36._comment new file mode 100644 --- /dev/null +++ b/doc/backends/comment_7_de7ac3e84273d92b6907c694db54fb36._comment @@ -0,0 +1,9 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawnfM7ZF0Q5U9k1LljyDXH37cuXU5Gx6gtM" + nickname="A" + subject="fast migrate" + date="2014-07-05T08:21:20Z" + content=""" +dear Joey and everybody else, + some time ago I used \"git annex migrate\" to bring all my repositories up-to-date; after that I found (to my dismay) that some keys are SHA256, some others are SHA256E, so my data is not really deduplicated ; now, it would possible to migrate from SHAnnnE to SHAnnn (and vice versa) very fast... but currently AFAICS git-annex recomputes the whole checksum, and this (on my USB2.0 old disks) takes forever; may somebody please implement a fast migration? +"""]] diff --git a/doc/bugs/Android_fails_on_Google_Nexus_10_Jellybean.mdwn b/doc/bugs/Android_fails_on_Google_Nexus_10_Jellybean.mdwn new file mode 100644 --- /dev/null +++ b/doc/bugs/Android_fails_on_Google_Nexus_10_Jellybean.mdwn @@ -0,0 +1,166 @@ +### Please describe the problem. + +Install seems to die because /data/app-lib not found. Sorry, I did not copy. Git-annex log is below. + +I tried To run git-annex second time, here's what terminal says. + + +Falling back to hardcoded app location; cannot find expected files in /data/app-lib +git annex webapp +u0_a36@manta:/sdcard/git-annex.home $ git annex webapp +WARNING: linker: git-annex has text relocations. This is wasting memory and is a security risk. Please fix. +error: fchmod on /sdcard/mediashare/.git/config.lock failed: Operation not permitted +error: fchmod on /sdcard/mediashare/.git/config.lock failed: Operation not permitted + +From git terminal, can start web viewer, it offers to make repo. I chose /sdcard/mediashare, result is browser fail: + +git [Param "config",Param "annex.uuid",Param "380f6ec2-a7b0-43db-9447-f0de1b5a1b5b"] failed + +The install did create /sdcard/mediashare. I did have the sdcard directory all along. + +I can't say for sure what else is in file system. ES File manager shows /data exists, but it is empty. But tablet not easy to diagnose + +### What steps will reproduce the problem? + +Install git-annex.apk from website. I downloaded 20140620. + +### What version of git-annex are you using? On what operating system? + +Android 4.4.2 on Nexus tablet. + +### Please provide any additional information below. + +Git-anex-install.log. it is only file in /sdcard/git-annex.home. note it says it is installing to /data/data/. I may manually create that structure and see if a reinstall ends differently. + +[[!format sh """ +# If you can, paste a complete transcript of the problem occurring here. +# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log +Installation starting to /data/data/ga.androidterm +1bebb0d66f3f7c5ac4889b86669cab04ebee9bba +installing busybox +installing git-annex +installing git-shell +installing git-upload-pack +installing git +installing gpg +installing rsync +installing ssh +installing ssh-keygen +linking ./bin/git-upload-archive to git +linking ./bin/git-receive-pack to git +linking ./libexec/git-core/git-help to git +linking ./libexec/git-core/git-fsck to git +linking ./libexec/git-core/git-cat-file to git +linking ./libexec/git-core/git-init to git +linking ./libexec/git-core/git-checkout-index to git +linking ./libexec/git-core/git-notes to git +linking ./libexec/git-core/git-grep to git +linking ./libexec/git-core/git-blame to git +linking ./libexec/git-core/git-verify-tag to git +linking ./libexec/git-core/git-write-tree to git +linking ./libexec/git-core/git-log to git +linking ./libexec/git-core/git-stage to git +linking ./libexec/git-core/git-update-ref to git +linking ./libexec/git-core/git-status to git +linking ./libexec/git-core/git-show-branch to git +linking ./libexec/git-core/git-merge-file to git +linking ./libexec/git-core/git-for-each-ref to git +linking ./libexec/git-core/git to git +linking ./libexec/git-core/git-replace to git +linking ./libexec/git-core/git-update-index to git +linking ./libexec/git-core/git-annotate to git +linking ./libexec/git-core/git-patch-id to git +linking ./libexec/git-core/git-merge-recursive to git +linking ./libexec/git-core/git-rm to git +linking ./libexec/git-core/git-ls-tree to git +linking ./libexec/git-core/git-update-server-info to git +linking ./libexec/git-core/git-diff-tree to git +linking ./libexec/git-core/git-merge-tree to git +linking ./libexec/git-core/git-mktag to git +linking ./libexec/git-core/git-rev-list to git +linking ./libexec/git-core/git-column to git +linking ./libexec/git-core/git-apply to git +linking ./libexec/git-core/git-var to git +linking ./libexec/git-core/git-rev-parse to git +linking ./libexec/git-core/git-archive to git +linking ./libexec/git-core/git-verify-pack to git +linking ./libexec/git-core/git-push to git +linking ./libexec/git-core/git-commit to git +linking ./libexec/git-core/git-tag to git +linking ./libexec/git-core/git-pack-refs to git +linking ./libexec/git-core/git-fmt-merge-msg to git +linking ./libexec/git-core/git-fast-export to git +linking ./libexec/git-core/git-remote-ext to git +linking ./libexec/git-core/git-mailsplit to git +linking ./libexec/git-core/git-send-pack to git +linking ./libexec/git-core/git-diff-index to git +linking ./libexec/git-core/git-mailinfo to git +linking ./libexec/git-core/git-revert to git +linking ./libexec/git-core/git-diff-files to git +linking ./libexec/git-core/git-merge-ours to git +linking ./libexec/git-core/git-show-ref to git +linking ./libexec/git-core/git-diff to git +linking ./libexec/git-core/git-clean to git +linking ./libexec/git-core/git-bundle to git +linking ./libexec/git-core/git-check-mailmap to git +linking ./libexec/git-core/git-describe to git +linking ./libexec/git-core/git-branch to git +linking ./libexec/git-core/git-checkout to git +linking ./libexec/git-core/git-name-rev to git +linking ./libexec/git-core/git-gc to git +linking ./libexec/git-core/git-fetch to git +linking ./libexec/git-core/git-whatchanged to git +linking ./libexec/git-core/git-cherry to git +linking ./libexec/git-core/git-reflog to git +linking ./libexec/git-core/git-hash-object to git +linking ./libexec/git-core/git-init-db to git +linking ./libexec/git-core/git-rerere to git +linking ./libexec/git-core/git-reset to git +linking ./libexec/git-core/git-stripspace to git +linking ./libexec/git-core/git-prune to git +linking ./libexec/git-core/git-mktree to git +linking ./libexec/git-core/git-unpack-file to git +linking ./libexec/git-core/git-remote to git +linking ./libexec/git-core/git-commit-tree to git +linking ./libexec/git-core/git-symbolic-ref to git +linking ./libexec/git-core/git-credential to git +linking ./libexec/git-core/git-check-ignore to git +linking ./libexec/git-core/git-shortlog to git +linking ./libexec/git-core/git-fetch-pack to git +linking ./libexec/git-core/git-clone to git +linking ./libexec/git-core/git-mv to git +linking ./libexec/git-core/git-read-tree to git +linking ./libexec/git-core/git-merge-subtree to git +linking ./libexec/git-core/git-ls-remote to git +linking ./libexec/git-core/git-config to git +linking ./libexec/git-core/git-cherry-pick to git +linking ./libexec/git-core/git-merge to git +linking ./libexec/git-core/git-prune-packed to git +linking ./libexec/git-core/git-count-objects to git +linking ./libexec/git-core/git-merge-base to git +linking ./libexec/git-core/git-index-pack to git +linking ./libexec/git-core/git-repack to git +linking ./libexec/git-core/git-show to git +linking ./libexec/git-core/git-fsck-objects to git +linking ./libexec/git-core/git-format-patch to git +linking ./libexec/git-core/git-bisect--helper to git +linking ./libexec/git-core/git-upload-archive to git +linking ./libexec/git-core/git-ls-files to git +linking ./libexec/git-core/git-check-attr to git +linking ./libexec/git-core/git-get-tar-commit-id to git +linking ./libexec/git-core/git-remote-fd to git +linking ./libexec/git-core/git-unpack-objects to git +linking ./libexec/git-core/git-add to git +linking ./libexec/git-core/git-check-ref-format to git +linking ./libexec/git-core/git-merge-index to git +linking ./libexec/git-core/git-pack-objects to git +linking ./libexec/git-core/git-receive-pack to git +linking ./libexec/git-core/git-pack-redundant to git +linking ./libexec/git-core/git-shell to git-shell +linking ./libexec/git-core/git-upload-pack to git-upload-pack +Installation complete + +# End of transcript or log. +"""]] + +> [[fixed|done]] --[[Joey]] diff --git a/doc/bugs/Assistant_merge_loop.mdwn b/doc/bugs/Assistant_merge_loop.mdwn new file mode 100644 --- /dev/null +++ b/doc/bugs/Assistant_merge_loop.mdwn @@ -0,0 +1,18 @@ +The assistant appears to be in a merge loop with at least two of my repos. It's creating thousands of merge commits without any changes. One repository that contains around 600 files that change very very rarely now has 63528 commits. + +Here's a screenshot from tig: [[https://ssl.zerodogg.org/~zerodogg/private/tmp/Skjermdump_fra_2014-07-05_07:09:22-2014-07-05.png]] + +I can privately provide a copy of the git repo itself if needed. + +Using the standalone build, 64bit, on ArchLinux, Fedora 20 and Ubuntu 14.04. + + $ git annex version + git-annex version: 5.20140610-g5ec8bcf + build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV Inotify DBus DesktopNotify XMPP DNS Feeds Quvi TDFA CryptoHash + key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL + remote types: git gcrypt S3 bup directory rsync web webdav tahoe glacier ddar hook external + local repository version: 5 + supported repository version: 5 + upgrade supported from repository versions: 0 1 2 4 + +> [[fixed|done]] --[[Joey]] diff --git a/doc/bugs/Git_annex_add_._dies_when_you_add_too_much.mdwn b/doc/bugs/Git_annex_add_._dies_when_you_add_too_much.mdwn --- a/doc/bugs/Git_annex_add_._dies_when_you_add_too_much.mdwn +++ b/doc/bugs/Git_annex_add_._dies_when_you_add_too_much.mdwn @@ -54,3 +54,5 @@ """]] > Ancient git-annex version. Doubt it affects current version. [[!tag moreinfo]] --[[Joey]] + +>> Actually, this is a dup of [[runs_of_of_memory_adding_2_million_files]] so [[done]] --[[Joey]] diff --git a/doc/bugs/Merge_involving_symlink_yields_unexpected_results.mdwn b/doc/bugs/Merge_involving_symlink_yields_unexpected_results.mdwn new file mode 100644 --- /dev/null +++ b/doc/bugs/Merge_involving_symlink_yields_unexpected_results.mdwn @@ -0,0 +1,47 @@ +### Please describe the problem. +When creating a symlink in repository A, and creating a regular file under the same name in repository B, syncing B will yield the result that the symlink is lost, and both the original filename and the .variant file will point to the same annex object containing the original content from B. + +Both A and B are indirect mode repos. + +### What steps will reproduce the problem? + +[[!format sh """ + +#Initial state: + +repo-A$ echo file1 +This is file 1. +repo-B$ echo file1 +This is file 1. + +#Make conflicting changes: + +repo-A$ ln -s file1 file2; git add file2; git commit -m "Add file2 as symlink." +repo-B$ echo "This is file 2." > file2; git annex add file2; git commit -m "Add file2 as regular file." + +#Sync it: + +repo-A$ git annex sync +repo-B$ git annex sync + +#Strange result in repo-B: + +repo-B$ ls -l file2* +file2 -> .git/annex/objects/$HASH1 +file2.variant1234 -> .git/annex/objects/$HASH1 +repo-B$ cat file2 file2.variantXXXX +This is file 2. +This is file 2. + +#Repo-A leaves the symlink change untouched and adds a .variant containing the new regular file data. + +repo-A$ ls -l file* +file2 -> file1 +file2.variant1234 -> .git/annex/objects/$HASH1 +repo-A$ cat file.variant1234 +This is file 2. +"""]] +### What version of git-annex are you using? On what operating system? +Linux 3.15.3 +git-annex 5.20140613 + diff --git a/doc/bugs/No_such_file_with_certain_filenames_using_WORM_backend.mdwn b/doc/bugs/No_such_file_with_certain_filenames_using_WORM_backend.mdwn new file mode 100644 --- /dev/null +++ b/doc/bugs/No_such_file_with_certain_filenames_using_WORM_backend.mdwn @@ -0,0 +1,61 @@ +### Please describe the problem. + +I get no such file errors when using WORM backend on files with a certain name. Doesn't like brackets? + +Default backend is fine (see output below). + +### What steps will reproduce the problem? + +See additional info + +### What version of git-annex are you using? On what operating system? + +git-annex version: 5.20140613-g5587055 +On Windows 8.1 +Tried with both Windows command prompt and Git Bash shell. + +### Please provide any additional information below. + +[[!format sh """ +# If you can, paste a complete transcript of the problem occurring here. +# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log + +git config --add annex.backends WORM +git annex add extras + +add extras/Extra Content - Reason Drum Takes/DT Key Map.pdf ok +add extras/Extra Content - Reason Drum Takes/DT Read Me.pdf ok +add extras/Extra Content - Reason Drum Takes/DT7 Rock - Love (136).reason ok +add extras/Extra Content - Reason Drum Takes/DT7 Rock - Peace (200).reason ok +add extras/Extra Content - Reason Drum Takes/Kit Samples/1. Bass Drum mic (BD)/DT6_BD_Bd_RG_R_G06.aif +git-annex: C:\Studio\.git\annex\objects\b43\d6d\WORM-s178174-m1363015489--extras%Extra Content - Reason Drum Takes%Kit S +amples%1. Bass Drum mic ,40BD,41%DT6_BD_Bd_RG_R_G06.aif\WORM-s178174-m1363015489--extras%Extra Content - Reason Drum Tak +es%Kit Samples%1. Bass Drum mic ,40BD,41%DT6_BD_Bd_RG_R_G06.aif.cache: openFile: does not exist (No such file or directo +ry) +failed +add extras/Extra Content - Reason Drum Takes/Kit Samples/1. Bass Drum mic (BD)/DT6_BD_Bd_RG_R_G09.aif +git-annex: C:\Studio\.git\annex\objects\e90\b5c\WORM-s199108-m1363015489--extras%Extra Content - Reason Drum Takes%Kit S +amples%1. Bass Drum mic ,40BD,41%DT6_BD_Bd_RG_R_G09.aif\WORM-s199108-m1363015489--extras%Extra Content - Reason Drum Tak +es%Kit Samples%1. Bass Drum mic ,40BD,41%DT6_BD_Bd_RG_R_G09.aif.cache: openFile: does not exist (No such file or directo +ry) +failed +add extras/Extra Content - Reason Drum Takes/Kit Samples/1. Bass Drum mic (BD)/DT6_BD_Bd_RG_R_G14.aif +git-annex: C:\Studio\.git\annex\objects\995\4e7\WORM-s201570-m1363015489--extras%Extra Content - Reason Drum Takes%Kit S +amples%1. Bass Drum mic ,40BD,41%DT6_BD_Bd_RG_R_G14.aif\WORM-s201570-m1363015489--extras%Extra Content - Reason Drum Tak +es%Kit Samples%1. Bass Drum mic ,40BD,41%DT6_BD_Bd_RG_R_G14.aif.cache: openFile: does not exist (No such file or directo +ry) +failed + +git config --unset annex.backends +git annex add extras + +add extras/Extra Content - Reason Drum Takes/DT Key Map.pdf ok +add extras/Extra Content - Reason Drum Takes/DT Read Me.pdf ok +add extras/Extra Content - Reason Drum Takes/DT7 Rock - Love (136).reason ok +add extras/Extra Content - Reason Drum Takes/DT7 Rock - Peace (200).reason ok +add extras/Extra Content - Reason Drum Takes/Kit Samples/1. Bass Drum mic (BD)/DT6_BD_Bd_RG_R_G06.aif ok +add extras/Extra Content - Reason Drum Takes/Kit Samples/1. Bass Drum mic (BD)/DT6_BD_Bd_RG_R_G09.aif ok +add extras/Extra Content - Reason Drum Takes/Kit Samples/1. Bass Drum mic (BD)/DT6_BD_Bd_RG_R_G14.aif ok + +# End of transcript or log. +"""]] diff --git a/doc/bugs/OSX_assistant_fails_to_download_new_file_after_initial_pass.mdwn b/doc/bugs/OSX_assistant_fails_to_download_new_file_after_initial_pass.mdwn new file mode 100644 --- /dev/null +++ b/doc/bugs/OSX_assistant_fails_to_download_new_file_after_initial_pass.mdwn @@ -0,0 +1,119 @@ +### Please describe the problem. + +git-annex assistant on Mac OSX 10.8.5 fails to download new repo files from SSH remote/rsync shared-encryption annex after initial startup. The assistant does sync with the repo and create symlinks for new files, and file contents can manually be retrieved using 'git annex get $file' once the file is in the repository. However, assistant makes no subsequent attempt to download the new files until assistant is restarted. Once restarted, assistant downloads all new files for which is previously only had symlinks. + +git-annex whereis $file does not indicate that the files represented as symlinks are located on the Mac OSX clients in question until after files are manually retrieved or assistant is retarted and files are automatically downloaded, replacing the symlinks. + +git-annex assistant on Mac OSX does not have problems uploading files to the remote as they are added. + +git-annex 5.20140517.4 on Ubuntu 12.04 behaves as expected and downloads new files (with content) properly as they are added to the repo. + +### What steps will reproduce the problem? + +(all using git-annex webapp) + +--create client repo on Mac OSX, direct mode (used two 10.8.5 machines) + +--create client repo on Ubuntu, direct mode (used several 12.04 VMs) + +--create repo (transfer mode) on VPS + +--create shared encryption repo (backup mode) on same VPS + +--add VPS transfer repo to each client (shared encryption repo appears and syncing is enabled for each client) + +--create file in Mac OSX annex - file gets distributed to VPS backup repo and each linux system. Symlink is created on 2nd Mac OS X machine. + +--create file in Ubuntu VM annex - file gets distributed to VPS backup repo and each linux system. Symlink is created on both Mac OSX machines. + + + +### What version of git-annex are you using? On what operating system? +git-annex version: 5.20140421 (installed using brew), Mac OSX 10.8.5 + +I tested 5.20140613 (from brew) also and it appears to also not download new files automatically. + + + +### Please provide any additional information below. +I've tested a few things I thought might be related. Since restarting assistant seems to temporarily "fix" the problem, I thought there may be some SSH client caching problems... as in the existing connection not being reused properly. However, I disabled annex.sshcaching as described elsewhere and that did not have any affect. + +I've enabled XMPP and it only introduced more confusion as the XMPP messaging was not reliably consistent. + +daemon.log for Mac OS systems does not show the "Pusher" process getting initiated once new files are added to the repo if the assistant is currently running, however it is logged immediately after assistant is started if there are new files in the repo. + +daemon.log for Ubuntu systems does contain the Pusher process event following the repo sync that takes place once the file has been added to the repo. + + + +[[!format sh """ +# If you can, paste a complete transcript of the problem occurring here. +# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log + +MACOSX:user$git-annex assistant --autostart + +daemon.log: + +[2014-06-25 11:52:04 CDT] main: starting assistant version 5.20140421 +[2014-06-25 11:52:09 CDT] TransferScanner: Syncing with serverrepo + +Already up-to-date. +(scanning...) [2014-06-25 11:52:09 CDT] Watcher: Performing startup scan + +Already up-to-date. +(started...) +[2014-06-25 11:52:10 CDT] Committer: Committing changes to git +(Recording state in git...) +(gpg) +Already up-to-date. + +Already up-to-date. +[2014-06-25 11:52:11 CDT] Pusher: Syncing with serverrepo + +GPGHMACSHA1--3e18c6a4ee5aece84f4f00fc2e7fcb828d8fa7d8 +Everything up-to-date0.00kB/s 0:00:00 +Everything up-to-date4.56MB/s 0:00:00 + 8409197 100% 4.94MB/s 0:00:01 (xfer#1, to-check=0/1) + +sent 38 bytes received 8411383 bytes 2403263.14 bytes/sec +total size is 8409197 speedup is 1.00 +[2014-06-25 11:52:13 CDT] Transferrer: Downloaded 67-more-fromubuntu +[2014-06-25 11:52:14 CDT] Committer: Adding 67-more-fromubuntu +add /Users/user/computer_annex/67-more-fromubuntu ok +[2014-06-25 11:52:14 CDT] Committer: Committing changes to git +(Recording state in git...) +[2014-06-25 11:52:20 CDT] Pusher: Syncing with serverrepo +(Recording state in git...) +To ssh://user@git-annex-server.remotehost.net-user_.2Fhome.2Fuser.2Fserver_repo/home/user/server_repo/ + 7e375a8..1a64e4c git-annex -> synced/git-annex +[2014-06-25 11:52:36 CDT] RemoteControl: Syncing with serverrepo +From ssh://git-annex-server.remotehost.net-user_.2Fhome.2Fuser.2Fserver_repo/home/user/server_repo + 1a64e4c..dee9f84 synced/git-annex -> serverrepo/synced/git-annex + d424057..989003e synced/master -> serverrepo/synced/master +(merging serverrepo/synced/git-annex into git-annex...) + +<<>> + +Updating d424057..989003e +Fast-forward + 89-more-fromubuntu | 1 + + 1 file changed, 1 insertion(+) + create mode 120000 89-more-fromubuntu +[2014-06-25 11:58:42 CDT] RemoteControl: Syncing with serverrepo +From ssh://git-annex-server.remotehost.net-user_.2Fhome.2Fuser.2Fserver_repo/home/user/server_repo + dee9f84..b24c8bf synced/git-annex -> serverrepo/synced/git-annex +(merging serverrepo/synced/git-annex into git-annex...) +[2014-06-25 11:58:47 CDT] RemoteControl: Syncing with serverrepo +From ssh://git-annex-server.remotehost.net-user_.2Fhome.2Fuser.2Fserver_repo/home/user/server_repo + b24c8bf..6488b45 synced/git-annex -> serverrepo/synced/git-annex +(merging serverrepo/synced/git-annex into git-annex...) +[2014-06-25 11:58:56 CDT] RemoteControl: Syncing with serverrepo +From ssh://git-annex-server.remotehost.net-user_.2Fhome.2Fuser.2Fserver_repo/home/user/server_repo + 6488b45..c73c180 synced/git-annex -> serverrepo/synced/git-annex +(merging serverrepo/synced/git-annex into git-annex...) + + + + +# End of transcript or log. +"""]] diff --git a/doc/bugs/On_Ubuntu_14.04_assistant_fails_to_create_new_setup.mdwn b/doc/bugs/On_Ubuntu_14.04_assistant_fails_to_create_new_setup.mdwn deleted file mode 100644 --- a/doc/bugs/On_Ubuntu_14.04_assistant_fails_to_create_new_setup.mdwn +++ /dev/null @@ -1,91 +0,0 @@ -### Please describe the problem. - -Following steps from http://git-annex.branchable.com/assistant/quickstart/ does not get past the first screen. - -### What steps will reproduce the problem? - -* On a nearly fresh Lubuntu system, nearly fresh account, Lubuntu session, run `git-annex` from the start menu. -* Opens firefox, in `Create a git-annex repository` select my `~/Documents` folder, press `Make Repository`. - -* Expected: a new, different page opens. -* Observed: the same page opens, only difference the path displayed is `/home/mylogin/Documents`. Pressing `Make Repository` again shows the same page again. - -I couldn't find any logs at the time. Now I see that they are in .git/annex/daemon.log but content from that time is already gone. - -### What version of git-annex are you using? On what operating system? - -A fresh Ubuntu 14.04 (actually Lubuntu but this shouldn't change anything, right ?), create a user, login. - - - LC_ALL=C apt-cache policy git-annex - git-annex: - Installed: 5.20140412ubuntu1 - Candidate: 5.20140412ubuntu1 - Version table: - *** 5.20140412ubuntu1 0 - 500 http://fr.archive.ubuntu.com/ubuntu/ trusty/universe i386 Packages - 100 /var/lib/dpkg/status - - -### Please provide any additional information below. - -[[!format sh """ -# No command line in bug occurrence. This is the transcript of the workaround I found. -# Actually, the PC was rebooted then I went command line. -cd ~/Documents -git status -fatal: This operation must be run in a work tree -# oh I see it's a bare repo -git annex add . -add (my file names... one line for each) ok -(Recording state in git...) - -Now the webapp seems to run okay, I can see many pages, schedule checks, etc. - -# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log --> Ok but log shows only events after I manually dit git annex add. - -[2014-06-08 14:28:46 CEST] main: starting assistant version 5.20140412ubuntu1 -[2014-06-08 14:28:46 CEST] Cronner: You should enable consistency checking to protect your data. - - dbus failed; falling back to mtab polling (ClientError {clientErrorMessage = "runClient: unable to determine DBUS address", clientErrorFatal = True}) -(scanning...) [2014-06-08 14:28:46 CEST] Watcher: Performing startup scan -(started...) [2014-06-08 14:28:47 CEST] Committer: Adding (myfiles) - -add (my files...) ok -[2014-06-08 14:32:51 CEST] Committer: Committing changes to git -[2014-06-08 14:34:12 CEST] Committer: Committing changes to git -[2014-06-08 14:34:13 CEST] Committer: Adding (myfiles) -ok -(Recording state in git...) -(Recording state in git...) -(Recording state in git...) -(Recording state in git...) -(Recording state in git...) -add (myfile) ok -add (myfile) [2014-06-08 14:34:13 CEST] Committer: Committing changes to git -[2014-06-08 14:42:48 CEST] Cronner: Consistency check in progress -fsck (myfile) (checksum...) -ok - -# End of transcript or log. -"""]] - - - -# Question: - -cat /etc/xdg/autostart/git-annex.desktop -[Desktop Entry] -Type=Application -Version=1.0 -Name=Git Annex Assistant -Comment=Autostart -Terminal=false -Exec=/usr/bin/git-annex assistant --autostart -Categories= - -Should there be a git-annex process whenever I log in even if I don't launch the webapp ? -I can check that on next login. - -At the moment there is "git-annex webapp" and several child processes. diff --git a/doc/bugs/can__39__t_connect_jabber_with_custom_google_apps_domain.mdwn b/doc/bugs/can__39__t_connect_jabber_with_custom_google_apps_domain.mdwn new file mode 100644 --- /dev/null +++ b/doc/bugs/can__39__t_connect_jabber_with_custom_google_apps_domain.mdwn @@ -0,0 +1,19 @@ +### Please describe the problem. +In "Configuring jabber account" custom domains through google apps don't connect properly. + +### What steps will reproduce the problem? +Try to use a google account that uses a non-gmail domain, e.g. user@domain.com + +### What version of git-annex are you using? On what operating system? +Newest, on Mac OS 10.9 + +### Please provide any additional information below. +The issue is because git-annex is trying to connect to @domain.com as the jabber server, but the server should be talk.google.com:5223. + +[[!format sh """ +# If you can, paste a complete transcript of the problem occurring here. +# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log + + +# End of transcript or log. +"""]] diff --git a/doc/bugs/direct_mode_should_refuse_to_merge_with_illegal_filenames.mdwn b/doc/bugs/direct_mode_should_refuse_to_merge_with_illegal_filenames.mdwn new file mode 100644 --- /dev/null +++ b/doc/bugs/direct_mode_should_refuse_to_merge_with_illegal_filenames.mdwn @@ -0,0 +1,35 @@ +Some filesystems have stupid rules about characters not allowed in filenames. For example, FAT doesn't allow '?' '*' ':' etc. + +The direct mode merge code lets `git merge` update a temp directory with the new files from the merge, before doing its work tree update and committing. This can fail: + +
+error: unable to create file non-rus/Dance/Dream_Dance_Vol15/CD1/09-??.mp3 (Invalid argument)
+
+ +This leaves the work tree without the file, and the index knows about the file. Result is that the next time a commit is done, this file appears to have been deleted, and that is committed and propigates out. Which can be surprising. + +---- + +It would probably be better if, when the working tree cannot be updated, it left the repository in some state that would not make the next commit remove anything. + +Ie, direct mode should replicate this behavior: + +
+root@darkstar:/home/joey/mnt>git init
+root@darkstar:/home/joey/mnt>git merge FETCH_HEAD 
+error: unable to create file foo? (Invalid argument)
+fatal: read-tree failed
+root@darkstar:/home/joey/mnt>git status
+On branch master
+
+Initial commit
+
+nothing to commit (create/copy files and use "git add" to track)
+
+ +Problem is, the call to `git merge` can also fail due to a conflict. In that case, git-annex wants to continue with automatic conflict resolution. +So, how to detect when `git merge` has skipped creating illegal filenames? + +---- + +Alternatively, git-annex could learn/probe the full set of characters not allowed in filenames, and examine merges before performing them, and refuse to do anything if the merge added an illegal filename. diff --git a/doc/bugs/failed_sync_with_direct_mode_repo.mdwn b/doc/bugs/failed_sync_with_direct_mode_repo.mdwn new file mode 100644 --- /dev/null +++ b/doc/bugs/failed_sync_with_direct_mode_repo.mdwn @@ -0,0 +1,9 @@ +Two clients, both in direct mode, both running assistant. + +When a change is made on A, the assistant commits it to annex/direct/master. But, the master branch is not changed. + +B notices there is a change, pulls from A. Gets annex/direct/master, but does not merge it into its local branch at all. + +[[!tag confirmed]] + +> [[fixed|done]] --[[Joey]] diff --git a/doc/bugs/files_lost_during_upgrade.mdwn b/doc/bugs/files_lost_during_upgrade.mdwn new file mode 100644 --- /dev/null +++ b/doc/bugs/files_lost_during_upgrade.mdwn @@ -0,0 +1,2188 @@ +### Please describe the problem. +I'm running git annex on two laptops sharing data with a shared server all running ubuntu and the binary distributions of git annex (different versions the server seems to be running 5.20140529-gb71f9bf right now). One of the laptops tried to upgrade to 5.20140613 (something) from 5.20140610-g5ec8bcf, which kind of fails since that version does not exist on the site, only the signature making it download and upgrade and then decide it still needs to upgrade, took a few times before I figured this out. + +During one of the upgrades I guess something died and it started to complain about an index.lock file that should be removed after all git instances were dead, so I killed git annex and removed the file (a few times maybe) just to get the upgrade through. After realizing it was trying to upgrade to the same version over and over again I realized it had somehow managed merge away all files and the git history looked like crazy. + +Had to "git annex indirect; git annex checkout GOODVERSION . ; git annex direct ; git annex assistant" to get the files back (I think that did it, I'm a little unsure what the best way to restore files are). + +### What steps will reproduce the problem? + +I don't know. Just posting this in case someone else can figure it out. + +Might be relevant that upgrade never works out of the box, it removes the old version of git annex and untars the new version in my home directory (which isn't on the path), so I can't use it from the command line. So I shut it down, copy it back to where it should go, and then update the .config/git-annex/program to point to the correct location. + +### What version of git-annex are you using? On what operating system? + +5.20140610-g5ec8bcf (maybe, I'm not sure if that was the one I upgraded from initially). + +### Please provide any additional information below. + +[[!format sh """ +# If you can, paste a complete transcript of the problem occurring here. +# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log + +I think this is the log from before the files where removed + +[2014-06-18 13:41:14 CEST] main: starting assistant version 5.20140610-g5ec8bcf +[2014-06-18 13:41:14 CEST] UpgradeWatcher: Finished upgrading git-annex to version 5.20140610-g5ec8bcf +[2014-06-18 13:41:14 CEST] TransferScanner: Syncing with born + +(scanning...) [2014-06-18 13:41:14 CEST] Watcher: Performing startup scan + +(started...) fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +To ssh://jwiklund@born/store/backup/Documents.annex.1/ + f8f8217..ff8ecb1 git-annex -> synced/git-annex + bd2e43b..e88b148 annex/direct/master -> synced/master +fatal: pathspec 'music.txt' did not match any files +fatal: Unable to create '/home/jwiklund/Documents/.git/index.lock': File exists. + +If no other git process is currently running, this probably means a +git process crashed in this repository earlier. Make sure no other git +process is running and remove the file manually to continue. +fatal: Unable to create '/home/jwiklund/Documents/.git/index.lock': File exists. + +If no other git process is currently running, this probably means a +git process crashed in this repository earlier. Make sure no other git +process is running and remove the file manually to continue. +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files + +(Recording state in git...) + +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) + +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +ufatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +ser error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +[2014-06-18 13:41:16 CEST] Committer: Committing changesfatal: pathspec 'music.txt' did not match any files + to git +fatal: pathspec 'music.txt' did not match any files +[2014-06-18 13:41:16 CEST] Pusher: Syncing with born +fatal: Unable to create '/home/jwiklund/Documents/.git/index.lock': File exists. + +If no other git process is currently running, this probably means a +git process crashed in this repository earlier. Make sure no other git +process is running and remove the file manually to continue. +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +(Recording state in git...) +(Recording state in git...) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) + +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user error (xargs ["-0","git","--git-dir=/home/jwiklund/Documents/.git","--work-tree=/home/jwiklund/Documents","-c","core.bare=false","add","--force","--"] exited 123) +user errfatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +fatal: pathspec 'music.txt' did not match any files +To ssh://jwiklund@born/store/backup/Documents.annex.1/ + ff8ecb1..c93e415 git-annex -> synced/git-annex + e88b148..220161f annex/direct/master -> synced/master + + +This is what it said when it wanted me to remove the index file after a failed upgrade + +[2014-06-18 13:38:31 CEST] main: starting assistant version 5.20140610-g5ec8bcf +[2014-06-18 13:38:31 CEST] UpgradeWatcher: Finished upgrading git-annex to version 5.20140610-g5ec8bcf +[2014-06-18 13:38:31 CEST] TransferScanner: Syncing with born +error: duplicate parent 294b61a3dce1e87a62e4d675deac2a9130b819e6 ignored + +(scanning...) [2014-06-18 13:38:31 CEST] Watcher: Performing startup scan + +(started...) error: duplicate parent 76407052287ba54b350e56e36353a53a3dbc5d4f ignored +To ssh://jwiklund@born/store/backup/Documents.annex.1/ + fdae080..cf9f2a9 git-annex -> synced/git-annex + 294b61a..7640705 annex/direct/master -> synced/master +fatal: Could not switch to '/home/jwiklund/Documents/.git/annex/merge/': No such file or directory +[2014-06-18 13:38:33 CEST] Committer: Committing changes to git +fatal: Unable to create '/home/jwiklund/Documents/.git/index.lock': File exists. + +If no other git process is currently running, this probably means a +git process crashed in this repository earlier. Make sure no other git +process is running and remove the file manually to continue. +[2014-06-18 13:38:33 CEST] Pusher: Syncing with born +fatal: Could not switch to '/home/jwiklund/Documents/.git/annex/merge/': No such file or directory +To ssh://jwiklund@born/store/backup/Documents.annex.1/ + 7640705..6b9d33e annex/direct/master -> synced/master +fatal: Could not switch to '/home/jwiklund/Documents/.git/annex/merge/': No such file or directory +[2014-06-18 13:39:20 CEST] main: warning git-annex has been shut down + +Here is the upgrade + +error: duplicate parent 6b9d33ef3a16e6245f21f3948aa96691c2b8453b ignored +(scanning...) [2014 +-06-18 13:40:55 CEST] Watcher: Performing startup scan +(started...) + +error: duplicate parent 80254c9c048a35064ba42ae6a79610da6deac0ae ignored +gpg: WARNING: unsafe permissions on homedir `/tmp/git-annex-gpg.tmp.0' +gpg: Signature made fre 13 jun 2014 17:28:22 CEST using DSA key ID 89C809CB +gpg: /tmp/git-annex-gpg.tmp.0/trustdb.gpg: trustdb created +gpg: Good signature from "git-annex distribution signing key (for Joey Hess) " +gpg: WARNING: This key is not certified with a trusted signature! +gpg: There is no indication that the signature belongs to the owner. +Primary key fingerprint: 4005 5C6A FD2D 526B 2961 E78F 5EE1 DBA7 89C8 09CB +[2014-06-18 13:40:56 CEST] Upgrader: An upgrade of git-annex is available. (version 5.20140613) +To ssh://jwiklund@born/store/backup/Documents.annex.1/ + 6b9d33e..80254c9 annex/direct/master -> synced/master + +[2014-06-18 13:40:57 CEST] Committer: Committing changes to git +(Recording state in git...) +[2014-06-18 13:40:57 CEST] Pusher: Syncing with born + +error: duplicate parent 6be6bb32164e7103c44077ce6fa450b7c0d36e0c ignored +To ssh://jwiklund@born/store/backup/Documents.annex.1/ + 80254c9..6be6bb3 annex/direct/master -> synced/master + +--2014-06-18 13:41:07-- https://downloads.kitenet.net/git-annex/linux/current/git-annex-standalone-amd64.tar.gz +Resolving downloads.kitenet.net (downloads.kitenet.net)... 107.170.31.195 +Connecting to downloads.kitenet.net (downloads.kitenet.net)|107.170.31.195|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 42645638 (41M) [application/x-gzip] +Saving to: ‘/home/jwiklund/Documents/.git/annex/tmp/SHA256E-s42645638--4ae41fb29bd26339ea10f53ea2b7cf3132e53d5e8fbfde7b43b912aa52b3d319.tar.gz’ + + 0K .......... .......... .......... .......... .......... 0% 171K 4m3s + 50K .......... .......... .......... .......... .......... 0% 505K 2m43s + 100K .......... .......... .......... .......... .......... 0% 258K 2m42s + 150K .......... .......... .......... .......... .......... 0% 510K 2m22s + 200K .......... .......... .......... .......... .......... 0% 505K 2m10s + 250K .......... .......... .......... .......... .......... 0% 516K 2m1s + 300K .......... .......... .......... .......... .......... 0% 512K 1m55s + 350K .......... .......... .......... .......... .......... 0% 31,1M 1m41s + 400K .......... .......... .......... .......... .......... 1% 512K 99s + 450K .......... .......... .......... .......... .......... 1% 515K 97s + 500K .......... .......... .......... .......... .......... 1% 1,25M 91s + 550K .......... .......... .......... .......... .......... 1% 843K 87s + 600K .......... .......... .......... .......... .......... 1% 1,25M 83s + 650K .......... .......... .......... .......... .......... 1% 858K 80s + 700K .......... .......... .......... .......... .......... 1% 1,25M 77s + 750K .......... .......... .......... .......... .......... 1% 840K 75s + 800K .......... .......... .......... .......... .......... 2% 59,4M 70s + 850K .......... .......... .......... .......... .......... 2% 518K 71s + 900K .......... .......... .......... .......... .......... 2% 39,5M 67s + 950K .......... .......... .......... .......... .......... 2% 74,5M 64s + 1000K .......... .......... .......... .......... .......... 2% 520K 64s + 1050K .......... .......... .......... .......... .......... 2% 57,3M 61s + 1100K .......... .......... .......... .......... .......... 2% 1,31M 60s + 1150K .......... .......... .......... .......... .......... 2% 855K 59s + 1200K .......... .......... .......... .......... .......... 3% 22,5M 57s + 1250K .......... .......... .......... .......... .......... 3% 1,33M 56s + 1300K .......... .......... .......... .......... .......... 3% 848K 55s + 1350K .......... .......... .......... .......... .......... 3% 9,76M 54s + 1400K .......... .......... .......... .......... .......... 3% 48,8M 52s + 1450K .......... .......... .......... .......... .......... 3% 1,45M 51s + 1500K .......... .......... .......... .......... .......... 3% 837K 51s + 1550K .......... .......... .......... .......... .......... 3% 13,4M 49s + 1600K .......... .......... .......... .......... .......... 3% 1,47M 48s + 1650K .......... .......... .......... .......... .......... 4% 861K 48s + 1700K .......... .......... .......... .......... .......... 4% 14,3M 47s + 1750K .......... .......... .......... .......... .......... 4% 13,0M 46s + 1800K .......... .......... .......... .......... .......... 4% 1,49M 45s + 1850K .......... .......... .......... .......... .......... 4% 863K 45s + 1900K .......... .......... .......... .......... .......... 4% 62,3M 44s + 1950K .......... .......... .......... .......... .......... 4% 7,64M 43s + 2000K .......... .......... .......... .......... .......... 4% 10,3M 42s + 2050K .......... .......... .......... .......... .......... 5% 582K 42s + 2100K .......... .......... .......... .......... .......... 5% 8,34M 41s + 2150K .......... .......... .......... .......... .......... 5% 48,7M 40s + 2200K .......... .......... .......... .......... .......... 5% 61,6M 39s + 2250K .......... .......... .......... .......... .......... 5% 1,52M 39s + 2300K .......... .......... .......... .......... .......... 5% 860K 39s + 2350K .......... .......... .......... .......... .......... 5% 60,4M 38s + 2400K .......... .......... .......... .......... .......... 5% 8,20M 38s + 2450K .......... .......... .......... .......... .......... 6% 87,7M 37s + 2500K .......... .......... .......... .......... .......... 6% 1,54M 37s + 2550K .......... .......... .......... .......... .......... 6% 855K 37s + 2600K .......... .......... .......... .......... .......... 6% 89,2M 36s + 2650K .......... .......... .......... .......... .......... 6% 7,38M 35s + 2700K .......... .......... .......... .......... .......... 6% 168M 35s + 2750K .......... .......... .......... .......... .......... 6% 1,44M 34s + 2800K .......... .......... .......... .......... .......... 6% 1,37M 34s + 2850K .......... .......... .......... .......... .......... 6% 2,21M 34s + 2900K .......... .......... .......... .......... .......... 7% 6,19M 33s + 2950K .......... .......... .......... .......... .......... 7% 174M 33s + 3000K .......... .......... .......... .......... .......... 7% 174M 32s + 3050K .......... .......... .......... .......... .......... 7% 196M 32s + 3100K .......... .......... .......... .......... .......... 7% 1,57M 32s + 3150K .......... .......... .......... .......... .......... 7% 1,36M 31s + 3200K .......... .......... .......... .......... .......... 7% 1,67M 31s + 3250K .......... .......... .......... .......... .......... 7% 70,5M 31s + 3300K .......... .......... .......... .......... .......... 8% 109M 30s + 3350K .......... .......... .......... .......... .......... 8% 84,8M 30s + 3400K .......... .......... .......... .......... .......... 8% 1,61M 30s + 3450K .......... .......... .......... .......... .......... 8% 8,23M 29s + 3500K .......... .......... .......... .......... .......... 8% 1,47M 29s + 3550K .......... .......... .......... .......... .......... 8% 2,77M 29s + 3600K .......... .......... .......... .......... .......... 8% 5,14M 29s + 3650K .......... .......... .......... .......... .......... 8% 28,0M 28s + 3700K .......... .......... .......... .......... .......... 9% 169M 28s + 3750K .......... .......... .......... .......... .......... 9% 1,85M 28s + 3800K .......... .......... .......... .......... .......... 9% 86,5M 27s + 3850K .......... .......... .......... .......... .......... 9% 7,14M 27s + 3900K .......... .......... .......... .......... .......... 9% 1,55M 27s + 3950K .......... .......... .......... .......... .......... 9% 2,53M 27s + 4000K .......... .......... .......... .......... .......... 9% 5,08M 26s + 4050K .......... .......... .......... .......... .......... 9% 37,6M 26s + 4100K .......... .......... .......... .......... .......... 9% 45,6M 26s + 4150K .......... .......... .......... .......... .......... 10% 86,2M 25s + 4200K .......... .......... .......... .......... .......... 10% 1,80M 25s + 4250K .......... .......... .......... .......... .......... 10% 99,6M 25s + 4300K .......... .......... .......... .......... .......... 10% 171M 25s + 4350K .......... .......... .......... .......... .......... 10% 7,41M 24s + 4400K .......... .......... .......... .......... .......... 10% 1,55M 24s + 4450K .......... .......... .......... .......... .......... 10% 2,53M 24s + 4500K .......... .......... .......... .......... .......... 10% 59,5M 24s + 4550K .......... .......... .......... .......... .......... 11% 5,43M 24s + 4600K .......... .......... .......... .......... .......... 11% 25,3M 23s + 4650K .......... .......... .......... .......... .......... 11% 138M 23s + 4700K .......... .......... .......... .......... .......... 11% 90,7M 23s + 4750K .......... .......... .......... .......... .......... 11% 116M 23s + 4800K .......... .......... .......... .......... .......... 11% 1,81M 23s + 4850K .......... .......... .......... .......... .......... 11% 64,4M 22s + 4900K .......... .......... .......... .......... .......... 11% 7,76M 22s + 4950K .......... .......... .......... .......... .......... 12% 67,2M 22s + 5000K .......... .......... .......... .......... .......... 12% 1,60M 22s + 5050K .......... .......... .......... .......... .......... 12% 2,53M 22s + 5100K .......... .......... .......... .......... .......... 12% 5,14M 22s + 5150K .......... .......... .......... .......... .......... 12% 90,4M 21s + 5200K .......... .......... .......... .......... .......... 12% 27,7M 21s + 5250K .......... .......... .......... .......... .......... 12% 41,7M 21s + 5300K .......... .......... .......... .......... .......... 12% 91,5M 21s + 5350K .......... .......... .......... .......... .......... 12% 1,85M 21s + 5400K .......... .......... .......... .......... .......... 13% 109M 20s + 5450K .......... .......... .......... .......... .......... 13% 79,2M 20s + 5500K .......... .......... .......... .......... .......... 13% 6,84M 20s + 5550K .......... .......... .......... .......... .......... 13% 32,4M 20s + 5600K .......... .......... .......... .......... .......... 13% 5,70M 20s + 5650K .......... .......... .......... .......... .......... 13% 2,36M 20s + 5700K .......... .......... .......... .......... .......... 13% 2,53M 20s + 5750K .......... .......... .......... .......... .......... 13% 5,15M 19s + 5800K .......... .......... .......... .......... .......... 14% 31,1M 19s + 5850K .......... .......... .......... .......... .......... 14% 23,0M 19s + 5900K .......... .......... .......... .......... .......... 14% 45,3M 19s + 5950K .......... .......... .......... .......... .......... 14% 73,7M 19s + 6000K .......... .......... .......... .......... .......... 14% 1,96M 19s + 6050K .......... .......... .......... .......... .......... 14% 51,7M 18s + 6100K .......... .......... .......... .......... .......... 14% 8,10M 18s + 6150K .......... .......... .......... .......... .......... 14% 45,9M 18s + 6200K .......... .......... .......... .......... .......... 15% 23,5M 18s + 6250K .......... .......... .......... .......... .......... 15% 7,66M 18s + 6300K .......... .......... .......... .......... .......... 15% 2,29M 18s + 6350K .......... .......... .......... .......... .......... 15% 2,46M 18s + 6400K .......... .......... .......... .......... .......... 15% 46,8M 18s + 6450K .......... .......... .......... .......... .......... 15% 5,73M 17s + 6500K .......... .......... .......... .......... .......... 15% 23,0M 17s + 6550K .......... .......... .......... .......... .......... 15% 21,1M 17s + 6600K .......... .......... .......... .......... .......... 15% 48,4M 17s + 6650K .......... .......... .......... .......... .......... 16% 74,1M 17s + 6700K .......... .......... .......... .......... .......... 16% 2,07M 17s + 6750K .......... .......... .......... .......... .......... 16% 30,3M 17s + 6800K .......... .......... .......... .......... .......... 16% 7,81M 17s + 6850K .......... .......... .......... .......... .......... 16% 59,1M 16s + 6900K .......... .......... .......... .......... .......... 16% 24,6M 16s + 6950K .......... .......... .......... .......... .......... 16% 8,11M 16s + 7000K .......... .......... .......... .......... .......... 16% 7,57M 16s + 7050K .......... .......... .......... .......... .......... 17% 3,19M 16s + 7100K .......... .......... .......... .......... .......... 17% 2,35M 16s + 7150K .......... .......... .......... .......... .......... 17% 5,56M 16s + 7200K .......... .......... .......... .......... .......... 17% 51,4M 16s + 7250K .......... .......... .......... .......... .......... 17% 45,5M 16s + 7300K .......... .......... .......... .......... .......... 17% 61,6M 16s + 7350K .......... .......... .......... .......... .......... 17% 22,7M 15s + 7400K .......... .......... .......... .......... .......... 17% 53,6M 15s + 7450K .......... .......... .......... .......... .......... 18% 2,12M 15s + 7500K .......... .......... .......... .......... .......... 18% 32,2M 15s + 7550K .......... .......... .......... .......... .......... 18% 61,0M 15s + 7600K .......... .......... .......... .......... .......... 18% 7,22M 15s + 7650K .......... .......... .......... .......... .......... 18% 23,6M 15s + 7700K .......... .......... .......... .......... .......... 18% 7,39M 15s + 7750K .......... .......... .......... .......... .......... 18% 53,7M 15s + 7800K .......... .......... .......... .......... .......... 18% 8,51M 15s + 7850K .......... .......... .......... .......... .......... 18% 8,28M 14s + 7900K .......... .......... .......... .......... .......... 19% 1,26M 15s + 7950K .......... .......... .......... .......... .......... 19% 59,8M 14s + 8000K .......... .......... .......... .......... .......... 19% 58,8M 14s + 8050K .......... .......... .......... .......... .......... 19% 54,2M 14s + 8100K .......... .......... .......... .......... .......... 19% 70,3M 14s + 8150K .......... .......... .......... .......... .......... 19% 26,5M 14s + 8200K .......... .......... .......... .......... .......... 19% 54,8M 14s + 8250K .......... .......... .......... .......... .......... 19% 73,9M 14s + 8300K .......... .......... .......... .......... .......... 20% 2,11M 14s + 8350K .......... .......... .......... .......... .......... 20% 21,6M 14s + 8400K .......... .......... .......... .......... .......... 20% 8,29M 14s + 8450K .......... .......... .......... .......... .......... 20% 29,6M 14s + 8500K .......... .......... .......... .......... .......... 20% 59,6M 13s + 8550K .......... .......... .......... .......... .......... 20% 6,65M 13s + 8600K .......... .......... .......... .......... .......... 20% 8,50M 13s + 8650K .......... .......... .......... .......... .......... 20% 10,1M 13s + 8700K .......... .......... .......... .......... .......... 21% 44,0M 13s + 8750K .......... .......... .......... .......... .......... 21% 1,42M 13s + 8800K .......... .......... .......... .......... .......... 21% 11,1M 13s + 8850K .......... .......... .......... .......... .......... 21% 78,9M 13s + 8900K .......... .......... .......... .......... .......... 21% 50,5M 13s + 8950K .......... .......... .......... .......... .......... 21% 73,1M 13s + 9000K .......... .......... .......... .......... .......... 21% 77,6M 13s + 9050K .......... .......... .......... .......... .......... 21% 20,2M 13s + 9100K .......... .......... .......... .......... .......... 21% 25,2M 13s + 9150K .......... .......... .......... .......... .......... 22% 117M 12s + 9200K .......... .......... .......... .......... .......... 22% 2,23M 12s + 9250K .......... .......... .......... .......... .......... 22% 22,4M 12s + 9300K .......... .......... .......... .......... .......... 22% 8,59M 12s + 9350K .......... .......... .......... .......... .......... 22% 24,5M 12s + 9400K .......... .......... .......... .......... .......... 22% 79,6M 12s + 9450K .......... .......... .......... .......... .......... 22% 7,10M 12s + 9500K .......... .......... .......... .......... .......... 22% 8,02M 12s + 9550K .......... .......... .......... .......... .......... 23% 8,69M 12s + 9600K .......... .......... .......... .......... .......... 23% 8,16M 12s + 9650K .......... .......... .......... .......... .......... 23% 63,0M 12s + 9700K .......... .......... .......... .......... .......... 23% 1,72M 12s + 9750K .......... .......... .......... .......... .......... 23% 10,1M 12s + 9800K .......... .......... .......... .......... .......... 23% 60,2M 12s + 9850K .......... .......... .......... .......... .......... 23% 61,9M 12s + 9900K .......... .......... .......... .......... .......... 23% 62,9M 12s + 9950K .......... .......... .......... .......... .......... 24% 76,6M 11s + 10000K .......... .......... .......... .......... .......... 24% 23,8M 11s + 10050K .......... .......... .......... .......... .......... 24% 30,4M 11s + 10100K .......... .......... .......... .......... .......... 24% 3,50M 11s + 10150K .......... .......... .......... .......... .......... 24% 6,05M 11s + 10200K .......... .......... .......... .......... .......... 24% 14,9M 11s + 10250K .......... .......... .......... .......... .......... 24% 10,5M 11s + 10300K .......... .......... .......... .......... .......... 24% 21,5M 11s + 10350K .......... .......... .......... .......... .......... 24% 79,7M 11s + 10400K .......... .......... .......... .......... .......... 25% 8,60M 11s + 10450K .......... .......... .......... .......... .......... 25% 6,92M 11s + 10500K .......... .......... .......... .......... .......... 25% 11,0M 11s + 10550K .......... .......... .......... .......... .......... 25% 6,96M 11s + 10600K .......... .......... .......... .......... .......... 25% 66,9M 11s + 10650K .......... .......... .......... .......... .......... 25% 10,9M 11s + 10700K .......... .......... .......... .......... .......... 25% 1,71M 11s + 10750K .......... .......... .......... .......... .......... 25% 60,4M 11s + 10800K .......... .......... .......... .......... .......... 26% 39,6M 11s + 10850K .......... .......... .......... .......... .......... 26% 62,6M 11s + 10900K .......... .......... .......... .......... .......... 26% 65,0M 10s + 10950K .......... .......... .......... .......... .......... 26% 137M 10s + 11000K .......... .......... .......... .......... .......... 26% 37,8M 10s + 11050K .......... .......... .......... .......... .......... 26% 82,1M 10s + 11100K .......... .......... .......... .......... .......... 26% 36,9M 10s + 11150K .......... .......... .......... .......... .......... 26% 3,47M 10s + 11200K .......... .......... .......... .......... .......... 27% 4,59M 10s + 11250K .......... .......... .......... .......... .......... 27% 10,3M 10s + 11300K .......... .......... .......... .......... .......... 27% 105M 10s + 11350K .......... .......... .......... .......... .......... 27% 21,8M 10s + 11400K .......... .......... .......... .......... .......... 27% 8,57M 10s + 11450K .......... .......... .......... .......... .......... 27% 6,57M 10s + 11500K .......... .......... .......... .......... .......... 27% 60,3M 10s + 11550K .......... .......... .......... .......... .......... 27% 11,5M 10s + 11600K .......... .......... .......... .......... .......... 27% 7,50M 10s + 11650K .......... .......... .......... .......... .......... 28% 72,7M 10s + 11700K .......... .......... .......... .......... .......... 28% 7,61M 10s + 11750K .......... .......... .......... .......... .......... 28% 2,31M 10s + 11800K .......... .......... .......... .......... .......... 28% 6,77M 10s + 11850K .......... .......... .......... .......... .......... 28% 66,3M 10s + 11900K .......... .......... .......... .......... .......... 28% 69,9M 10s + 11950K .......... .......... .......... .......... .......... 28% 73,3M 9s + 12000K .......... .......... .......... .......... .......... 28% 59,8M 9s + 12050K .......... .......... .......... .......... .......... 29% 62,8M 9s + 12100K .......... .......... .......... .......... .......... 29% 72,4M 9s + 12150K .......... .......... .......... .......... .......... 29% 38,9M 9s + 12200K .......... .......... .......... .......... .......... 29% 8,31M 9s + 12250K .......... .......... .......... .......... .......... 29% 6,24M 9s + 12300K .......... .......... .......... .......... .......... 29% 4,90M 9s + 12350K .......... .......... .......... .......... .......... 29% 8,21M 9s + 12400K .......... .......... .......... .......... .......... 29% 20,0M 9s + 12450K .......... .......... .......... .......... .......... 30% 9,55M 9s + 12500K .......... .......... .......... .......... .......... 30% 49,5M 9s + 12550K .......... .......... .......... .......... .......... 30% 6,87M 9s + 12600K .......... .......... .......... .......... .......... 30% 60,8M 9s + 12650K .......... .......... .......... .......... .......... 30% 11,6M 9s + 12700K .......... .......... .......... .......... .......... 30% 68,3M 9s + 12750K .......... .......... .......... .......... .......... 30% 7,84M 9s + 12800K .......... .......... .......... .......... .......... 30% 41,8M 9s + 12850K .......... .......... .......... .......... .......... 30% 8,13M 9s + 12900K .......... .......... .......... .......... .......... 31% 2,43M 9s + 12950K .......... .......... .......... .......... .......... 31% 6,04M 9s + 13000K .......... .......... .......... .......... .......... 31% 47,7M 9s + 13050K .......... .......... .......... .......... .......... 31% 56,9M 9s + 13100K .......... .......... .......... .......... .......... 31% 59,0M 9s + 13150K .......... .......... .......... .......... .......... 31% 49,4M 8s + 13200K .......... .......... .......... .......... .......... 31% 61,2M 8s + 13250K .......... .......... .......... .......... .......... 31% 56,6M 8s + 13300K .......... .......... .......... .......... .......... 32% 69,6M 8s + 13350K .......... .......... .......... .......... .......... 32% 9,89M 8s + 13400K .......... .......... .......... .......... .......... 32% 51,2M 8s + 13450K .......... .......... .......... .......... .......... 32% 3,68M 8s + 13500K .......... .......... .......... .......... .......... 32% 10,9M 8s + 13550K .......... .......... .......... .......... .......... 32% 9,06M 8s + 13600K .......... .......... .......... .......... .......... 32% 22,0M 8s + 13650K .......... .......... .......... .......... .......... 32% 56,2M 8s + 13700K .......... .......... .......... .......... .......... 33% 8,24M 8s + 13750K .......... .......... .......... .......... .......... 33% 7,93M 8s + 13800K .......... .......... .......... .......... .......... 33% 46,0M 8s + 13850K .......... .......... .......... .......... .......... 33% 140M 8s + 13900K .......... .......... .......... .......... .......... 33% 12,6M 8s + 13950K .......... .......... .......... .......... .......... 33% 8,45M 8s + 14000K .......... .......... .......... .......... .......... 33% 25,4M 8s + 14050K .......... .......... .......... .......... .......... 33% 8,48M 8s + 14100K .......... .......... .......... .......... .......... 33% 115M 8s + 14150K .......... .......... .......... .......... .......... 34% 2,37M 8s + 14200K .......... .......... .......... .......... .......... 34% 6,80M 8s + 14250K .......... .......... .......... .......... .......... 34% 41,9M 8s + 14300K .......... .......... .......... .......... .......... 34% 59,1M 8s + 14350K .......... .......... .......... .......... .......... 34% 134M 8s + 14400K .......... .......... .......... .......... .......... 34% 181M 8s + 14450K .......... .......... .......... .......... .......... 34% 107M 8s + 14500K .......... .......... .......... .......... .......... 34% 61,9M 7s + 14550K .......... .......... .......... .......... .......... 35% 24,4M 7s + 14600K .......... .......... .......... .......... .......... 35% 148M 7s + 14650K .......... .......... .......... .......... .......... 35% 8,76M 7s + 14700K .......... .......... .......... .......... .......... 35% 8,29M 7s + 14750K .......... .......... .......... .......... .......... 35% 3,92M 7s + 14800K .......... .......... .......... .......... .......... 35% 9,53M 7s + 14850K .......... .......... .......... .......... .......... 35% 143M 7s + 14900K .......... .......... .......... .......... .......... 35% 19,0M 7s + 14950K .......... .......... .......... .......... .......... 36% 7,80M 7s + 15000K .......... .......... .......... .......... .......... 36% 7,87M 7s + 15050K .......... .......... .......... .......... .......... 36% 60,1M 7s + 15100K .......... .......... .......... .......... .......... 36% 55,7M 7s + 15150K .......... .......... .......... .......... .......... 36% 12,2M 7s + 15200K .......... .......... .......... .......... .......... 36% 11,5M 7s + 15250K .......... .......... .......... .......... .......... 36% 23,0M 7s + 15300K .......... .......... .......... .......... .......... 36% 50,4M 7s + 15350K .......... .......... .......... .......... .......... 36% 51,4M 7s + 15400K .......... .......... .......... .......... .......... 37% 9,26M 7s + 15450K .......... .......... .......... .......... .......... 37% 7,03M 7s + 15500K .......... .......... .......... .......... .......... 37% 3,39M 7s + 15550K .......... .......... .......... .......... .......... 37% 6,82M 7s + 15600K .......... .......... .......... .......... .......... 37% 33,2M 7s + 15650K .......... .......... .......... .......... .......... 37% 56,0M 7s + 15700K .......... .......... .......... .......... .......... 37% 52,0M 7s + 15750K .......... .......... .......... .......... .......... 37% 55,0M 7s + 15800K .......... .......... .......... .......... .......... 38% 66,8M 7s + 15850K .......... .......... .......... .......... .......... 38% 62,0M 7s + 15900K .......... .......... .......... .......... .......... 38% 62,8M 7s + 15950K .......... .......... .......... .......... .......... 38% 192M 7s + 16000K .......... .......... .......... .......... .......... 38% 164M 7s + 16050K .......... .......... .......... .......... .......... 38% 16,4M 7s + 16100K .......... .......... .......... .......... .......... 38% 28,9M 7s + 16150K .......... .......... .......... .......... .......... 38% 8,73M 6s + 16200K .......... .......... .......... .......... .......... 39% 51,7M 6s + 16250K .......... .......... .......... .......... .......... 39% 4,07M 6s + 16300K .......... .......... .......... .......... .......... 39% 8,88M 6s + 16350K .......... .......... .......... .......... .......... 39% 30,0M 6s + 16400K .......... .......... .......... .......... .......... 39% 10,2M 6s + 16450K .......... .......... .......... .......... .......... 39% 6,47M 6s + 16500K .......... .......... .......... .......... .......... 39% 49,7M 6s + 16550K .......... .......... .......... .......... .......... 39% 57,1M 6s + 16600K .......... .......... .......... .......... .......... 39% 5,99M 6s + 16650K .......... .......... .......... .......... .......... 40% 47,3M 6s + 16700K .......... .......... .......... .......... .......... 40% 50,5M 6s + 16750K .......... .......... .......... .......... .......... 40% 80,4M 6s + 16800K .......... .......... .......... .......... .......... 40% 49,6M 6s + 16850K .......... .......... .......... .......... .......... 40% 61,4M 6s + 16900K .......... .......... .......... .......... .......... 40% 9,92M 6s + 16950K .......... .......... .......... .......... .......... 40% 97,6M 6s + 17000K .......... .......... .......... .......... .......... 40% 2,35M 6s + 17050K .......... .......... .......... .......... .......... 41% 6,43M 6s + 17100K .......... .......... .......... .......... .......... 41% 41,0M 6s + 17150K .......... .......... .......... .......... .......... 41% 56,3M 6s + 17200K .......... .......... .......... .......... .......... 41% 46,3M 6s + 17250K .......... .......... .......... .......... .......... 41% 59,6M 6s + 17300K .......... .......... .......... .......... .......... 41% 51,6M 6s + 17350K .......... .......... .......... .......... .......... 41% 84,3M 6s + 17400K .......... .......... .......... .......... .......... 41% 62,6M 6s + 17450K .......... .......... .......... .......... .......... 42% 81,4M 6s + 17500K .......... .......... .......... .......... .......... 42% 80,4M 6s + 17550K .......... .......... .......... .......... .......... 42% 20,1M 6s + 17600K .......... .......... .......... .......... .......... 42% 26,4M 6s + 17650K .......... .......... .......... .......... .......... 42% 68,5M 6s + 17700K .......... .......... .......... .......... .......... 42% 12,3M 6s + 17750K .......... .......... .......... .......... .......... 42% 30,3M 6s + 17800K .......... .......... .......... .......... .......... 42% 3,98M 6s + 17850K .......... .......... .......... .......... .......... 42% 89,6M 6s + 17900K .......... .......... .......... .......... .......... 43% 9,68M 6s + 17950K .......... .......... .......... .......... .......... 43% 34,4M 6s + 18000K .......... .......... .......... .......... .......... 43% 7,09M 6s + 18050K .......... .......... .......... .......... .......... 43% 9,29M 6s + 18100K .......... .......... .......... .......... .......... 43% 88,7M 6s + 18150K .......... .......... .......... .......... .......... 43% 43,6M 5s + 18200K .......... .......... .......... .......... .......... 43% 10,3M 5s + 18250K .......... .......... .......... .......... .......... 43% 12,4M 5s + 18300K .......... .......... .......... .......... .......... 44% 113M 5s + 18350K .......... .......... .......... .......... .......... 44% 23,2M 5s + 18400K .......... .......... .......... .......... .......... 44% 96,5M 5s + 18450K .......... .......... .......... .......... .......... 44% 119M 5s + 18500K .......... .......... .......... .......... .......... 44% 70,8M 5s + 18550K .......... .......... .......... .......... .......... 44% 9,12M 5s + 18600K .......... .......... .......... .......... .......... 44% 66,7M 5s + 18650K .......... .......... .......... .......... .......... 44% 7,63M 5s + 18700K .......... .......... .......... .......... .......... 45% 2,25M 5s + 18750K .......... .......... .......... .......... .......... 45% 112M 5s + 18800K .......... .......... .......... .......... .......... 45% 61,9M 5s + 18850K .......... .......... .......... .......... .......... 45% 79,6M 5s + 18900K .......... .......... .......... .......... .......... 45% 60,4M 5s + 18950K .......... .......... .......... .......... .......... 45% 110M 5s + 19000K .......... .......... .......... .......... .......... 45% 81,0M 5s + 19050K .......... .......... .......... .......... .......... 45% 77,1M 5s + 19100K .......... .......... .......... .......... .......... 45% 107M 5s + 19150K .......... .......... .......... .......... .......... 46% 59,2M 5s + 19200K .......... .......... .......... .......... .......... 46% 12,9M 5s + 19250K .......... .......... .......... .......... .......... 46% 31,5M 5s + 19300K .......... .......... .......... .......... .......... 46% 59,1M 5s + 19350K .......... .......... .......... .......... .......... 46% 8,48M 5s + 19400K .......... .......... .......... .......... .......... 46% 70,5M 5s + 19450K .......... .......... .......... .......... .......... 46% 6,40M 5s + 19500K .......... .......... .......... .......... .......... 46% 47,7M 5s + 19550K .......... .......... .......... .......... .......... 47% 5,84M 5s + 19600K .......... .......... .......... .......... .......... 47% 54,2M 5s + 19650K .......... .......... .......... .......... .......... 47% 34,6M 5s + 19700K .......... .......... .......... .......... .......... 47% 8,77M 5s + 19750K .......... .......... .......... .......... .......... 47% 45,6M 5s + 19800K .......... .......... .......... .......... .......... 47% 8,46M 5s + 19850K .......... .......... .......... .......... .......... 47% 53,9M 5s + 19900K .......... .......... .......... .......... .......... 47% 10,0M 5s + 19950K .......... .......... .......... .......... .......... 48% 41,3M 5s + 20000K .......... .......... .......... .......... .......... 48% 15,0M 5s + 20050K .......... .......... .......... .......... .......... 48% 25,6M 5s + 20100K .......... .......... .......... .......... .......... 48% 75,2M 5s + 20150K .......... .......... .......... .......... .......... 48% 118M 5s + 20200K .......... .......... .......... .......... .......... 48% 106M 5s + 20250K .......... .......... .......... .......... .......... 48% 122M 5s + 20300K .......... .......... .......... .......... .......... 48% 9,40M 5s + 20350K .......... .......... .......... .......... .......... 48% 82,8M 5s + 20400K .......... .......... .......... .......... .......... 49% 2,31M 5s + 20450K .......... .......... .......... .......... .......... 49% 102M 5s + 20500K .......... .......... .......... .......... .......... 49% 7,52M 5s + 20550K .......... .......... .......... .......... .......... 49% 59,3M 5s + 20600K .......... .......... .......... .......... .......... 49% 108M 4s + 20650K .......... .......... .......... .......... .......... 49% 37,9M 4s + 20700K .......... .......... .......... .......... .......... 49% 120M 4s + 20750K .......... .......... .......... .......... .......... 49% 84,2M 4s + 20800K .......... .......... .......... .......... .......... 50% 67,8M 4s + 20850K .......... .......... .......... .......... .......... 50% 100M 4s + 20900K .......... .......... .......... .......... .......... 50% 71,7M 4s + 20950K .......... .......... .......... .......... .......... 50% 73,8M 4s + 21000K .......... .......... .......... .......... .......... 50% 15,5M 4s + 21050K .......... .......... .......... .......... .......... 50% 21,8M 4s + 21100K .......... .......... .......... .......... .......... 50% 11,0M 4s + 21150K .......... .......... .......... .......... .......... 50% 64,5M 4s + 21200K .......... .......... .......... .......... .......... 51% 29,8M 4s + 21250K .......... .......... .......... .......... .......... 51% 8,28M 4s + 21300K .......... .......... .......... .......... .......... 51% 9,12M 4s + 21350K .......... .......... .......... .......... .......... 51% 9,08M 4s + 21400K .......... .......... .......... .......... .......... 51% 42,5M 4s + 21450K .......... .......... .......... .......... .......... 51% 67,7M 4s + 21500K .......... .......... .......... .......... .......... 51% 37,9M 4s + 21550K .......... .......... .......... .......... .......... 51% 9,20M 4s + 21600K .......... .......... .......... .......... .......... 51% 11,2M 4s + 21650K .......... .......... .......... .......... .......... 52% 21,7M 4s + 21700K .......... .......... .......... .......... .......... 52% 71,1M 4s + 21750K .......... .......... .......... .......... .......... 52% 8,58M 4s + 21800K .......... .......... .......... .......... .......... 52% 15,8M 4s + 21850K .......... .......... .......... .......... .......... 52% 49,8M 4s + 21900K .......... .......... .......... .......... .......... 52% 26,0M 4s + 21950K .......... .......... .......... .......... .......... 52% 84,1M 4s + 22000K .......... .......... .......... .......... .......... 52% 75,1M 4s + 22050K .......... .......... .......... .......... .......... 53% 91,9M 4s + 22100K .......... .......... .......... .......... .......... 53% 90,4M 4s + 22150K .......... .......... .......... .......... .......... 53% 11,7M 4s + 22200K .......... .......... .......... .......... .......... 53% 40,0M 4s + 22250K .......... .......... .......... .......... .......... 53% 86,5M 4s + 22300K .......... .......... .......... .......... .......... 53% 80,8M 4s + 22350K .......... .......... .......... .......... .......... 53% 2,36M 4s + 22400K .......... .......... .......... .......... .......... 53% 8,03M 4s + 22450K .......... .......... .......... .......... .......... 54% 44,6M 4s + 22500K .......... .......... .......... .......... .......... 54% 44,3M 4s + 22550K .......... .......... .......... .......... .......... 54% 46,1M 4s + 22600K .......... .......... .......... .......... .......... 54% 59,6M 4s + 22650K .......... .......... .......... .......... .......... 54% 64,5M 4s + 22700K .......... .......... .......... .......... .......... 54% 52,4M 4s + 22750K .......... .......... .......... .......... .......... 54% 64,6M 4s + 22800K .......... .......... .......... .......... .......... 54% 56,7M 4s + 22850K .......... .......... .......... .......... .......... 54% 75,7M 4s + 22900K .......... .......... .......... .......... .......... 55% 35,7M 4s + 22950K .......... .......... .......... .......... .......... 55% 30,3M 4s + 23000K .......... .......... .......... .......... .......... 55% 11,0M 4s + 23050K .......... .......... .......... .......... .......... 55% 102M 4s + 23100K .......... .......... .......... .......... .......... 55% 25,4M 4s + 23150K .......... .......... .......... .......... .......... 55% 8,53M 4s + 23200K .......... .......... .......... .......... .......... 55% 29,8M 4s + 23250K .......... .......... .......... .......... .......... 55% 11,5M 4s + 23300K .......... .......... .......... .......... .......... 56% 93,9M 4s + 23350K .......... .......... .......... .......... .......... 56% 8,20M 4s + 23400K .......... .......... .......... .......... .......... 56% 83,3M 4s + 23450K .......... .......... .......... .......... .......... 56% 32,7M 4s + 23500K .......... .......... .......... .......... .......... 56% 103M 3s + 23550K .......... .......... .......... .......... .......... 56% 9,54M 3s + 23600K .......... .......... .......... .......... .......... 56% 8,14M 3s + 23650K .......... .......... .......... .......... .......... 56% 76,8M 3s + 23700K .......... .......... .......... .......... .......... 57% 8,68M 3s + 23750K .......... .......... .......... .......... .......... 57% 63,7M 3s + 23800K .......... .......... .......... .......... .......... 57% 13,3M 3s + 23850K .......... .......... .......... .......... .......... 57% 29,7M 3s + 23900K .......... .......... .......... .......... .......... 57% 61,6M 3s + 23950K .......... .......... .......... .......... .......... 57% 71,7M 3s + 24000K .......... .......... .......... .......... .......... 57% 62,1M 3s + 24050K .......... .......... .......... .......... .......... 57% 75,3M 3s + 24100K .......... .......... .......... .......... .......... 57% 14,1M 3s + 24150K .......... .......... .......... .......... .......... 58% 48,4M 3s + 24200K .......... .......... .......... .......... .......... 58% 43,5M 3s + 24250K .......... .......... .......... .......... .......... 58% 91,5M 3s + 24300K .......... .......... .......... .......... .......... 58% 117M 3s + 24350K .......... .......... .......... .......... .......... 58% 2,39M 3s + 24400K .......... .......... .......... .......... .......... 58% 8,97M 3s + 24450K .......... .......... .......... .......... .......... 58% 102M 3s + 24500K .......... .......... .......... .......... .......... 58% 42,4M 3s + 24550K .......... .......... .......... .......... .......... 59% 64,6M 3s + 24600K .......... .......... .......... .......... .......... 59% 35,3M 3s + 24650K .......... .......... .......... .......... .......... 59% 113M 3s + 24700K .......... .......... .......... .......... .......... 59% 120M 3s + 24750K .......... .......... .......... .......... .......... 59% 38,7M 3s + 24800K .......... .......... .......... .......... .......... 59% 58,8M 3s + 24850K .......... .......... .......... .......... .......... 59% 73,9M 3s + 24900K .......... .......... .......... .......... .......... 59% 24,8M 3s + 24950K .......... .......... .......... .......... .......... 60% 63,1M 3s + 25000K .......... .......... .......... .......... .......... 60% 32,9M 3s + 25050K .......... .......... .......... .......... .......... 60% 11,0M 3s + 25100K .......... .......... .......... .......... .......... 60% 24,1M 3s + 25150K .......... .......... .......... .......... .......... 60% 85,0M 3s + 25200K .......... .......... .......... .......... .......... 60% 9,09M 3s + 25250K .......... .......... .......... .......... .......... 60% 122M 3s + 25300K .......... .......... .......... .......... .......... 60% 30,1M 3s + 25350K .......... .......... .......... .......... .......... 60% 11,4M 3s + 25400K .......... .......... .......... .......... .......... 61% 95,0M 3s + 25450K .......... .......... .......... .......... .......... 61% 7,94M 3s + 25500K .......... .......... .......... .......... .......... 61% 125M 3s + 25550K .......... .......... .......... .......... .......... 61% 42,5M 3s + 25600K .......... .......... .......... .......... .......... 61% 9,23M 3s + 25650K .......... .......... .......... .......... .......... 61% 66,0M 3s + 25700K .......... .......... .......... .......... .......... 61% 8,38M 3s + 25750K .......... .......... .......... .......... .......... 61% 70,8M 3s + 25800K .......... .......... .......... .......... .......... 62% 8,71M 3s + 25850K .......... .......... .......... .......... .......... 62% 69,5M 3s + 25900K .......... .......... .......... .......... .......... 62% 15,6M 3s + 25950K .......... .......... .......... .......... .......... 62% 26,2M 3s + 26000K .......... .......... .......... .......... .......... 62% 60,0M 3s + 26050K .......... .......... .......... .......... .......... 62% 71,0M 3s + 26100K .......... .......... .......... .......... .......... 62% 73,0M 3s + 26150K .......... .......... .......... .......... .......... 62% 71,9M 3s + 26200K .......... .......... .......... .......... .......... 63% 64,3M 3s + 26250K .......... .......... .......... .......... .......... 63% 17,0M 3s + 26300K .......... .......... .......... .......... .......... 63% 67,3M 3s + 26350K .......... .......... .......... .......... .......... 63% 35,5M 3s + 26400K .......... .......... .......... .......... .......... 63% 80,0M 3s + 26450K .......... .......... .......... .......... .......... 63% 110M 3s + 26500K .......... .......... .......... .......... .......... 63% 10,7M 3s + 26550K .......... .......... .......... .......... .......... 63% 3,01M 3s + 26600K .......... .......... .......... .......... .......... 63% 8,05M 3s + 26650K .......... .......... .......... .......... .......... 64% 107M 3s + 26700K .......... .......... .......... .......... .......... 64% 70,1M 3s + 26750K .......... .......... .......... .......... .......... 64% 71,8M 3s + 26800K .......... .......... .......... .......... .......... 64% 30,4M 3s + 26850K .......... .......... .......... .......... .......... 64% 109M 3s + 26900K .......... .......... .......... .......... .......... 64% 57,8M 3s + 26950K .......... .......... .......... .......... .......... 64% 47,2M 3s + 27000K .......... .......... .......... .......... .......... 64% 81,2M 3s + 27050K .......... .......... .......... .......... .......... 65% 74,9M 3s + 27100K .......... .......... .......... .......... .......... 65% 72,4M 3s + 27150K .......... .......... .......... .......... .......... 65% 32,0M 3s + 27200K .......... .......... .......... .......... .......... 65% 34,8M 2s + 27250K .......... .......... .......... .......... .......... 65% 10,5M 2s + 27300K .......... .......... .......... .......... .......... 65% 65,5M 2s + 27350K .......... .......... .......... .......... .......... 65% 27,9M 2s + 27400K .......... .......... .......... .......... .......... 65% 9,96M 2s + 27450K .......... .......... .......... .......... .......... 66% 58,0M 2s + 27500K .......... .......... .......... .......... .......... 66% 97,2M 2s + 27550K .......... .......... .......... .......... .......... 66% 30,3M 2s + 27600K .......... .......... .......... .......... .......... 66% 11,2M 2s + 27650K .......... .......... .......... .......... .......... 66% 8,92M 2s + 27700K .......... .......... .......... .......... .......... 66% 49,0M 2s + 27750K .......... .......... .......... .......... .......... 66% 65,0M 2s + 27800K .......... .......... .......... .......... .......... 66% 65,9M 2s + 27850K .......... .......... .......... .......... .......... 66% 9,76M 2s + 27900K .......... .......... .......... .......... .......... 67% 8,10M 2s + 27950K .......... .......... .......... .......... .......... 67% 68,7M 2s + 28000K .......... .......... .......... .......... .......... 67% 60,7M 2s + 28050K .......... .......... .......... .......... .......... 67% 71,4M 2s + 28100K .......... .......... .......... .......... .......... 67% 9,13M 2s + 28150K .......... .......... .......... .......... .......... 67% 17,5M 2s + 28200K .......... .......... .......... .......... .......... 67% 59,7M 2s + 28250K .......... .......... .......... .......... .......... 67% 25,1M 2s + 28300K .......... .......... .......... .......... .......... 68% 67,3M 2s + 28350K .......... .......... .......... .......... .......... 68% 70,4M 2s + 28400K .......... .......... .......... .......... .......... 68% 60,6M 2s + 28450K .......... .......... .......... .......... .......... 68% 74,6M 2s + 28500K .......... .......... .......... .......... .......... 68% 74,9M 2s + 28550K .......... .......... .......... .......... .......... 68% 19,6M 2s + 28600K .......... .......... .......... .......... .......... 68% 29,3M 2s + 28650K .......... .......... .......... .......... .......... 68% 67,6M 2s + 28700K .......... .......... .......... .......... .......... 69% 93,7M 2s + 28750K .......... .......... .......... .......... .......... 69% 140M 2s + 28800K .......... .......... .......... .......... .......... 69% 11,5M 2s + 28850K .......... .......... .......... .......... .......... 69% 6,48M 2s + 28900K .......... .......... .......... .......... .......... 69% 3,54M 2s + 28950K .......... .......... .......... .......... .......... 69% 33,1M 2s + 29000K .......... .......... .......... .......... .......... 69% 83,1M 2s + 29050K .......... .......... .......... .......... .......... 69% 59,5M 2s + 29100K .......... .......... .......... .......... .......... 69% 31,8M 2s + 29150K .......... .......... .......... .......... .......... 70% 129M 2s + 29200K .......... .......... .......... .......... .......... 70% 117M 2s + 29250K .......... .......... .......... .......... .......... 70% 69,8M 2s + 29300K .......... .......... .......... .......... .......... 70% 56,8M 2s + 29350K .......... .......... .......... .......... .......... 70% 89,9M 2s + 29400K .......... .......... .......... .......... .......... 70% 81,7M 2s + 29450K .......... .......... .......... .......... .......... 70% 102M 2s + 29500K .......... .......... .......... .......... .......... 70% 32,2M 2s + 29550K .......... .......... .......... .......... .......... 71% 62,2M 2s + 29600K .......... .......... .......... .......... .......... 71% 9,95M 2s + 29650K .......... .......... .......... .......... .......... 71% 61,8M 2s + 29700K .......... .......... .......... .......... .......... 71% 27,6M 2s + 29750K .......... .......... .......... .......... .......... 71% 9,47M 2s + 29800K .......... .......... .......... .......... .......... 71% 49,6M 2s + 29850K .......... .......... .......... .......... .......... 71% 61,8M 2s + 29900K .......... .......... .......... .......... .......... 71% 79,8M 2s + 29950K .......... .......... .......... .......... .......... 72% 43,6M 2s + 30000K .......... .......... .......... .......... .......... 72% 12,1M 2s + 30050K .......... .......... .......... .......... .......... 72% 9,44M 2s + 30100K .......... .......... .......... .......... .......... 72% 62,0M 2s + 30150K .......... .......... .......... .......... .......... 72% 34,3M 2s + 30200K .......... .......... .......... .......... .......... 72% 85,1M 2s + 30250K .......... .......... .......... .......... .......... 72% 10,4M 2s + 30300K .......... .......... .......... .......... .......... 72% 60,9M 2s + 30350K .......... .......... .......... .......... .......... 72% 8,51M 2s + 30400K .......... .......... .......... .......... .......... 73% 52,0M 2s + 30450K .......... .......... .......... .......... .......... 73% 121M 2s + 30500K .......... .......... .......... .......... .......... 73% 9,72M 2s + 30550K .......... .......... .......... .......... .......... 73% 66,8M 2s + 30600K .......... .......... .......... .......... .......... 73% 15,5M 2s + 30650K .......... .......... .......... .......... .......... 73% 27,7M 2s + 30700K .......... .......... .......... .......... .......... 73% 43,3M 2s + 30750K .......... .......... .......... .......... .......... 73% 122M 2s + 30800K .......... .......... .......... .......... .......... 74% 95,3M 2s + 30850K .......... .......... .......... .......... .......... 74% 75,0M 2s + 30900K .......... .......... .......... .......... .......... 74% 137M 2s + 30950K .......... .......... .......... .......... .......... 74% 14,7M 2s + 31000K .......... .......... .......... .......... .......... 74% 78,5M 2s + 31050K .......... .......... .......... .......... .......... 74% 139M 2s + 31100K .......... .......... .......... .......... .......... 74% 27,4M 2s + 31150K .......... .......... .......... .......... .......... 74% 86,3M 2s + 31200K .......... .......... .......... .......... .......... 75% 106M 2s + 31250K .......... .......... .......... .......... .......... 75% 12,0M 2s + 31300K .......... .......... .......... .......... .......... 75% 61,8M 2s + 31350K .......... .......... .......... .......... .......... 75% 2,48M 2s + 31400K .......... .......... .......... .......... .......... 75% 19,5M 2s + 31450K .......... .......... .......... .......... .......... 75% 110M 2s + 31500K .......... .......... .......... .......... .......... 75% 122M 2s + 31550K .......... .......... .......... .......... .......... 75% 126M 2s + 31600K .......... .......... .......... .......... .......... 75% 28,2M 2s + 31650K .......... .......... .......... .......... .......... 76% 83,6M 2s + 31700K .......... .......... .......... .......... .......... 76% 81,5M 2s + 31750K .......... .......... .......... .......... .......... 76% 94,8M 2s + 31800K .......... .......... .......... .......... .......... 76% 83,4M 2s + 31850K .......... .......... .......... .......... .......... 76% 100M 1s + 31900K .......... .......... .......... .......... .......... 76% 70,2M 1s + 31950K .......... .......... .......... .......... .......... 76% 121M 1s + 32000K .......... .......... .......... .......... .......... 76% 61,4M 1s + 32050K .......... .......... .......... .......... .......... 77% 43,4M 1s + 32100K .......... .......... .......... .......... .......... 77% 37,1M 1s + 32150K .......... .......... .......... .......... .......... 77% 11,7M 1s + 32200K .......... .......... .......... .......... .......... 77% 83,8M 1s + 32250K .......... .......... .......... .......... .......... 77% 22,5M 1s + 32300K .......... .......... .......... .......... .......... 77% 9,99M 1s + 32350K .......... .......... .......... .......... .......... 77% 39,0M 1s + 32400K .......... .......... .......... .......... .......... 77% 62,6M 1s + 32450K .......... .......... .......... .......... .......... 78% 117M 1s + 32500K .......... .......... .......... .......... .......... 78% 44,7M 1s + 32550K .......... .......... .......... .......... .......... 78% 14,5M 1s + 32600K .......... .......... .......... .......... .......... 78% 8,11M 1s + 32650K .......... .......... .......... .......... .......... 78% 61,7M 1s + 32700K .......... .......... .......... .......... .......... 78% 31,2M 1s + 32750K .......... .......... .......... .......... .......... 78% 57,9M 1s + 32800K .......... .......... .......... .......... .......... 78% 54,3M 1s + 32850K .......... .......... .......... .......... .......... 78% 13,1M 1s + 32900K .......... .......... .......... .......... .......... 79% 54,3M 1s + 32950K .......... .......... .......... .......... .......... 79% 8,54M 1s + 33000K .......... .......... .......... .......... .......... 79% 46,9M 1s + 33050K .......... .......... .......... .......... .......... 79% 71,3M 1s + 33100K .......... .......... .......... .......... .......... 79% 94,1M 1s + 33150K .......... .......... .......... .......... .......... 79% 11,0M 1s + 33200K .......... .......... .......... .......... .......... 79% 14,1M 1s + 33250K .......... .......... .......... .......... .......... 79% 26,0M 1s + 33300K .......... .......... .......... .......... .......... 80% 71,5M 1s + 33350K .......... .......... .......... .......... .......... 80% 70,9M 1s + 33400K .......... .......... .......... .......... .......... 80% 66,6M 1s + 33450K .......... .......... .......... .......... .......... 80% 72,1M 1s + 33500K .......... .......... .......... .......... .......... 80% 88,0M 1s + 33550K .......... .......... .......... .......... .......... 80% 17,3M 1s + 33600K .......... .......... .......... .......... .......... 80% 52,4M 1s + 33650K .......... .......... .......... .......... .......... 80% 70,5M 1s + 33700K .......... .......... .......... .......... .......... 81% 81,7M 1s + 33750K .......... .......... .......... .......... .......... 81% 77,3M 1s + 33800K .......... .......... .......... .......... .......... 81% 67,6M 1s + 33850K .......... .......... .......... .......... .......... 81% 69,8M 1s + 33900K .......... .......... .......... .......... .......... 81% 91,4M 1s + 33950K .......... .......... .......... .......... .......... 81% 15,6M 1s + 34000K .......... .......... .......... .......... .......... 81% 3,40M 1s + 34050K .......... .......... .......... .......... .......... 81% 6,13M 1s + 34100K .......... .......... .......... .......... .......... 82% 73,9M 1s + 34150K .......... .......... .......... .......... .......... 82% 46,6M 1s + 34200K .......... .......... .......... .......... .......... 82% 51,9M 1s + 34250K .......... .......... .......... .......... .......... 82% 51,7M 1s + 34300K .......... .......... .......... .......... .......... 82% 53,6M 1s + 34350K .......... .......... .......... .......... .......... 82% 44,7M 1s + 34400K .......... .......... .......... .......... .......... 82% 41,9M 1s + 34450K .......... .......... .......... .......... .......... 82% 44,0M 1s + 34500K .......... .......... .......... .......... .......... 82% 43,0M 1s + 34550K .......... .......... .......... .......... .......... 83% 74,0M 1s + 34600K .......... .......... .......... .......... .......... 83% 51,1M 1s + 34650K .......... .......... .......... .......... .......... 83% 54,0M 1s + 34700K .......... .......... .......... .......... .......... 83% 62,2M 1s + 34750K .......... .......... .......... .......... .......... 83% 74,9M 1s + 34800K .......... .......... .......... .......... .......... 83% 119M 1s + 34850K .......... .......... .......... .......... .......... 83% 136M 1s + 34900K .......... .......... .......... .......... .......... 83% 62,2M 1s + 34950K .......... .......... .......... .......... .......... 84% 20,3M 1s + 35000K .......... .......... .......... .......... .......... 84% 54,3M 1s + 35050K .......... .......... .......... .......... .......... 84% 11,2M 1s + 35100K .......... .......... .......... .......... .......... 84% 28,9M 1s + 35150K .......... .......... .......... .......... .......... 84% 54,5M 1s + 35200K .......... .......... .......... .......... .......... 84% 99,8M 1s + 35250K .......... .......... .......... .......... .......... 84% 169M 1s + 35300K .......... .......... .......... .......... .......... 84% 13,1M 1s + 35350K .......... .......... .......... .......... .......... 85% 7,96M 1s + 35400K .......... .......... .......... .......... .......... 85% 50,9M 1s + 35450K .......... .......... .......... .......... .......... 85% 47,9M 1s + 35500K .......... .......... .......... .......... .......... 85% 52,4M 1s + 35550K .......... .......... .......... .......... .......... 85% 57,5M 1s + 35600K .......... .......... .......... .......... .......... 85% 70,1M 1s + 35650K .......... .......... .......... .......... .......... 85% 14,8M 1s + 35700K .......... .......... .......... .......... .......... 85% 11,2M 1s + 35750K .......... .......... .......... .......... .......... 85% 10,8M 1s + 35800K .......... .......... .......... .......... .......... 86% 90,7M 1s + 35850K .......... .......... .......... .......... .......... 86% 68,4M 1s + 35900K .......... .......... .......... .......... .......... 86% 22,4M 1s + 35950K .......... .......... .......... .......... .......... 86% 62,0M 1s + 36000K .......... .......... .......... .......... .......... 86% 15,4M 1s + 36050K .......... .......... .......... .......... .......... 86% 26,6M 1s + 36100K .......... .......... .......... .......... .......... 86% 86,4M 1s + 36150K .......... .......... .......... .......... .......... 86% 43,3M 1s + 36200K .......... .......... .......... .......... .......... 87% 89,9M 1s + 36250K .......... .......... .......... .......... .......... 87% 100M 1s + 36300K .......... .......... .......... .......... .......... 87% 84,9M 1s + 36350K .......... .......... .......... .......... .......... 87% 16,9M 1s + 36400K .......... .......... .......... .......... .......... 87% 75,4M 1s + 36450K .......... .......... .......... .......... .......... 87% 98,4M 1s + 36500K .......... .......... .......... .......... .......... 87% 94,8M 1s + 36550K .......... .......... .......... .......... .......... 87% 4,17M 1s + 36600K .......... .......... .......... .......... .......... 88% 236M 1s + 36650K .......... .......... .......... .......... .......... 88% 271M 1s + 36700K .......... .......... .......... .......... .......... 88% 263M 1s + 36750K .......... .......... .......... .......... .......... 88% 273M 1s + 36800K .......... .......... .......... .......... .......... 88% 220M 1s + 36850K .......... .......... .......... .......... .......... 88% 26,3M 1s + 36900K .......... .......... .......... .......... .......... 88% 4,03M 1s + 36950K .......... .......... .......... .......... .......... 88% 15,4M 1s + 37000K .......... .......... .......... .......... .......... 88% 87,5M 1s + 37050K .......... .......... .......... .......... .......... 89% 96,7M 1s + 37100K .......... .......... .......... .......... .......... 89% 103M 1s + 37150K .......... .......... .......... .......... .......... 89% 82,8M 1s + 37200K .......... .......... .......... .......... .......... 89% 76,2M 1s + 37250K .......... .......... .......... .......... .......... 89% 145M 1s + 37300K .......... .......... .......... .......... .......... 89% 36,0M 1s + 37350K .......... .......... .......... .......... .......... 89% 98,7M 1s + 37400K .......... .......... .......... .......... .......... 89% 90,8M 1s + 37450K .......... .......... .......... .......... .......... 90% 99,7M 1s + 37500K .......... .......... .......... .......... .......... 90% 145M 1s + 37550K .......... .......... .......... .......... .......... 90% 99,3M 1s + 37600K .......... .......... .......... .......... .......... 90% 30,2M 1s + 37650K .......... .......... .......... .......... .......... 90% 149M 1s + 37700K .......... .......... .......... .......... .......... 90% 69,9M 1s + 37750K .......... .......... .......... .......... .......... 90% 12,5M 1s + 37800K .......... .......... .......... .......... .......... 90% 66,3M 1s + 37850K .......... .......... .......... .......... .......... 91% 88,5M 1s + 37900K .......... .......... .......... .......... .......... 91% 24,3M 0s + 37950K .......... .......... .......... .......... .......... 91% 11,8M 0s + 38000K .......... .......... .......... .......... .......... 91% 20,9M 0s + 38050K .......... .......... .......... .......... .......... 91% 60,5M 0s + 38100K .......... .......... .......... .......... .......... 91% 118M 0s + 38150K .......... .......... .......... .......... .......... 91% 114M 0s + 38200K .......... .......... .......... .......... .......... 91% 17,3M 0s + 38250K .......... .......... .......... .......... .......... 91% 8,87M 0s + 38300K .......... .......... .......... .......... .......... 92% 70,9M 0s + 38350K .......... .......... .......... .......... .......... 92% 26,9M 0s + 38400K .......... .......... .......... .......... .......... 92% 94,6M 0s + 38450K .......... .......... .......... .......... .......... 92% 99,7M 0s + 38500K .......... .......... .......... .......... .......... 92% 97,3M 0s + 38550K .......... .......... .......... .......... .......... 92% 96,8M 0s + 38600K .......... .......... .......... .......... .......... 92% 12,2M 0s + 38650K .......... .......... .......... .......... .......... 92% 52,0M 0s + 38700K .......... .......... .......... .......... .......... 93% 6,15M 0s + 38750K .......... .......... .......... .......... .......... 93% 68,5M 0s + 38800K .......... .......... .......... .......... .......... 93% 82,7M 0s + 38850K .......... .......... .......... .......... .......... 93% 16,7M 0s + 38900K .......... .......... .......... .......... .......... 93% 117M 0s + 38950K .......... .......... .......... .......... .......... 93% 20,1M 0s + 39000K .......... .......... .......... .......... .......... 93% 71,4M 0s + 39050K .......... .......... .......... .......... .......... 93% 19,6M 0s + 39100K .......... .......... .......... .......... .......... 94% 131M 0s + 39150K .......... .......... .......... .......... .......... 94% 48,5M 0s + 39200K .......... .......... .......... .......... .......... 94% 36,2M 0s + 39250K .......... .......... .......... .......... .......... 94% 65,7M 0s + 39300K .......... .......... .......... .......... .......... 94% 136M 0s + 39350K .......... .......... .......... .......... .......... 94% 24,8M 0s + 39400K .......... .......... .......... .......... .......... 94% 63,1M 0s + 39450K .......... .......... .......... .......... .......... 94% 79,9M 0s + 39500K .......... .......... .......... .......... .......... 94% 123M 0s + 39550K .......... .......... .......... .......... .......... 95% 6,16M 0s + 39600K .......... .......... .......... .......... .......... 95% 14,5M 0s + 39650K .......... .......... .......... .......... .......... 95% 19,8M 0s + 39700K .......... .......... .......... .......... .......... 95% 103M 0s + 39750K .......... .......... .......... .......... .......... 95% 104M 0s + 39800K .......... .......... .......... .......... .......... 95% 98,2M 0s + 39850K .......... .......... .......... .......... .......... 95% 91,2M 0s + 39900K .......... .......... .......... .......... .......... 95% 4,90M 0s + 39950K .......... .......... .......... .......... .......... 96% 116M 0s + 40000K .......... .......... .......... .......... .......... 96% 9,96M 0s + 40050K .......... .......... .......... .......... .......... 96% 93,2M 0s + 40100K .......... .......... .......... .......... .......... 96% 100M 0s + 40150K .......... .......... .......... .......... .......... 96% 147M 0s + 40200K .......... .......... .......... .......... .......... 96% 114M 0s + 40250K .......... .......... .......... .......... .......... 96% 99,1M 0s + 40300K .......... .......... .......... .......... .......... 96% 92,2M 0s + 40350K .......... .......... .......... .......... .......... 97% 98,0M 0s + 40400K .......... .......... .......... .......... .......... 97% 71,4M 0s + 40450K .......... .......... .......... .......... .......... 97% 96,9M 0s + 40500K .......... .......... .......... .......... .......... 97% 96,5M 0s + 40550K .......... .......... .......... .......... .......... 97% 92,0M 0s + 40600K .......... .......... .......... .......... .......... 97% 88,5M 0s + 40650K .......... .......... .......... .......... .......... 97% 96,6M 0s + 40700K .......... .......... .......... .......... .......... 97% 43,2M 0s + 40750K .......... .......... .......... .......... .......... 97% 81,9M 0s + 40800K .......... .......... .......... .......... .......... 98% 11,4M 0s + 40850K .......... .......... .......... .......... .......... 98% 25,4M 0s + 40900K .......... .......... .......... .......... .......... 98% 79,8M 0s + 40950K .......... .......... .......... .......... .......... 98% 11,8M 0s + 41000K .......... .......... .......... .......... .......... 98% 25,7M 0s + 41050K .......... .......... .......... .......... .......... 98% 57,9M 0s + 41100K .......... .......... .......... .......... .......... 98% 103M 0s + 41150K .......... .......... .......... .......... .......... 98% 41,8M 0s + 41200K .......... .......... .......... .......... .......... 99% 50,4M 0s + 41250K .......... .......... .......... .......... .......... 99% 6,45M 0s + 41300K .......... .......... .......... .......... .......... 99% 43,8M 0s + 41350K .......... .......... .......... .......... .......... 99% 65,6M 0s + 41400K .......... .......... .......... .......... .......... 99% 39,4M 0s + 41450K .......... .......... .......... .......... .......... 99% 48,9M 0s + 41500K .......... .......... .......... .......... .......... 99% 64,9M 0s + 41550K .......... .......... .......... .......... .......... 99% 74,2M 0s + 41600K .......... .......... .......... .......... ...... 100% 69,8M=5,2s + +2014-06-18 13:41:12 (7,77 MB/s) - ‘/home/jwiklund/Documents/.git/annex/tmp/SHA256E-s42645638--4ae41fb29bd26339ea10f53ea2b7cf3132e53d5e8fbfde7b43b912aa52b3d319.tar.gz’ saved [42645638/42645638] + +[2014-06-18 13:41:12 CEST] main(checksum...) +: Downloaded git-annex.. upgrade) +[2014-06-18 13:41:12 CEST] Pusher: Syncing with born +(Recording state in git...) + +error: duplicate parent bd2e43b03fcc307166df1ab23cecb0eafe9ca3a5 ignored +To ssh://jwiklund@born/store/backup/Documents.annex.1/ + cf9f2a9..f8f8217 git-annex -> synced/git-annex + 6be6bb3..bd2e43b annex/direct/master -> synced/master + +git-annex version: 5.20140610-g5ec8bcf +build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV Inotify DBus DesktopNotify XMPP DNS Feeds Quvi TDFA CryptoHash +key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL +remote types: git gcrypt S3 bup directory rsync web webdav tahoe glacier ddar hook external +local repository version: 5 +supported repository version: 5 +upgrade supported from repository versions: 0 1 2 4 +[2014-06-18 13:41:14 CEST] main: Upgrading git-annex +[2014-06-18 13:41:14 CEST] UpgradeWatcher: A new version of git-annex has been installed. + +error: duplicate parent e88b1485767e39ac05de700219d31011b7ac7022 ignored + + +error: duplicate parent 220161f6ad836cfc581a9dd575d76c0d9e814826 ignored + + +Another upgrade + +[2014-06-18 13:38:15 CEST] main: starting assistant version 5.20140606-g48793b6 +[2014-06-18 13:38:16 CEST] TransferScanner: Syncing with born + +Already up-to-date. +(scanning...) [20 +14-06-18 13:38:16 CEST] Watcher: Performing startup scan +Already up-to-date. +(started...) +gpg: WARNING: unsafe permissions on homedir `/tmp/git-annex-gpg.tmp.0' +gpg: Signature made fre 13 jun 2014 17:28:22 CEST using DSA key ID 89C809CB +gpg: /tmp/git-annex-gpg.tmp.0/trustdb.gpg: trustdb created +gpg: Good signature from "git-annex distribution signing key (for Joey Hess) " +gpg: WARNING: This key is not certified with a trusted signature! +gpg: There is no indication that the signature belongs to the owner. +Primary key fingerprint: 4005 5C6A FD2D 526B 2961 E78F 5EE1 DBA7 89C8 09CB +[2014-06-18 13:38:17 CEST] Upgrader: An upgrade of git-annex is available. (version 5.20140613) +To ssh://jwiklund@born/store/backup/Documents.annex.1/ + 9537540..38006f5 git-annex -> synced/git-annex +[2014-06-18 13:38:18 CEST] Committer: Committing changes to git +(Recording state in git...) +[2014-06-18 13:38:18 CEST] Pusher: Syncing with born +Everything up-to-date +--2014-06-18 13:38:22-- https://downloads.kitenet.net/git-annex/linux/current/git-annex-standalone-amd64.tar.gz +Resolving downloads.kitenet.net (downloads.kitenet.net)... 107.170.31.195 +Connecting to downloads.kitenet.net (downloads.kitenet.net)|107.170.31.195|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 42645638 (41M) [application/x-gzip] +Saving to: ‘/home/jwiklund/Documents/.git/annex/tmp/SHA256E-s42645638--4ae41fb29bd26339ea10f53ea2b7cf3132e53d5e8fbfde7b43b912aa52b3d319.tar.gz’ + + 0K .......... .......... .......... .......... .......... 0% 165K 4m12s + 50K .......... .......... .......... .......... .......... 0% 165K 4m12s + 100K .......... .......... .......... .......... .......... 0% 248K 3m43s + 150K .......... .......... .......... .......... .......... 0% 247K 3m29s + 200K .......... .......... .......... .......... .......... 0% 493K 3m4s + 250K .......... .......... .......... .......... .......... 0% 248K 3m1s + 300K .......... .......... .......... .......... .......... 0% 493K 2m47s + 350K .......... .......... .......... .......... .......... 0% 495K 2m36s + 400K .......... .......... .......... .......... .......... 1% 248K 2m37s + 450K .......... .......... .......... .......... .......... 1% 494K 2m30s + 500K .......... .......... .......... .......... .......... 1% 147M 2m16s + 550K .......... .......... .......... .......... .......... 1% 493K 2m11s + 600K .......... .......... .......... .......... .......... 1% 495K 2m7s + 650K .......... .......... .......... .......... .......... 1% 494K 2m4s + 700K .......... .......... .......... .......... .......... 1% 495K 2m1s + 750K .......... .......... .......... .......... .......... 1% 1,30M 1m55s + 800K .......... .......... .......... .......... .......... 2% 497K 1m53s + 850K .......... .......... .......... .......... .......... 2% 779K 1m50s + 900K .......... .......... .......... .......... .......... 2% 1,32M 1m45s + 950K .......... .......... .......... .......... .......... 2% 495K 1m44s + 1000K .......... .......... .......... .......... .......... 2% 48,8M 99s + 1050K .......... .......... .......... .......... .......... 2% 497K 98s + 1100K .......... .......... .......... .......... .......... 2% 8,40M 94s + 1150K .......... .......... .......... .......... .......... 2% 524K 93s + 1200K .......... .......... .......... .......... .......... 3% 786K 91s + 1250K .......... .......... .......... .......... .......... 3% 1,31M 89s + 1300K .......... .......... .......... .......... .......... 3% 8,46M 86s + 1350K .......... .......... .......... .......... .......... 3% 526K 85s + 1400K .......... .......... .......... .......... .......... 3% 8,23M 82s + 1450K .......... .......... .......... .......... .......... 3% 53,9M 80s + 1500K .......... .......... .......... .......... .......... 3% 523K 79s + 1550K .......... .......... .......... .......... .......... 3% 10,7M 77s + 1600K .......... .......... .......... .......... .......... 3% 865K 76s + 1650K .......... .......... .......... .......... .......... 4% 1,12M 75s + 1700K .......... .......... .......... .......... .......... 4% 59,8M 72s + 1750K .......... .......... .......... .......... .......... 4% 875K 72s + 1800K .......... .......... .......... .......... .......... 4% 1,26M 70s + 1850K .......... .......... .......... .......... .......... 4% 5,14M 69s + 1900K .......... .......... .......... .......... .......... 4% 968K 68s + 1950K .......... .......... .......... .......... .......... 4% 1,24M 67s + 2000K .......... .......... .......... .......... .......... 4% 4,91M 65s + 2050K .......... .......... .......... .......... .......... 5% 969K 65s + 2100K .......... .......... .......... .......... .......... 5% 1,13M 64s + 2150K .......... .......... .......... .......... .......... 5% 38,0M 62s + 2200K .......... .......... .......... .......... .......... 5% 9,06M 61s + 2250K .......... .......... .......... .......... .......... 5% 525K 61s + 2300K .......... .......... .......... .......... .......... 5% 72,7M 60s + 2350K .......... .......... .......... .......... .......... 5% 70,4M 59s + 2400K .......... .......... .......... .......... .......... 5% 9,59M 57s + 2450K .......... .......... .......... .......... .......... 6% 528K 58s + 2500K .......... .......... .......... .......... .......... 6% 62,6M 56s + 2550K .......... .......... .......... .......... .......... 6% 10,0M 55s + 2600K .......... .......... .......... .......... .......... 6% 88,8M 54s + 2650K .......... .......... .......... .......... .......... 6% 521K 55s + 2700K .......... .......... .......... .......... .......... 6% 133M 54s + 2750K .......... .......... .......... .......... .......... 6% 11,6M 53s + 2800K .......... .......... .......... .......... .......... 6% 7,35M 52s + 2850K .......... .......... .......... .......... .......... 6% 554K 52s + 2900K .......... .......... .......... .......... .......... 7% 22,5M 51s + 2950K .......... .......... .......... .......... .......... 7% 18,7M 50s + 3000K .......... .......... .......... .......... .......... 7% 8,07M 49s + 3050K .......... .......... .......... .......... .......... 7% 548K 50s + 3100K .......... .......... .......... .......... .......... 7% 56,1M 49s + 3150K .......... .......... .......... .......... .......... 7% 38,2M 48s + 3200K .......... .......... .......... .......... .......... 7% 25,9M 47s + 3250K .......... .......... .......... .......... .......... 7% 8,37M 46s + 3300K .......... .......... .......... .......... .......... 8% 7,57M 46s + 3350K .......... .......... .......... .......... .......... 8% 585K 46s + 3400K .......... .......... .......... .......... .......... 8% 28,9M 45s + 3450K .......... .......... .......... .......... .......... 8% 35,6M 45s + 3500K .......... .......... .......... .......... .......... 8% 8,14M 44s + 3550K .......... .......... .......... .......... .......... 8% 72,0M 43s + 3600K .......... .......... .......... .......... .......... 8% 4,17M 43s + 3650K .......... .......... .......... .......... .......... 8% 619K 43s + 3700K .......... .......... .......... .......... .......... 9% 28,8M 42s + 3750K .......... .......... .......... .......... .......... 9% 8,04M 42s + 3800K .......... .......... .......... .......... .......... 9% 57,3M 41s + 3850K .......... .......... .......... .......... .......... 9% 12,1M 41s + 3900K .......... .......... .......... .......... .......... 9% 6,22M 40s + 3950K .......... .......... .......... .......... .......... 9% 620K 40s + 4000K .......... .......... .......... .......... .......... 9% 19,1M 40s + 4050K .......... .......... .......... .......... .......... 9% 55,1M 39s + 4100K .......... .......... .......... .......... .......... 9% 9,63M 39s + 4150K .......... .......... .......... .......... .......... 10% 12,0M 38s + 4200K .......... .......... .......... .......... .......... 10% 8,14M 38s + 4250K .......... .......... .......... .......... .......... 10% 15,8M 37s + 4300K .......... .......... .......... .......... .......... 10% 625K 38s + 4350K .......... .......... .......... .......... .......... 10% 24,5M 37s + 4400K .......... .......... .......... .......... .......... 10% 8,66M 37s + 4450K .......... .......... .......... .......... .......... 10% 13,0M 36s + 4500K .......... .......... .......... .......... .......... 10% 71,5M 36s + 4550K .......... .......... .......... .......... .......... 11% 8,28M 36s + 4600K .......... .......... .......... .......... .......... 11% 6,10M 35s + 4650K .......... .......... .......... .......... .......... 11% 653K 35s + 4700K .......... .......... .......... .......... .......... 11% 50,6M 35s + 4750K .......... .......... .......... .......... .......... 11% 8,95M 35s + 4800K .......... .......... .......... .......... .......... 11% 11,5M 34s + 4850K .......... .......... .......... .......... .......... 11% 8,84M 34s + 4900K .......... .......... .......... .......... .......... 11% 53,4M 33s + 4950K .......... .......... .......... .......... .......... 12% 7,17M 33s + 5000K .......... .......... .......... .......... .......... 12% 53,7M 33s + 5050K .......... .......... .......... .......... .......... 12% 649K 33s + 5100K .......... .......... .......... .......... .......... 12% 9,07M 33s + 5150K .......... .......... .......... .......... .......... 12% 10,7M 32s + 5200K .......... .......... .......... .......... .......... 12% 9,40M 32s + 5250K .......... .......... .......... .......... .......... 12% 47,5M 32s + 5300K .......... .......... .......... .......... .......... 12% 68,6M 31s + 5350K .......... .......... .......... .......... .......... 12% 7,06M 31s + 5400K .......... .......... .......... .......... .......... 13% 11,4M 31s + 5450K .......... .......... .......... .......... .......... 13% 688K 31s + 5500K .......... .......... .......... .......... .......... 13% 8,70M 31s + 5550K .......... .......... .......... .......... .......... 13% 11,1M 30s + 5600K .......... .......... .......... .......... .......... 13% 8,83M 30s + 5650K .......... .......... .......... .......... .......... 13% 58,9M 30s + 5700K .......... .......... .......... .......... .......... 13% 83,1M 29s + 5750K .......... .......... .......... .......... .......... 13% 7,21M 29s + 5800K .......... .......... .......... .......... .......... 14% 66,1M 29s + 5850K .......... .......... .......... .......... .......... 14% 4,65M 29s + 5900K .......... .......... .......... .......... .......... 14% 757K 29s + 5950K .......... .......... .......... .......... .......... 14% 7,62M 29s + 6000K .......... .......... .......... .......... .......... 14% 10,4M 28s + 6050K .......... .......... .......... .......... .......... 14% 8,59M 28s + 6100K .......... .......... .......... .......... .......... 14% 51,4M 28s + 6150K .......... .......... .......... .......... .......... 14% 74,5M 28s + 6200K .......... .......... .......... .......... .......... 15% 6,84M 27s + 6250K .......... .......... .......... .......... .......... 15% 67,2M 27s + 6300K .......... .......... .......... .......... .......... 15% 5,40M 27s + 6350K .......... .......... .......... .......... .......... 15% 63,4M 27s + 6400K .......... .......... .......... .......... .......... 15% 706K 27s + 6450K .......... .......... .......... .......... .......... 15% 9,08M 27s + 6500K .......... .......... .......... .......... .......... 15% 9,43M 26s + 6550K .......... .......... .......... .......... .......... 15% 70,0M 26s + 6600K .......... .......... .......... .......... .......... 15% 65,4M 26s + 6650K .......... .......... .......... .......... .......... 16% 67,7M 26s + 6700K .......... .......... .......... .......... .......... 16% 7,02M 25s + 6750K .......... .......... .......... .......... .......... 16% 65,8M 25s + 6800K .......... .......... .......... .......... .......... 16% 4,77M 25s + 6850K .......... .......... .......... .......... .......... 16% 64,7M 25s + 6900K .......... .......... .......... .......... .......... 16% 783K 25s + 6950K .......... .......... .......... .......... .......... 16% 4,63M 25s + 7000K .......... .......... .......... .......... .......... 16% 9,00M 25s + 7050K .......... .......... .......... .......... .......... 17% 69,7M 24s + 7100K .......... .......... .......... .......... .......... 17% 64,8M 24s + 7150K .......... .......... .......... .......... .......... 17% 53,1M 24s + 7200K .......... .......... .......... .......... .......... 17% 6,69M 24s + 7250K .......... .......... .......... .......... .......... 17% 70,3M 24s + 7300K .......... .......... .......... .......... .......... 17% 8,28M 23s + 7350K .......... .......... .......... .......... .......... 17% 12,7M 23s + 7400K .......... .......... .......... .......... .......... 17% 765K 23s + 7450K .......... .......... .......... .......... .......... 18% 9,09M 23s + 7500K .......... .......... .......... .......... .......... 18% 4,85M 23s + 7550K .......... .......... .......... .......... .......... 18% 61,3M 23s + 7600K .......... .......... .......... .......... .......... 18% 61,6M 23s + 7650K .......... .......... .......... .......... .......... 18% 74,1M 23s + 7700K .......... .......... .......... .......... .......... 18% 73,6M 22s + 7750K .......... .......... .......... .......... .......... 18% 7,79M 22s + 7800K .......... .......... .......... .......... .......... 18% 49,1M 22s + 7850K .......... .......... .......... .......... .......... 18% 72,2M 22s + 7900K .......... .......... .......... .......... .......... 19% 8,42M 22s + 7950K .......... .......... .......... .......... .......... 19% 732K 22s + 8000K .......... .......... .......... .......... .......... 19% 8,99M 22s + 8050K .......... .......... .......... .......... .......... 19% 50,7M 22s + 8100K .......... .......... .......... .......... .......... 19% 5,19M 21s + 8150K .......... .......... .......... .......... .......... 19% 47,4M 21s + 8200K .......... .......... .......... .......... .......... 19% 48,4M 21s + 8250K .......... .......... .......... .......... .......... 19% 52,5M 21s + 8300K .......... .......... .......... .......... .......... 20% 80,5M 21s + 8350K .......... .......... .......... .......... .......... 20% 8,32M 21s + 8400K .......... .......... .......... .......... .......... 20% 40,0M 21s + 8450K .......... .......... .......... .......... .......... 20% 8,81M 20s + 8500K .......... .......... .......... .......... .......... 20% 75,7M 20s + 8550K .......... .......... .......... .......... .......... 20% 718K 20s + 8600K .......... .......... .......... .......... .......... 20% 46,3M 20s + 8650K .......... .......... .......... .......... .......... 20% 15,7M 20s + 8700K .......... .......... .......... .......... .......... 21% 81,4M 20s + 8750K .......... .......... .......... .......... .......... 21% 4,92M 20s + 8800K .......... .......... .......... .......... .......... 21% 44,6M 20s + 8850K .......... .......... .......... .......... .......... 21% 32,6M 20s + 8900K .......... .......... .......... .......... .......... 21% 94,8M 19s + 8950K .......... .......... .......... .......... .......... 21% 104M 19s + 9000K .......... .......... .......... .......... .......... 21% 8,37M 19s + 9050K .......... .......... .......... .......... .......... 21% 77,8M 19s + 9100K .......... .......... .......... .......... .......... 21% 76,5M 19s + 9150K .......... .......... .......... .......... .......... 22% 88,5M 19s + 9200K .......... .......... .......... .......... .......... 22% 4,91M 19s + 9250K .......... .......... .......... .......... .......... 22% 762K 19s + 9300K .......... .......... .......... .......... .......... 22% 57,2M 19s + 9350K .......... .......... .......... .......... .......... 22% 15,2M 19s + 9400K .......... .......... .......... .......... .......... 22% 4,79M 18s + 9450K .......... .......... .......... .......... .......... 22% 69,4M 18s + 9500K .......... .......... .......... .......... .......... 22% 66,2M 18s + 9550K .......... .......... .......... .......... .......... 23% 29,9M 18s + 9600K .......... .......... .......... .......... .......... 23% 58,8M 18s + 9650K .......... .......... .......... .......... .......... 23% 9,77M 18s + 9700K .......... .......... .......... .......... .......... 23% 45,1M 18s + 9750K .......... .......... .......... .......... .......... 23% 64,3M 18s + 9800K .......... .......... .......... .......... .......... 23% 59,4M 18s + 9850K .......... .......... .......... .......... .......... 23% 10,2M 17s + 9900K .......... .......... .......... .......... .......... 23% 55,9M 17s + 9950K .......... .......... .......... .......... .......... 24% 93,7M 17s + 10000K .......... .......... .......... .......... .......... 24% 730K 17s + 10050K .......... .......... .......... .......... .......... 24% 66,3M 17s + 10100K .......... .......... .......... .......... .......... 24% 13,6M 17s + 10150K .......... .......... .......... .......... .......... 24% 86,6M 17s + 10200K .......... .......... .......... .......... .......... 24% 4,97M 17s + 10250K .......... .......... .......... .......... .......... 24% 33,2M 17s + 10300K .......... .......... .......... .......... .......... 24% 34,1M 17s + 10350K .......... .......... .......... .......... .......... 24% 158M 17s + 10400K .......... .......... .......... .......... .......... 25% 65,6M 16s + 10450K .......... .......... .......... .......... .......... 25% 9,12M 16s + 10500K .......... .......... .......... .......... .......... 25% 101M 16s + 10550K .......... .......... .......... .......... .......... 25% 65,6M 16s + 10600K .......... .......... .......... .......... .......... 25% 44,4M 16s + 10650K .......... .......... .......... .......... .......... 25% 8,78M 16s + 10700K .......... .......... .......... .......... .......... 25% 97,5M 16s + 10750K .......... .......... .......... .......... .......... 25% 7,92M 16s + 10800K .......... .......... .......... .......... .......... 26% 6,88M 16s + 10850K .......... .......... .......... .......... .......... 26% 886K 16s + 10900K .......... .......... .......... .......... .......... 26% 66,7M 16s + 10950K .......... .......... .......... .......... .......... 26% 12,5M 16s + 11000K .......... .......... .......... .......... .......... 26% 5,70M 16s + 11050K .......... .......... .......... .......... .......... 26% 65,8M 15s + 11100K .......... .......... .......... .......... .......... 26% 25,5M 15s + 11150K .......... .......... .......... .......... .......... 26% 35,3M 15s + 11200K .......... .......... .......... .......... .......... 27% 55,0M 15s + 11250K .......... .......... .......... .......... .......... 27% 9,19M 15s + 11300K .......... .......... .......... .......... .......... 27% 58,9M 15s + 11350K .......... .......... .......... .......... .......... 27% 64,1M 15s + 11400K .......... .......... .......... .......... .......... 27% 57,1M 15s + 11450K .......... .......... .......... .......... .......... 27% 9,39M 15s + 11500K .......... .......... .......... .......... .......... 27% 84,9M 15s + 11550K .......... .......... .......... .......... .......... 27% 89,1M 15s + 11600K .......... .......... .......... .......... .......... 27% 8,04M 15s + 11650K .......... .......... .......... .......... .......... 28% 85,4M 14s + 11700K .......... .......... .......... .......... .......... 28% 815K 15s + 11750K .......... .......... .......... .......... .......... 28% 44,9M 14s + 11800K .......... .......... .......... .......... .......... 28% 131M 14s + 11850K .......... .......... .......... .......... .......... 28% 12,7M 14s + 11900K .......... .......... .......... .......... .......... 28% 5,71M 14s + 11950K .......... .......... .......... .......... .......... 28% 19,3M 14s + 12000K .......... .......... .......... .......... .......... 28% 22,0M 14s + 12050K .......... .......... .......... .......... .......... 29% 111M 14s + 12100K .......... .......... .......... .......... .......... 29% 44,5M 14s + 12150K .......... .......... .......... .......... .......... 29% 10,8M 14s + 12200K .......... .......... .......... .......... .......... 29% 169M 14s + 12250K .......... .......... .......... .......... .......... 29% 102M 14s + 12300K .......... .......... .......... .......... .......... 29% 97,9M 14s + 12350K .......... .......... .......... .......... .......... 29% 8,70M 14s + 12400K .......... .......... .......... .......... .......... 29% 47,2M 13s + 12450K .......... .......... .......... .......... .......... 30% 9,37M 13s + 12500K .......... .......... .......... .......... .......... 30% 77,2M 13s + 12550K .......... .......... .......... .......... .......... 30% 44,6M 13s + 12600K .......... .......... .......... .......... .......... 30% 84,0M 13s + 12650K .......... .......... .......... .......... .......... 30% 2,51M 13s + 12700K .......... .......... .......... .......... .......... 30% 1,15M 13s + 12750K .......... .......... .......... .......... .......... 30% 60,1M 13s + 12800K .......... .......... .......... .......... .......... 30% 12,1M 13s + 12850K .......... .......... .......... .......... .......... 30% 5,66M 13s + 12900K .......... .......... .......... .......... .......... 31% 22,1M 13s + 12950K .......... .......... .......... .......... .......... 31% 56,1M 13s + 13000K .......... .......... .......... .......... .......... 31% 27,4M 13s + 13050K .......... .......... .......... .......... .......... 31% 45,7M 13s + 13100K .......... .......... .......... .......... .......... 31% 10,4M 13s + 13150K .......... .......... .......... .......... .......... 31% 69,7M 13s + 13200K .......... .......... .......... .......... .......... 31% 60,2M 13s + 13250K .......... .......... .......... .......... .......... 31% 39,8M 12s + 13300K .......... .......... .......... .......... .......... 32% 11,8M 12s + 13350K .......... .......... .......... .......... .......... 32% 66,0M 12s + 13400K .......... .......... .......... .......... .......... 32% 48,4M 12s + 13450K .......... .......... .......... .......... .......... 32% 9,81M 12s + 13500K .......... .......... .......... .......... .......... 32% 23,9M 12s + 13550K .......... .......... .......... .......... .......... 32% 54,2M 12s + 13600K .......... .......... .......... .......... .......... 32% 54,2M 12s + 13650K .......... .......... .......... .......... .......... 32% 10,8M 12s + 13700K .......... .......... .......... .......... .......... 33% 908K 12s + 13750K .......... .......... .......... .......... .......... 33% 34,0M 12s + 13800K .......... .......... .......... .......... .......... 33% 14,8M 12s + 13850K .......... .......... .......... .......... .......... 33% 5,88M 12s + 13900K .......... .......... .......... .......... .......... 33% 44,5M 12s + 13950K .......... .......... .......... .......... .......... 33% 22,8M 12s + 14000K .......... .......... .......... .......... .......... 33% 22,8M 12s + 14050K .......... .......... .......... .......... .......... 33% 60,0M 12s + 14100K .......... .......... .......... .......... .......... 33% 10,5M 12s + 14150K .......... .......... .......... .......... .......... 34% 66,9M 11s + 14200K .......... .......... .......... .......... .......... 34% 63,9M 11s + 14250K .......... .......... .......... .......... .......... 34% 68,9M 11s + 14300K .......... .......... .......... .......... .......... 34% 11,4M 11s + 14350K .......... .......... .......... .......... .......... 34% 50,6M 11s + 14400K .......... .......... .......... .......... .......... 34% 54,7M 11s + 14450K .......... .......... .......... .......... .......... 34% 74,5M 11s + 14500K .......... .......... .......... .......... .......... 34% 10,4M 11s + 14550K .......... .......... .......... .......... .......... 35% 33,4M 11s + 14600K .......... .......... .......... .......... .......... 35% 62,0M 11s + 14650K .......... .......... .......... .......... .......... 35% 35,2M 11s + 14700K .......... .......... .......... .......... .......... 35% 75,6M 11s + 14750K .......... .......... .......... .......... .......... 35% 11,9M 11s + 14800K .......... .......... .......... .......... .......... 35% 908K 11s + 14850K .......... .......... .......... .......... .......... 35% 37,1M 11s + 14900K .......... .......... .......... .......... .......... 35% 12,6M 11s + 14950K .......... .......... .......... .......... .......... 36% 7,11M 11s + 15000K .......... .......... .......... .......... .......... 36% 13,5M 11s + 15050K .......... .......... .......... .......... .......... 36% 71,6M 11s + 15100K .......... .......... .......... .......... .......... 36% 24,4M 11s + 15150K .......... .......... .......... .......... .......... 36% 69,1M 10s + 15200K .......... .......... .......... .......... .......... 36% 63,0M 10s + 15250K .......... .......... .......... .......... .......... 36% 10,1M 10s + 15300K .......... .......... .......... .......... .......... 36% 37,9M 10s + 15350K .......... .......... .......... .......... .......... 36% 69,2M 10s + 15400K .......... .......... .......... .......... .......... 37% 68,1M 10s + 15450K .......... .......... .......... .......... .......... 37% 10,4M 10s + 15500K .......... .......... .......... .......... .......... 37% 64,3M 10s + 15550K .......... .......... .......... .......... .......... 37% 81,2M 10s + 15600K .......... .......... .......... .......... .......... 37% 71,2M 10s + 15650K .......... .......... .......... .......... .......... 37% 13,3M 10s + 15700K .......... .......... .......... .......... .......... 37% 43,7M 10s + 15750K .......... .......... .......... .......... .......... 37% 28,3M 10s + 15800K .......... .......... .......... .......... .......... 38% 59,9M 10s + 15850K .......... .......... .......... .......... .......... 38% 84,3M 10s + 15900K .......... .......... .......... .......... .......... 38% 12,2M 10s + 15950K .......... .......... .......... .......... .......... 38% 8,59M 10s + 16000K .......... .......... .......... .......... .......... 38% 926K 10s + 16050K .......... .......... .......... .......... .......... 38% 65,0M 10s + 16100K .......... .......... .......... .......... .......... 38% 70,3M 10s + 16150K .......... .......... .......... .......... .......... 38% 7,79M 10s + 16200K .......... .......... .......... .......... .......... 39% 14,6M 10s + 16250K .......... .......... .......... .......... .......... 39% 71,5M 10s + 16300K .......... .......... .......... .......... .......... 39% 21,6M 9s + 16350K .......... .......... .......... .......... .......... 39% 73,9M 9s + 16400K .......... .......... .......... .......... .......... 39% 56,4M 9s + 16450K .......... .......... .......... .......... .......... 39% 9,36M 9s + 16500K .......... .......... .......... .......... .......... 39% 69,8M 9s + 16550K .......... .......... .......... .......... .......... 39% 67,0M 9s + 16600K .......... .......... .......... .......... .......... 39% 58,4M 9s + 16650K .......... .......... .......... .......... .......... 40% 9,56M 9s + 16700K .......... .......... .......... .......... .......... 40% 71,2M 9s + 16750K .......... .......... .......... .......... .......... 40% 74,3M 9s + 16800K .......... .......... .......... .......... .......... 40% 63,4M 9s + 16850K .......... .......... .......... .......... .......... 40% 17,3M 9s + 16900K .......... .......... .......... .......... .......... 40% 60,6M 9s + 16950K .......... .......... .......... .......... .......... 40% 67,8M 9s + 17000K .......... .......... .......... .......... .......... 40% 30,6M 9s + 17050K .......... .......... .......... .......... .......... 41% 44,2M 9s + 17100K .......... .......... .......... .......... .......... 41% 92,3M 9s + 17150K .......... .......... .......... .......... .......... 41% 87,8M 9s + 17200K .......... .......... .......... .......... .......... 41% 14,1M 9s + 17250K .......... .......... .......... .......... .......... 41% 1,92M 9s + 17300K .......... .......... .......... .......... .......... 41% 1,41M 9s + 17350K .......... .......... .......... .......... .......... 41% 72,0M 9s + 17400K .......... .......... .......... .......... .......... 41% 61,9M 9s + 17450K .......... .......... .......... .......... .......... 42% 7,98M 9s + 17500K .......... .......... .......... .......... .......... 42% 18,0M 9s + 17550K .......... .......... .......... .......... .......... 42% 18,5M 9s + 17600K .......... .......... .......... .......... .......... 42% 60,6M 8s + 17650K .......... .......... .......... .......... .......... 42% 74,3M 8s + 17700K .......... .......... .......... .......... .......... 42% 71,4M 8s + 17750K .......... .......... .......... .......... .......... 42% 9,08M 8s + 17800K .......... .......... .......... .......... .......... 42% 67,1M 8s + 17850K .......... .......... .......... .......... .......... 42% 88,4M 8s + 17900K .......... .......... .......... .......... .......... 43% 63,0M 8s + 17950K .......... .......... .......... .......... .......... 43% 90,2M 8s + 18000K .......... .......... .......... .......... .......... 43% 9,69M 8s + 18050K .......... .......... .......... .......... .......... 43% 90,6M 8s + 18100K .......... .......... .......... .......... .......... 43% 88,4M 8s + 18150K .......... .......... .......... .......... .......... 43% 83,2M 8s + 18200K .......... .......... .......... .......... .......... 43% 20,2M 8s + 18250K .......... .......... .......... .......... .......... 43% 55,5M 8s + 18300K .......... .......... .......... .......... .......... 44% 24,3M 8s + 18350K .......... .......... .......... .......... .......... 44% 100M 8s + 18400K .......... .......... .......... .......... .......... 44% 31,8M 8s + 18450K .......... .......... .......... .......... .......... 44% 90,8M 8s + 18500K .......... .......... .......... .......... .......... 44% 16,1M 8s + 18550K .......... .......... .......... .......... .......... 44% 4,01M 8s + 18600K .......... .......... .......... .......... .......... 44% 60,9M 8s + 18650K .......... .......... .......... .......... .......... 44% 3,78M 8s + 18700K .......... .......... .......... .......... .......... 45% 1,39M 8s + 18750K .......... .......... .......... .......... .......... 45% 8,10M 8s + 18800K .......... .......... .......... .......... .......... 45% 60,9M 8s + 18850K .......... .......... .......... .......... .......... 45% 69,6M 8s + 18900K .......... .......... .......... .......... .......... 45% 15,8M 8s + 18950K .......... .......... .......... .......... .......... 45% 22,2M 8s + 19000K .......... .......... .......... .......... .......... 45% 63,8M 8s + 19050K .......... .......... .......... .......... .......... 45% 73,8M 7s + 19100K .......... .......... .......... .......... .......... 45% 75,6M 7s + 19150K .......... .......... .......... .......... .......... 46% 10,4M 7s + 19200K .......... .......... .......... .......... .......... 46% 48,1M 7s + 19250K .......... .......... .......... .......... .......... 46% 34,6M 7s + 19300K .......... .......... .......... .......... .......... 46% 108M 7s + 19350K .......... .......... .......... .......... .......... 46% 121M 7s + 19400K .......... .......... .......... .......... .......... 46% 10,9M 7s + 19450K .......... .......... .......... .......... .......... 46% 42,3M 7s + 19500K .......... .......... .......... .......... .......... 46% 63,6M 7s + 19550K .......... .......... .......... .......... .......... 47% 73,5M 7s + 19600K .......... .......... .......... .......... .......... 47% 25,8M 7s + 19650K .......... .......... .......... .......... .......... 47% 56,0M 7s + 19700K .......... .......... .......... .......... .......... 47% 49,8M 7s + 19750K .......... .......... .......... .......... .......... 47% 52,2M 7s + 19800K .......... .......... .......... .......... .......... 47% 61,9M 7s + 19850K .......... .......... .......... .......... .......... 47% 34,3M 7s + 19900K .......... .......... .......... .......... .......... 47% 50,3M 7s + 19950K .......... .......... .......... .......... .......... 48% 25,2M 7s + 20000K .......... .......... .......... .......... .......... 48% 7,45M 7s + 20050K .......... .......... .......... .......... .......... 48% 8,22M 7s + 20100K .......... .......... .......... .......... .......... 48% 3,67M 7s + 20150K .......... .......... .......... .......... .......... 48% 3,41M 7s + 20200K .......... .......... .......... .......... .......... 48% 1,78M 7s + 20250K .......... .......... .......... .......... .......... 48% 66,9M 7s + 20300K .......... .......... .......... .......... .......... 48% 74,2M 7s + 20350K .......... .......... .......... .......... .......... 48% 12,8M 7s + 20400K .......... .......... .......... .......... .......... 49% 29,9M 7s + 20450K .......... .......... .......... .......... .......... 49% 50,4M 7s + 20500K .......... .......... .......... .......... .......... 49% 63,1M 7s + 20550K .......... .......... .......... .......... .......... 49% 63,9M 7s + 20600K .......... .......... .......... .......... .......... 49% 15,6M 7s + 20650K .......... .......... .......... .......... .......... 49% 21,4M 7s + 20700K .......... .......... .......... .......... .......... 49% 54,6M 6s + 20750K .......... .......... .......... .......... .......... 49% 78,0M 6s + 20800K .......... .......... .......... .......... .......... 50% 93,0M 6s + 20850K .......... .......... .......... .......... .......... 50% 115M 6s + 20900K .......... .......... .......... .......... .......... 50% 13,9M 6s + 20950K .......... .......... .......... .......... .......... 50% 91,8M 6s + 21000K .......... .......... .......... .......... .......... 50% 33,4M 6s + 21050K .......... .......... .......... .......... .......... 50% 116M 6s + 21100K .......... .......... .......... .......... .......... 50% 28,1M 6s + 21150K .......... .......... .......... .......... .......... 50% 113M 6s + 21200K .......... .......... .......... .......... .......... 51% 39,4M 6s + 21250K .......... .......... .......... .......... .......... 51% 108M 6s + 21300K .......... .......... .......... .......... .......... 51% 30,8M 6s + 21350K .......... .......... .......... .......... .......... 51% 64,5M 6s + 21400K .......... .......... .......... .......... .......... 51% 75,7M 6s + 21450K .......... .......... .......... .......... .......... 51% 81,5M 6s + 21500K .......... .......... .......... .......... .......... 51% 16,2M 6s + 21550K .......... .......... .......... .......... .......... 51% 107M 6s + 21600K .......... .......... .......... .......... .......... 51% 4,12M 6s + 21650K .......... .......... .......... .......... .......... 52% 80,1M 6s + 21700K .......... .......... .......... .......... .......... 52% 3,73M 6s + 21750K .......... .......... .......... .......... .......... 52% 5,47M 6s + 21800K .......... .......... .......... .......... .......... 52% 1,50M 6s + 21850K .......... .......... .......... .......... .......... 52% 48,4M 6s + 21900K .......... .......... .......... .......... .......... 52% 65,3M 6s + 21950K .......... .......... .......... .......... .......... 52% 12,9M 6s + 22000K .......... .......... .......... .......... .......... 52% 34,5M 6s + 22050K .......... .......... .......... .......... .......... 53% 79,9M 6s + 22100K .......... .......... .......... .......... .......... 53% 75,7M 6s + 22150K .......... .......... .......... .......... .......... 53% 92,5M 6s + 22200K .......... .......... .......... .......... .......... 53% 14,2M 6s + 22250K .......... .......... .......... .......... .......... 53% 78,3M 6s + 22300K .......... .......... .......... .......... .......... 53% 23,3M 6s + 22350K .......... .......... .......... .......... .......... 53% 51,2M 6s + 22400K .......... .......... .......... .......... .......... 53% 35,1M 6s + 22450K .......... .......... .......... .......... .......... 54% 59,3M 6s + 22500K .......... .......... .......... .......... .......... 54% 84,3M 6s + 22550K .......... .......... .......... .......... .......... 54% 22,4M 6s + 22600K .......... .......... .......... .......... .......... 54% 66,5M 5s + 22650K .......... .......... .......... .......... .......... 54% 37,8M 5s + 22700K .......... .......... .......... .......... .......... 54% 81,6M 5s + 22750K .......... .......... .......... .......... .......... 54% 68,9M 5s + 22800K .......... .......... .......... .......... .......... 54% 29,8M 5s + 22850K .......... .......... .......... .......... .......... 54% 49,7M 5s + 22900K .......... .......... .......... .......... .......... 55% 68,8M 5s + 22950K .......... .......... .......... .......... .......... 55% 44,2M 5s + 23000K .......... .......... .......... .......... .......... 55% 56,1M 5s + 23050K .......... .......... .......... .......... .......... 55% 88,3M 5s + 23100K .......... .......... .......... .......... .......... 55% 87,2M 5s + 23150K .......... .......... .......... .......... .......... 55% 75,9M 5s + 23200K .......... .......... .......... .......... .......... 55% 20,9M 5s + 23250K .......... .......... .......... .......... .......... 55% 65,3M 5s + 23300K .......... .......... .......... .......... .......... 56% 99,4M 5s + 23350K .......... .......... .......... .......... .......... 56% 4,19M 5s + 23400K .......... .......... .......... .......... .......... 56% 6,24M 5s + 23450K .......... .......... .......... .......... .......... 56% 2,81M 5s + 23500K .......... .......... .......... .......... .......... 56% 6,61M 5s + 23550K .......... .......... .......... .......... .......... 56% 2,22M 5s + 23600K .......... .......... .......... .......... .......... 56% 31,8M 5s + 23650K .......... .......... .......... .......... .......... 56% 13,2M 5s + 23700K .......... .......... .......... .......... .......... 57% 27,7M 5s + 23750K .......... .......... .......... .......... .......... 57% 38,7M 5s + 23800K .......... .......... .......... .......... .......... 57% 56,6M 5s + 23850K .......... .......... .......... .......... .......... 57% 71,8M 5s + 23900K .......... .......... .......... .......... .......... 57% 20,8M 5s + 23950K .......... .......... .......... .......... .......... 57% 42,8M 5s + 24000K .......... .......... .......... .......... .......... 57% 60,5M 5s + 24050K .......... .......... .......... .......... .......... 57% 58,8M 5s + 24100K .......... .......... .......... .......... .......... 57% 31,7M 5s + 24150K .......... .......... .......... .......... .......... 58% 56,4M 5s + 24200K .......... .......... .......... .......... .......... 58% 94,3M 5s + 24250K .......... .......... .......... .......... .......... 58% 154M 5s + 24300K .......... .......... .......... .......... .......... 58% 166M 5s + 24350K .......... .......... .......... .......... .......... 58% 21,3M 5s + 24400K .......... .......... .......... .......... .......... 58% 28,9M 5s + 24450K .......... .......... .......... .......... .......... 58% 60,2M 5s + 24500K .......... .......... .......... .......... .......... 58% 99,0M 5s + 24550K .......... .......... .......... .......... .......... 59% 51,9M 5s + 24600K .......... .......... .......... .......... .......... 59% 109M 5s + 24650K .......... .......... .......... .......... .......... 59% 24,6M 5s + 24700K .......... .......... .......... .......... .......... 59% 78,5M 5s + 24750K .......... .......... .......... .......... .......... 59% 150M 5s + 24800K .......... .......... .......... .......... .......... 59% 58,7M 5s + 24850K .......... .......... .......... .......... .......... 59% 60,5M 4s + 24900K .......... .......... .......... .......... .......... 59% 95,2M 4s + 24950K .......... .......... .......... .......... .......... 60% 98,6M 4s + 25000K .......... .......... .......... .......... .......... 60% 88,9M 4s + 25050K .......... .......... .......... .......... .......... 60% 23,0M 4s + 25100K .......... .......... .......... .......... .......... 60% 61,5M 4s + 25150K .......... .......... .......... .......... .......... 60% 105M 4s + 25200K .......... .......... .......... .......... .......... 60% 6,64M 4s + 25250K .......... .......... .......... .......... .......... 60% 7,11M 4s + 25300K .......... .......... .......... .......... .......... 60% 4,75M 4s + 25350K .......... .......... .......... .......... .......... 60% 2,81M 4s + 25400K .......... .......... .......... .......... .......... 61% 50,6M 4s + 25450K .......... .......... .......... .......... .......... 61% 2,10M 4s + 25500K .......... .......... .......... .......... .......... 61% 26,6M 4s + 25550K .......... .......... .......... .......... .......... 61% 13,6M 4s + 25600K .......... .......... .......... .......... .......... 61% 16,6M 4s + 25650K .......... .......... .......... .......... .......... 61% 37,4M 4s + 25700K .......... .......... .......... .......... .......... 61% 69,9M 4s + 25750K .......... .......... .......... .......... .......... 61% 75,8M 4s + 25800K .......... .......... .......... .......... .......... 62% 32,8M 4s + 25850K .......... .......... .......... .......... .......... 62% 92,0M 4s + 25900K .......... .......... .......... .......... .......... 62% 163M 4s + 25950K .......... .......... .......... .......... .......... 62% 30,3M 4s + 26000K .......... .......... .......... .......... .......... 62% 35,2M 4s + 26050K .......... .......... .......... .......... .......... 62% 95,9M 4s + 26100K .......... .......... .......... .......... .......... 62% 55,0M 4s + 26150K .......... .......... .......... .......... .......... 62% 105M 4s + 26200K .......... .......... .......... .......... .......... 63% 142M 4s + 26250K .......... .......... .......... .......... .......... 63% 111M 4s + 26300K .......... .......... .......... .......... .......... 63% 17,8M 4s + 26350K .......... .......... .......... .......... .......... 63% 150M 4s + 26400K .......... .......... .......... .......... .......... 63% 41,1M 4s + 26450K .......... .......... .......... .......... .......... 63% 40,0M 4s + 26500K .......... .......... .......... .......... .......... 63% 90,6M 4s + 26550K .......... .......... .......... .......... .......... 63% 91,6M 4s + 26600K .......... .......... .......... .......... .......... 63% 69,6M 4s + 26650K .......... .......... .......... .......... .......... 64% 24,8M 4s + 26700K .......... .......... .......... .......... .......... 64% 94,8M 4s + 26750K .......... .......... .......... .......... .......... 64% 83,2M 4s + 26800K .......... .......... .......... .......... .......... 64% 42,4M 4s + 26850K .......... .......... .......... .......... .......... 64% 88,3M 4s + 26900K .......... .......... .......... .......... .......... 64% 88,8M 4s + 26950K .......... .......... .......... .......... .......... 64% 91,1M 4s + 27000K .......... .......... .......... .......... .......... 64% 35,7M 4s + 27050K .......... .......... .......... .......... .......... 65% 88,5M 4s + 27100K .......... .......... .......... .......... .......... 65% 83,5M 4s + 27150K .......... .......... .......... .......... .......... 65% 84,8M 4s + 27200K .......... .......... .......... .......... .......... 65% 6,73M 4s + 27250K .......... .......... .......... .......... .......... 65% 9,14M 4s + 27300K .......... .......... .......... .......... .......... 65% 28,7M 4s + 27350K .......... .......... .......... .......... .......... 65% 4,70M 4s + 27400K .......... .......... .......... .......... .......... 65% 2,82M 4s + 27450K .......... .......... .......... .......... .......... 66% 6,37M 4s + 27500K .......... .......... .......... .......... .......... 66% 3,01M 3s + 27550K .......... .......... .......... .......... .......... 66% 21,2M 3s + 27600K .......... .......... .......... .......... .......... 66% 13,7M 3s + 27650K .......... .......... .......... .......... .......... 66% 14,9M 3s + 27700K .......... .......... .......... .......... .......... 66% 55,1M 3s + 27750K .......... .......... .......... .......... .......... 66% 55,6M 3s + 27800K .......... .......... .......... .......... .......... 66% 67,1M 3s + 27850K .......... .......... .......... .......... .......... 66% 88,1M 3s + 27900K .......... .......... .......... .......... .......... 67% 61,5M 3s + 27950K .......... .......... .......... .......... .......... 67% 78,6M 3s + 28000K .......... .......... .......... .......... .......... 67% 28,8M 3s + 28050K .......... .......... .......... .......... .......... 67% 42,3M 3s + 28100K .......... .......... .......... .......... .......... 67% 46,7M 3s + 28150K .......... .......... .......... .......... .......... 67% 97,7M 3s + 28200K .......... .......... .......... .......... .......... 67% 72,4M 3s + 28250K .......... .......... .......... .......... .......... 67% 101M 3s + 28300K .......... .......... .......... .......... .......... 68% 104M 3s + 28350K .......... .......... .......... .......... .......... 68% 121M 3s + 28400K .......... .......... .......... .......... .......... 68% 21,7M 3s + 28450K .......... .......... .......... .......... .......... 68% 92,8M 3s + 28500K .......... .......... .......... .......... .......... 68% 99,8M 3s + 28550K .......... .......... .......... .......... .......... 68% 33,8M 3s + 28600K .......... .......... .......... .......... .......... 68% 114M 3s + 28650K .......... .......... .......... .......... .......... 68% 83,6M 3s + 28700K .......... .......... .......... .......... .......... 69% 142M 3s + 28750K .......... .......... .......... .......... .......... 69% 126M 3s + 28800K .......... .......... .......... .......... .......... 69% 9,03M 3s + 28850K .......... .......... .......... .......... .......... 69% 115M 3s + 28900K .......... .......... .......... .......... .......... 69% 101M 3s + 28950K .......... .......... .......... .......... .......... 69% 83,4M 3s + 29000K .......... .......... .......... .......... .......... 69% 88,0M 3s + 29050K .......... .......... .......... .......... .......... 69% 94,5M 3s + 29100K .......... .......... .......... .......... .......... 69% 122M 3s + 29150K .......... .......... .......... .......... .......... 70% 97,3M 3s + 29200K .......... .......... .......... .......... .......... 70% 91,8M 3s + 29250K .......... .......... .......... .......... .......... 70% 113M 3s + 29300K .......... .......... .......... .......... .......... 70% 35,7M 3s + 29350K .......... .......... .......... .......... .......... 70% 19,6M 3s + 29400K .......... .......... .......... .......... .......... 70% 110M 3s + 29450K .......... .......... .......... .......... .......... 70% 22,9M 3s + 29500K .......... .......... .......... .......... .......... 70% 6,27M 3s + 29550K .......... .......... .......... .......... .......... 71% 5,42M 3s + 29600K .......... .......... .......... .......... .......... 71% 5,40M 3s + 29650K .......... .......... .......... .......... .......... 71% 5,61M 3s + 29700K .......... .......... .......... .......... .......... 71% 3,47M 3s + 29750K .......... .......... .......... .......... .......... 71% 3,94M 3s + 29800K .......... .......... .......... .......... .......... 71% 17,8M 3s + 29850K .......... .......... .......... .......... .......... 71% 50,3M 3s + 29900K .......... .......... .......... .......... .......... 71% 15,4M 3s + 29950K .......... .......... .......... .......... .......... 72% 56,6M 3s + 30000K .......... .......... .......... .......... .......... 72% 39,4M 3s + 30050K .......... .......... .......... .......... .......... 72% 62,8M 3s + 30100K .......... .......... .......... .......... .......... 72% 49,8M 3s + 30150K .......... .......... .......... .......... .......... 72% 75,4M 3s + 30200K .......... .......... .......... .......... .......... 72% 63,8M 3s + 30250K .......... .......... .......... .......... .......... 72% 102M 3s + 30300K .......... .......... .......... .......... .......... 72% 79,7M 3s + 30350K .......... .......... .......... .......... .......... 72% 58,3M 3s + 30400K .......... .......... .......... .......... .......... 73% 36,5M 3s + 30450K .......... .......... .......... .......... .......... 73% 123M 3s + 30500K .......... .......... .......... .......... .......... 73% 21,5M 3s + 30550K .......... .......... .......... .......... .......... 73% 122M 3s + 30600K .......... .......... .......... .......... .......... 73% 121M 2s + 30650K .......... .......... .......... .......... .......... 73% 83,1M 2s + 30700K .......... .......... .......... .......... .......... 73% 122M 2s + 30750K .......... .......... .......... .......... .......... 73% 71,4M 2s + 30800K .......... .......... .......... .......... .......... 74% 30,6M 2s + 30850K .......... .......... .......... .......... .......... 74% 132M 2s + 30900K .......... .......... .......... .......... .......... 74% 89,6M 2s + 30950K .......... .......... .......... .......... .......... 74% 115M 2s + 31000K .......... .......... .......... .......... .......... 74% 117M 2s + 31050K .......... .......... .......... .......... .......... 74% 90,4M 2s + 31100K .......... .......... .......... .......... .......... 74% 9,46M 2s + 31150K .......... .......... .......... .......... .......... 74% 108M 2s + 31200K .......... .......... .......... .......... .......... 75% 51,7M 2s + 31250K .......... .......... .......... .......... .......... 75% 74,9M 2s + 31300K .......... .......... .......... .......... .......... 75% 104M 2s + 31350K .......... .......... .......... .......... .......... 75% 111M 2s + 31400K .......... .......... .......... .......... .......... 75% 102M 2s + 31450K .......... .......... .......... .......... .......... 75% 77,7M 2s + 31500K .......... .......... .......... .......... .......... 75% 104M 2s + 31550K .......... .......... .......... .......... .......... 75% 92,5M 2s + 31600K .......... .......... .......... .......... .......... 75% 94,8M 2s + 31650K .......... .......... .......... .......... .......... 76% 112M 2s + 31700K .......... .......... .......... .......... .......... 76% 23,4M 2s + 31750K .......... .......... .......... .......... .......... 76% 95,5M 2s + 31800K .......... .......... .......... .......... .......... 76% 21,2M 2s + 31850K .......... .......... .......... .......... .......... 76% 7,00M 2s + 31900K .......... .......... .......... .......... .......... 76% 5,33M 2s + 31950K .......... .......... .......... .......... .......... 76% 98,7M 2s + 32000K .......... .......... .......... .......... .......... 76% 5,87M 2s + 32050K .......... .......... .......... .......... .......... 77% 3,46M 2s + 32100K .......... .......... .......... .......... .......... 77% 3,11M 2s + 32150K .......... .......... .......... .......... .......... 77% 8,76M 2s + 32200K .......... .......... .......... .......... .......... 77% 47,3M 2s + 32250K .......... .......... .......... .......... .......... 77% 17,2M 2s + 32300K .......... .......... .......... .......... .......... 77% 13,4M 2s + 32350K .......... .......... .......... .......... .......... 77% 80,2M 2s + 32400K .......... .......... .......... .......... .......... 77% 75,5M 2s + 32450K .......... .......... .......... .......... .......... 78% 96,5M 2s + 32500K .......... .......... .......... .......... .......... 78% 63,6M 2s + 32550K .......... .......... .......... .......... .......... 78% 100M 2s + 32600K .......... .......... .......... .......... .......... 78% 30,2M 2s + 32650K .......... .......... .......... .......... .......... 78% 79,5M 2s + 32700K .......... .......... .......... .......... .......... 78% 91,0M 2s + 32750K .......... .......... .......... .......... .......... 78% 44,3M 2s + 32800K .......... .......... .......... .......... .......... 78% 49,2M 2s + 32850K .......... .......... .......... .......... .......... 78% 86,4M 2s + 32900K .......... .......... .......... .......... .......... 79% 20,8M 2s + 32950K .......... .......... .......... .......... .......... 79% 50,1M 2s + 33000K .......... .......... .......... .......... .......... 79% 86,0M 2s + 33050K .......... .......... .......... .......... .......... 79% 118M 2s + 33100K .......... .......... .......... .......... .......... 79% 121M 2s + 33150K .......... .......... .......... .......... .......... 79% 128M 2s + 33200K .......... .......... .......... .......... .......... 79% 103M 2s + 33250K .......... .......... .......... .......... .......... 79% 121M 2s + 33300K .......... .......... .......... .......... .......... 80% 39,0M 2s + 33350K .......... .......... .......... .......... .......... 80% 114M 2s + 33400K .......... .......... .......... .......... .......... 80% 95,3M 2s + 33450K .......... .......... .......... .......... .......... 80% 86,6M 2s + 33500K .......... .......... .......... .......... .......... 80% 116M 2s + 33550K .......... .......... .......... .......... .......... 80% 11,0M 2s + 33600K .......... .......... .......... .......... .......... 80% 76,4M 2s + 33650K .......... .......... .......... .......... .......... 80% 124M 2s + 33700K .......... .......... .......... .......... .......... 81% 43,7M 2s + 33750K .......... .......... .......... .......... .......... 81% 103M 2s + 33800K .......... .......... .......... .......... .......... 81% 86,7M 2s + 33850K .......... .......... .......... .......... .......... 81% 90,0M 2s + 33900K .......... .......... .......... .......... .......... 81% 47,6M 2s + 33950K .......... .......... .......... .......... .......... 81% 98,9M 2s + 34000K .......... .......... .......... .......... .......... 81% 79,3M 2s + 34050K .......... .......... .......... .......... .......... 81% 93,2M 2s + 34100K .......... .......... .......... .......... .......... 82% 96,5M 2s + 34150K .......... .......... .......... .......... .......... 82% 95,0M 2s + 34200K .......... .......... .......... .......... .......... 82% 52,0M 2s + 34250K .......... .......... .......... .......... .......... 82% 104M 2s + 34300K .......... .......... .......... .......... .......... 82% 93,2M 2s + 34350K .......... .......... .......... .......... .......... 82% 25,0M 1s + 34400K .......... .......... .......... .......... .......... 82% 7,35M 1s + 34450K .......... .......... .......... .......... .......... 82% 5,23M 1s + 34500K .......... .......... .......... .......... .......... 82% 6,79M 1s + 34550K .......... .......... .......... .......... .......... 83% 99,1M 1s + 34600K .......... .......... .......... .......... .......... 83% 3,23M 1s + 34650K .......... .......... .......... .......... .......... 83% 3,34M 1s + 34700K .......... .......... .......... .......... .......... 83% 6,32M 1s + 34750K .......... .......... .......... .......... .......... 83% 18,3M 1s + 34800K .......... .......... .......... .......... .......... 83% 12,6M 1s + 34850K .......... .......... .......... .......... .......... 83% 40,4M 1s + 34900K .......... .......... .......... .......... .......... 83% 68,0M 1s + 34950K .......... .......... .......... .......... .......... 84% 58,3M 1s + 35000K .......... .......... .......... .......... .......... 84% 45,2M 1s + 35050K .......... .......... .......... .......... .......... 84% 63,1M 1s + 35100K .......... .......... .......... .......... .......... 84% 54,5M 1s + 35150K .......... .......... .......... .......... .......... 84% 64,2M 1s + 35200K .......... .......... .......... .......... .......... 84% 74,6M 1s + 35250K .......... .......... .......... .......... .......... 84% 120M 1s + 35300K .......... .......... .......... .......... .......... 84% 95,9M 1s + 35350K .......... .......... .......... .......... .......... 85% 102M 1s + 35400K .......... .......... .......... .......... .......... 85% 117M 1s + 35450K .......... .......... .......... .......... .......... 85% 124M 1s + 35500K .......... .......... .......... .......... .......... 85% 139M 1s + 35550K .......... .......... .......... .......... .......... 85% 18,0M 1s + 35600K .......... .......... .......... .......... .......... 85% 98,5M 1s + 35650K .......... .......... .......... .......... .......... 85% 91,6M 1s + 35700K .......... .......... .......... .......... .......... 85% 120M 1s + 35750K .......... .......... .......... .......... .......... 85% 120M 1s + 35800K .......... .......... .......... .......... .......... 86% 107M 1s + 35850K .......... .......... .......... .......... .......... 86% 118M 1s + 35900K .......... .......... .......... .......... .......... 86% 83,0M 1s + 35950K .......... .......... .......... .......... .......... 86% 94,1M 1s + 36000K .......... .......... .......... .......... .......... 86% 69,9M 1s + 36050K .......... .......... .......... .......... .......... 86% 81,4M 1s + 36100K .......... .......... .......... .......... .......... 86% 117M 1s + 36150K .......... .......... .......... .......... .......... 86% 89,9M 1s + 36200K .......... .......... .......... .......... .......... 87% 83,4M 1s + 36250K .......... .......... .......... .......... .......... 87% 14,0M 1s + 36300K .......... .......... .......... .......... .......... 87% 84,0M 1s + 36350K .......... .......... .......... .......... .......... 87% 27,5M 1s + 36400K .......... .......... .......... .......... .......... 87% 94,0M 1s + 36450K .......... .......... .......... .......... .......... 87% 91,9M 1s + 36500K .......... .......... .......... .......... .......... 87% 47,3M 1s + 36550K .......... .......... .......... .......... .......... 87% 98,3M 1s + 36600K .......... .......... .......... .......... .......... 88% 88,5M 1s + 36650K .......... .......... .......... .......... .......... 88% 102M 1s + 36700K .......... .......... .......... .......... .......... 88% 97,9M 1s + 36750K .......... .......... .......... .......... .......... 88% 127M 1s + 36800K .......... .......... .......... .......... .......... 88% 57,2M 1s + 36850K .......... .......... .......... .......... .......... 88% 95,7M 1s + 36900K .......... .......... .......... .......... .......... 88% 88,0M 1s + 36950K .......... .......... .......... .......... .......... 88% 84,0M 1s + 37000K .......... .......... .......... .......... .......... 88% 38,4M 1s + 37050K .......... .......... .......... .......... .......... 89% 96,2M 1s + 37100K .......... .......... .......... .......... .......... 89% 10,9M 1s + 37150K .......... .......... .......... .......... .......... 89% 19,7M 1s + 37200K .......... .......... .......... .......... .......... 89% 5,09M 1s + 37250K .......... .......... .......... .......... .......... 89% 7,41M 1s + 37300K .......... .......... .......... .......... .......... 89% 3,85M 1s + 37350K .......... .......... .......... .......... .......... 89% 4,88M 1s + 37400K .......... .......... .......... .......... .......... 89% 133M 1s + 37450K .......... .......... .......... .......... .......... 90% 3,40M 1s + 37500K .......... .......... .......... .......... .......... 90% 17,3M 1s + 37550K .......... .......... .......... .......... .......... 90% 11,2M 1s + 37600K .......... .......... .......... .......... .......... 90% 123M 1s + 37650K .......... .......... .......... .......... .......... 90% 92,4M 1s + 37700K .......... .......... .......... .......... .......... 90% 68,4M 1s + 37750K .......... .......... .......... .......... .......... 90% 62,4M 1s + 37800K .......... .......... .......... .......... .......... 90% 59,1M 1s + 37850K .......... .......... .......... .......... .......... 91% 65,5M 1s + 37900K .......... .......... .......... .......... .......... 91% 55,8M 1s + 37950K .......... .......... .......... .......... .......... 91% 66,4M 1s + 38000K .......... .......... .......... .......... .......... 91% 56,0M 1s + 38050K .......... .......... .......... .......... .......... 91% 61,3M 1s + 38100K .......... .......... .......... .......... .......... 91% 60,9M 1s + 38150K .......... .......... .......... .......... .......... 91% 65,8M 1s + 38200K .......... .......... .......... .......... .......... 91% 57,1M 1s + 38250K .......... .......... .......... .......... .......... 91% 67,8M 1s + 38300K .......... .......... .......... .......... .......... 92% 74,7M 1s + 38350K .......... .......... .......... .......... .......... 92% 26,4M 1s + 38400K .......... .......... .......... .......... .......... 92% 70,8M 1s + 38450K .......... .......... .......... .......... .......... 92% 177M 1s + 38500K .......... .......... .......... .......... .......... 92% 103M 1s + 38550K .......... .......... .......... .......... .......... 92% 96,5M 1s + 38600K .......... .......... .......... .......... .......... 92% 92,9M 1s + 38650K .......... .......... .......... .......... .......... 92% 179M 1s + 38700K .......... .......... .......... .......... .......... 93% 64,0M 1s + 38750K .......... .......... .......... .......... .......... 93% 95,7M 1s + 38800K .......... .......... .......... .......... .......... 93% 69,1M 1s + 38850K .......... .......... .......... .......... .......... 93% 92,3M 1s + 38900K .......... .......... .......... .......... .......... 93% 97,2M 1s + 38950K .......... .......... .......... .......... .......... 93% 80,6M 0s + 39000K .......... .......... .......... .......... .......... 93% 89,0M 0s + 39050K .......... .......... .......... .......... .......... 93% 118M 0s + 39100K .......... .......... .......... .......... .......... 94% 21,5M 0s + 39150K .......... .......... .......... .......... .......... 94% 98,3M 0s + 39200K .......... .......... .......... .......... .......... 94% 25,7M 0s + 39250K .......... .......... .......... .......... .......... 94% 111M 0s + 39300K .......... .......... .......... .......... .......... 94% 64,2M 0s + 39350K .......... .......... .......... .......... .......... 94% 75,8M 0s + 39400K .......... .......... .......... .......... .......... 94% 64,2M 0s + 39450K .......... .......... .......... .......... .......... 94% 72,3M 0s + 39500K .......... .......... .......... .......... .......... 94% 72,0M 0s + 39550K .......... .......... .......... .......... .......... 95% 69,6M 0s + 39600K .......... .......... .......... .......... .......... 95% 75,7M 0s + 39650K .......... .......... .......... .......... .......... 95% 72,5M 0s + 39700K .......... .......... .......... .......... .......... 95% 74,1M 0s + 39750K .......... .......... .......... .......... .......... 95% 69,4M 0s + 39800K .......... .......... .......... .......... .......... 95% 61,5M 0s + 39850K .......... .......... .......... .......... .......... 95% 70,3M 0s + 39900K .......... .......... .......... .......... .......... 95% 76,4M 0s + 39950K .......... .......... .......... .......... .......... 96% 93,7M 0s + 40000K .......... .......... .......... .......... .......... 96% 73,8M 0s + 40050K .......... .......... .......... .......... .......... 96% 11,3M 0s + 40100K .......... .......... .......... .......... .......... 96% 5,42M 0s + 40150K .......... .......... .......... .......... .......... 96% 6,38M 0s + 40200K .......... .......... .......... .......... .......... 96% 37,9M 0s + 40250K .......... .......... .......... .......... .......... 96% 4,09M 0s + 40300K .......... .......... .......... .......... .......... 96% 4,75M 0s + 40350K .......... .......... .......... .......... .......... 97% 3,60M 0s + 40400K .......... .......... .......... .......... .......... 97% 16,7M 0s + 40450K .......... .......... .......... .......... .......... 97% 78,3M 0s + 40500K .......... .......... .......... .......... .......... 97% 10,4M 0s + 40550K .......... .......... .......... .......... .......... 97% 50,6M 0s + 40600K .......... .......... .......... .......... .......... 97% 96,0M 0s + 40650K .......... .......... .......... .......... .......... 97% 101M 0s + 40700K .......... .......... .......... .......... .......... 97% 114M 0s + 40750K .......... .......... .......... .......... .......... 97% 125M 0s + 40800K .......... .......... .......... .......... .......... 98% 81,4M 0s + 40850K .......... .......... .......... .......... .......... 98% 107M 0s + 40900K .......... .......... .......... .......... .......... 98% 107M 0s + 40950K .......... .......... .......... .......... .......... 98% 75,1M 0s + 41000K .......... .......... .......... .......... .......... 98% 108M 0s + 41050K .......... .......... .......... .......... .......... 98% 62,9M 0s + 41100K .......... .......... .......... .......... .......... 98% 51,6M 0s + 41150K .......... .......... .......... .......... .......... 98% 73,4M 0s + 41200K .......... .......... .......... .......... .......... 99% 47,4M 0s + 41250K .......... .......... .......... .......... .......... 99% 87,9M 0s + 41300K .......... .......... .......... .......... .......... 99% 18,0M 0s + 41350K .......... .......... .......... .......... .......... 99% 78,5M 0s + 41400K .......... .......... .......... .......... .......... 99% 78,3M 0s + 41450K .......... .......... .......... .......... .......... 99% 107M 0s + 41500K .......... .......... .......... .......... .......... 99% 73,6M 0s + 41550K .......... .......... .......... .......... .......... 99% 50,9M 0s + 41600K .......... .......... .......... .......... ...... 100% 122M=7,4s + +2014-06-18 13:38:29 (5,52 MB/s) - ‘/home/jwiklund/Documents/.git/annex/tmp/SHA256E-s42645638--4ae41fb29bd26339ea10f53ea2b7cf3132e53d5e8fbfde7b43b912aa52b3d319.tar.gz’ saved [42645638/42645638] + +[2014-06-18 13:38:29 CEST] main: Downloaded git-annex.. upgrade) +(checksum...) +[2014-06-18 13:38:29 CEST] Pusher: Syncing with born +(Recording state in git...) +To ssh://jwiklund@born/store/backup/Documents.annex.1/ + 38006f5..fdae080 git-annex -> synced/git-annex +git-annex version: 5.20140610-g5ec8bcf +build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV Inotify DBus DesktopNotify XMPP DNS Feeds Quvi TDFA CryptoHash +key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL +remote types: git gcrypt S3 bup directory rsync web webdav tahoe glacier ddar hook external +local repository version: 5 +supported repository version: 5 +upgrade supported from repository versions: 0 1 2 4 +[2014-06-18 13:38:31 CEST] main: Upgrading git-annex +[2014-06-18 13:38:31 CEST] UpgradeWatcher: A new version of git-annex has been installed. + +Already up-to-date. + +Already up-to-date. + +Already up-to-date. + +Already up-to-date. +channel 4: bad ext data +channel 4: bad ext data +channel 4: bad ext data +channel 4: bad ext data +channel 4: bad ext data +channel 4: bad ext data +channel 4: bad ext data +channel 4: bad ext data +channel 4: bad ext data +channel 4: bad ext data +channel 4: bad ext data +channel 4: bad ext data +channel 4: bad ext data + +# End of transcript or log. +"""]] diff --git a/doc/bugs/git-annex_auto_upgrade_is_redundant.mdwn b/doc/bugs/git-annex_auto_upgrade_is_redundant.mdwn --- a/doc/bugs/git-annex_auto_upgrade_is_redundant.mdwn +++ b/doc/bugs/git-annex_auto_upgrade_is_redundant.mdwn @@ -28,3 +28,7 @@ [[!meta title="upgrade loop when info file contains newer version than distributed version of git-annex"]] [[!tag confirmed]] + +> [[fixed|done]]; the release process now uses versions from build-version +> files that are created by the autobuilders, so should always be accurate. +> --[[Joey]] diff --git a/doc/bugs/git_mv_before_commit_breaks_symlinks.mdwn b/doc/bugs/git_mv_before_commit_breaks_symlinks.mdwn new file mode 100644 --- /dev/null +++ b/doc/bugs/git_mv_before_commit_breaks_symlinks.mdwn @@ -0,0 +1,28 @@ +### Please describe the problem. + +When I `git mv` a file that I just `git annex add`-ed without having `git commit`-ed it first, then the symlink will break. + +### What steps will reproduce the problem? + + $ mkdir foo + $ echo hello > foo/bar + $ git annex add foo/bar + $ git mv foo/bar . + +### What version of git-annex are you using? On what operating system? + +5.20140529 on Debian testing + +> This is fundamentally something git-annex cannot deal with, +> because there is no way to hook into git to fix the symlink when +> `git mv` moves the file. +> +> Instead, git-annex has several "good enough" fixes for the problem: +> +> * As soon as you `git commit`, the pre-commit hook will run `git annex +> fix` and this will fix the symlink before it gets committed. +> * You can run `git annex fix` yourself after `git mv`. +> * Even `git annex add $file` will fix the symlink if the file is already +> annexed. +> +> So, [[done]] --[[Joey]] diff --git a/doc/bugs/repo_creation_fails_on_android_4.4.3.mdwn b/doc/bugs/repo_creation_fails_on_android_4.4.3.mdwn new file mode 100644 --- /dev/null +++ b/doc/bugs/repo_creation_fails_on_android_4.4.3.mdwn @@ -0,0 +1,30 @@ +Hello everyone, +Creating a new repository through the web-app fails on Android 4.4.3, git annex version 5.20140612-g1bebb0d. + +Steps to reproduce the problem: + +1. Install git annex for android 4.4.3 + +2. Launch git annex. + +3. The terminal opens up reporting some (non-fatal?) errors. (I notice that I can't do anything in the terminal, is it supposed to reply to git annex commands? typing in "git annex version" does nothing). + +4. The web-app is launched. + +5. Click on make repository. + +6. Error message. + +I've made a few screenshots to illustrate: + +[terminal screenshot](https://drive.google.com/file/d/0B1qM91oKErVDSEJwbnhiaFJhQVU/edit?usp=sharing) + +This is the webapp error when creating a new repo: + +[first](https://drive.google.com/file/d/0B1qM91oKErVDVHVuLVpacmJaOEU/edit?usp=sharing) + +[second](https://drive.google.com/file/d/0B1qM91oKErVDX3R3cFhyb2VjcHc/edit?usp=sharing) + +Being on android I can't find any ".git/annex/daemon.log to" to report. I tried to look in the repo folder but there was no .git in it (maybe hidden?) + +> dup; [[done]] --[[Joey]] diff --git a/doc/bugs/runs_of_of_memory_adding_2_million_files.mdwn b/doc/bugs/runs_of_of_memory_adding_2_million_files.mdwn new file mode 100644 --- /dev/null +++ b/doc/bugs/runs_of_of_memory_adding_2_million_files.mdwn @@ -0,0 +1,17 @@ +Make 2 million files and `git annex add` (indirect mode), fails at the end: + +
+add 999996 ok
+add 999997 ok
+(Recording state in git...)
+[2014-06-21 11:49:28 JEST] feed: xargs ["-0","git","--git-dir=/home/joey/tmp/r/.git","--work-tree=/home/joey/tmp/r","add","--"]
+add 999998 ok
+add 999999 ok
+[2014-06-21 11:49:49 JEST] read: git ["--git-dir=/home/joey/tmp/r/.git","--work-tree=/home/joey/tmp/r","diff","--name-only","--diff-filter=T","-z","--","."]
+(Recording state in git...)
+[2014-06-21 11:52:24 JEST] feed: xargs ["-0","git","--git-dir=/home/joey/tmp/r/.git","--work-tree=/home/joey/tmp/r","add","--"]
+Stack space overflow: current size 8388608 bytes.
+Use `+RTS -Ksize -RTS' to increase it.
+
+ +> [[fixed|done]] --[[Joey]] diff --git a/doc/bugs/weird_unicode_bug_on_windows.mdwn b/doc/bugs/weird_unicode_bug_on_windows.mdwn new file mode 100644 --- /dev/null +++ b/doc/bugs/weird_unicode_bug_on_windows.mdwn @@ -0,0 +1,17 @@ +### Please describe the problem. + +My repo contains more than 1000 files, many are unicode filenames. Now that [this bug](http://git-annex.branchable.com/bugs/fails_to_get_content_from_bare_repo_on_windows/) is resolved, almost all files are fetched, except one file named '移动硬盘 1T Buffalo USB3.0 白色.rtf'. + +### What steps will reproduce the problem? + +I reproduced this problem by creating a repo containing only this file with no content. If anyone wants to reproduce this, just create an empty file by copy and paste the above filename in the quote. + +I created the repo on mac, synced with a usb drive, then on windows machine try to sync it back. + +* When run git-annex webapp in the newly created windows repo, after the usb drive is added as a remote, an error popups up: http://imgur.com/5ZfIeGQ although the remote is added successfully (http://imgur.com/04O8kaC) +* On the command line, git annex sync runs successfully, but git annex get . failed: http://imgur.com/bIVrbe2 +* The file is there (http://imgur.com/URGwWWt) with correct filename, just that the content is not there. + +### What version of git-annex are you using? On what operating system? + +Latest release of git-annex on both mac and windows. The initial repo on mac is indirect repo, the one on usb drive is a bare repo, the one on windows is direct repo. diff --git a/doc/coding_style/comment_1_70521cf79ad06832b1d73fc2c20c68ec._comment b/doc/coding_style/comment_1_70521cf79ad06832b1d73fc2c20c68ec._comment new file mode 100644 --- /dev/null +++ b/doc/coding_style/comment_1_70521cf79ad06832b1d73fc2c20c68ec._comment @@ -0,0 +1,20 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawnq-RfkVpFN15SWvQ2lpSGAi0XpNQuLxKM" + nickname="Yuval" + subject="What about safe?" + date="2014-07-06T10:45:59Z" + content=""" +https://hackage.haskell.org/package/safe + +> A library wrapping Prelude/Data.List functions that can throw exceptions, such as head and !!. Each unsafe function has up to four variants, e.g. with tail: +> +> tail :: [a] -> [a], raises an error on tail []. + +> tailMay :: [a] -> Maybe [a], turns errors into Nothing. + +> tailDef :: [a] -> [a] -> [a], takes a default to return on errors. + +> tailNote :: String -> [a] -> [a], takes an extra argument which supplements the error message. + +> tailSafe :: [a] -> [a], returns some sensible default if possible, [] in the case of tail. +"""]] diff --git a/doc/design/assistant/polls/prioritizing_special_remotes.mdwn b/doc/design/assistant/polls/prioritizing_special_remotes.mdwn --- a/doc/design/assistant/polls/prioritizing_special_remotes.mdwn +++ b/doc/design/assistant/polls/prioritizing_special_remotes.mdwn @@ -6,7 +6,7 @@ Help me prioritize my work: What special remote would you most like to use with the git-annex assistant? -[[!poll open=yes 16 "Amazon S3 (done)" 12 "Amazon Glacier (done)" 9 "Box.com (done)" 72 "My phone (or MP3 player)" 25 "Tahoe-LAFS" 11 "OpenStack SWIFT" 34 "Google Drive"]] +[[!poll open=yes 16 "Amazon S3 (done)" 12 "Amazon Glacier (done)" 10 "Box.com (done)" 73 "My phone (or MP3 player)" 25 "Tahoe-LAFS" 13 "OpenStack SWIFT" 34 "Google Drive"]] This poll is ordered with the options I consider easiest to build listed first. Mostly because git-annex already supports them and they diff --git a/doc/devblog/day_185__service.mdwn b/doc/devblog/day_185__service.mdwn new file mode 100644 --- /dev/null +++ b/doc/devblog/day_185__service.mdwn @@ -0,0 +1,6 @@ +More work on [[todo/windows_git-annex_service]], but am stuck with a +permissions problem. + +Fixed a bug that prevented two assistants from syncing when there was only +a uni-directional link between them. Only affected direct mode, and +was introduced back when I added the direct mode guard. diff --git a/doc/devblog/day_186__cracked_it.mdwn b/doc/devblog/day_186__cracked_it.mdwn new file mode 100644 --- /dev/null +++ b/doc/devblog/day_186__cracked_it.mdwn @@ -0,0 +1,8 @@ +After despairing of ever solving this yesterday (and for the past 6 months +really), I've got the webapp running on Windows with no visible DOS box. +Also have the assistant starting up in the background on login. + +It turns out a service was not the way to do. There is a way to write a VB +Script that runs a "DOS" command in a hidden window, and this is what I +used. Amazing how hard it was to work this out, probably partly because I +don't have the Windows vocabulary to know what to look for. diff --git a/doc/devblog/day_187__release_prep.mdwn b/doc/devblog/day_187__release_prep.mdwn new file mode 100644 --- /dev/null +++ b/doc/devblog/day_187__release_prep.mdwn @@ -0,0 +1,10 @@ +Last night, got logging to daemon.log working on Windows. Aside from XMPP +not working (but it's near to being deprecated anyway), and some possible +issues with unicode characters in filenames, the Windows port now seems in +pretty good shape for a beta release. + +Today, mostly worked on fixing the release process so the metadata +accurarely reflects the version from the autobuilder that is included in +the release. Turns out there was version skew in the last release (now +manually corrected). This should avoid that happening again, and also +automates more of my release process. diff --git a/doc/devblog/day_188__back_sans_laptop.mdwn b/doc/devblog/day_188__back_sans_laptop.mdwn new file mode 100644 --- /dev/null +++ b/doc/devblog/day_188__back_sans_laptop.mdwn @@ -0,0 +1,5 @@ +I am back from the beach, but my dev laptop is dead. A replacement is being +shipped, and I have spent today getting my old netbook into a usable state +so I can perhaps do some work using it in the meantime. + +(Backlog is 95 messages.) diff --git a/doc/devblog/day_189__finally_working_again.mdwn b/doc/devblog/day_189__finally_working_again.mdwn new file mode 100644 --- /dev/null +++ b/doc/devblog/day_189__finally_working_again.mdwn @@ -0,0 +1,18 @@ +Finally back to work with a new laptop! + +Did one fairly major feature today: When using git-annex to pull down +podcasts, metadata from the feed is copied into git-annex's metadata store, +if annex.genmetadata is set. Should be great for views etc! + +Worked through a lot of the backlog, which is down to 47 messages now. + +Only other bug fix of note is a fix on Android. A recent change to git made +it try to chmod files, which tends to fail on the horrible /sdcard +filesystem. Patched git to avoid that. + +For some reason the autobuilder box rebooted while I was away, and +somehow the docker containers didn't come back up -- so they got +automatically rebuilt. But I have to manually finish up building the +android and armel ones. Will be babysitting that build this evening. + +Today's work was sponsored by Ævar Arnfjörð Bjarmason. diff --git a/doc/devblog/day_190__fun_fixes.mdwn b/doc/devblog/day_190__fun_fixes.mdwn new file mode 100644 --- /dev/null +++ b/doc/devblog/day_190__fun_fixes.mdwn @@ -0,0 +1,13 @@ +Spent the morning improving behavior when `commit.gpgsign` is set. +Now git-annex will let gpg sign commits that are made when eg, manually +running `git annex sync`, but not commits implicitly made to the git-annex +branch. And any commits made by the assistant are not gpg signed. This was +slightly tricky, since lots of different places in git-annex ran `git +commit`, `git merge` and similar. + +Then got back to a test I left running over vacation, that added millions +of files to a git annex repo. This was able to reproduce a problem where +`git annex add` blew the stack and crashed at the end. There turned out to +be two different memory issues, one was in git-annex and the other is in +Haskell's core `getDirectoryContents`. Was able to entirely fix it, +eventually. diff --git a/doc/devblog/day_191__semidistracted.mdwn b/doc/devblog/day_191__semidistracted.mdwn new file mode 100644 --- /dev/null +++ b/doc/devblog/day_191__semidistracted.mdwn @@ -0,0 +1,7 @@ +Got a bit distracted improving Haskell's directory listing code. + +Only real git-annex work today was fixing [[bugs/Assistant_merge_loop]], +which was caused by changes in the last release (that made direct mode +merging crash/interrupt-safe). This is a kind of ugly bug, that can result +in the assistant making lots of empty commits in direct mode repositories. +So, I plan to make a new release on Monday. diff --git a/doc/forum/Annex_slow_on_Windows__47__direct_mode.mdwn b/doc/forum/Annex_slow_on_Windows__47__direct_mode.mdwn new file mode 100644 --- /dev/null +++ b/doc/forum/Annex_slow_on_Windows__47__direct_mode.mdwn @@ -0,0 +1,11 @@ +I've been using annex for some weeks now and while I more and more love how it behaves on my Linux machines, I just can't get it working on Windows... + +The setup consists of two Ubuntu machines (one being an always-on server) and a Windows laptop I keep for the occasional moment of gaming. My wife's Windows machine is a candidate to join the annex setup, as well as some other computers I still use every now and then. + +The first thing I started annexing was my pictures folder. It consists of about 40k files and occupies about 350GB. The Ubuntu server is running a hidden service as a substitute for a DynDNS with ssh basically the only thing going out/in. First, I couldn't get annex to properly sync its data via TOR, but when I instead set up a directory special remote on the server (with the annex repository there being "bare", i.e. not containing any actual data) I got them to sync as they should. + +Not the Windows machine though. It's just too slow. It seems that on every sync, every add, every anything it scans... well, everything. I added some files and after an hour I checked the resource monitor which files were being accessed and it seemed to be every last one of the files present in the pictures folder. I'm not sure what's going on there, but it's really getting to the point of being a dealbreaker... I think it's something with annex only supporting direct mode repositories on Windows and all files just lying around (as that's really the only large difference between those setups), although I'm of course not entirely sure. + +I'd really like to run annex in indirect mode on Windows. I can't really find any information on that (except those few "official" pages that just state that annex is running in direct mode on Windows). I know that creating symlinks needs elevated priviledges on Windows, but accepting a prompt seems to be much more realistic than waiting hours for a sync. + +So... Is there any way to get indirect running on Windows? And if there isn't, is there any other way to speed up direct mode / Windows performance? diff --git a/doc/forum/Comparison_with_other_big_files_solutions.mdwn b/doc/forum/Comparison_with_other_big_files_solutions.mdwn new file mode 100644 --- /dev/null +++ b/doc/forum/Comparison_with_other_big_files_solutions.mdwn @@ -0,0 +1,11 @@ +# Comparison + +Based on my understanding of the http://git-annex.branchable.com/not/ page and of some research, +I have made a draft of an [Online excel document][1] that compares different git file solutions. + +Feel free to edit the document and help the community to understand the different solutions out there. + +[1]: https://onedrive.live.com/redir?resid=C66C90783BD2C185!1200&authkey=!ACF-Ol_mG3DwQ2k&ithint=file%2c.xlsx + +Thank you very much, +Alex diff --git a/doc/forum/How_to_make_a_server_store_the_files.mdwn b/doc/forum/How_to_make_a_server_store_the_files.mdwn new file mode 100644 --- /dev/null +++ b/doc/forum/How_to_make_a_server_store_the_files.mdwn @@ -0,0 +1,1 @@ +How can I make one of my servers keep a copy of the files on the server, so I can easily SFTP in and download the files. I don't want to see the .git folder, I want to see the files synced there. diff --git a/doc/forum/MegaAnnex_not_working..mdwn b/doc/forum/MegaAnnex_not_working..mdwn new file mode 100644 --- /dev/null +++ b/doc/forum/MegaAnnex_not_working..mdwn @@ -0,0 +1,32 @@ +When copying to a megaannex remote, it hangs after a while, and I get this: + + copy Boomarks/Android (gpg) Traceback (most recent call last): + File "/usr/local/bin//git-annex-remote-mega", line 511, in + common.startRemote() + File "/home/zack/megaannex/lib/CommonFunctions.py", line 557, in startRemote + sys.modules["__main__"].checkpresent(line) + File "/usr/local/bin//git-annex-remote-mega", line 483, in checkpresent + folder = setFolder(conf["folder"], common.ask("DIRHASH " + line[1])) + File "/usr/local/bin//git-annex-remote-mega", line 401, in setFolder + folder = createFolder(conf["folder"], 2) + File "/usr/local/bin//git-annex-remote-mega", line 378, in createFolder + res = m.create_folder(subject, folder) + File "/usr/lib/python2.7/site-packages/mega/mega.py", line 617, in create_folder + 'i': self.request_id}) + File "/usr/lib/python2.7/site-packages/mega/mega.py", line 110, in _api_request + timeout=self.timeout) + File "/usr/lib/python2.7/site-packages/requests/api.py", line 88, in post + return request('post', url, data=data, **kwargs) + File "/usr/lib/python2.7/site-packages/requests/api.py", line 44, in request + return session.request(method=method, url=url, **kwargs) + File "/usr/lib/python2.7/site-packages/requests/sessions.py", line 354, in request + resp = self.send(prep, **send_kwargs) + File "/usr/lib/python2.7/site-packages/requests/sessions.py", line 460, in send + r = adapter.send(request, **kwargs) + File "/usr/lib/python2.7/site-packages/requests/adapters.py", line 250, in send + raise SSLError(e) + requests.exceptions.SSLError: The read operation timed out + (external special remote protocol error, unexpectedly received "" (unable to parse command)) failed + + +Any help would be appreciated, thanks! diff --git a/doc/forum/Recover_files__44___annex_stuck.mdwn b/doc/forum/Recover_files__44___annex_stuck.mdwn new file mode 100644 --- /dev/null +++ b/doc/forum/Recover_files__44___annex_stuck.mdwn @@ -0,0 +1,28 @@ +I have a directory with 6TB of data in it. I tried to use git annex to back it up to three 3TB drives, I didn't want to use RAID as it sucks, and I didn't want to use tar as I wanted my files easily available. + +I added my remotes successfully, then I ran ``git annex add .`` + +That mostly worked, although it understandably took ages, although it missed several GB of files here and there. + +Next I tried to do ``git commit -a -m added``, hoping that this would copy all of my files to the remotes. It didn't it just died with the error + + fatal: No HEAD commit to compare with (yet) + fatal: No HEAD commit to compare with (yet) + Stack space overflow: current size 8388608 bytes. + Use `+RTS -Ksize -RTS' to increase it. + +So I freaked out and decided to undo the mess and just go with tar instead, since at this point every git command takes multiple minutes and fails with the same error as above. + +I tried to run ``git anne unannex .``, but I got this error: + +`` +unannex GWAS/by-download-number/27081.log.gz fatal: No HEAD commit to compare with (yet) +`` + +So now I can't do anything without committing the files it seems, and I somehow need to grow the git cache, although when I search online for `+RTS -Ksize -RTS', I get nothing. + +Does anyone know how to increase the cache size, or how to unannex the files without this HEAD error? + +Thanks, + +Mike diff --git a/doc/forum/Sending_requests_across_the_network.mdwn b/doc/forum/Sending_requests_across_the_network.mdwn new file mode 100644 --- /dev/null +++ b/doc/forum/Sending_requests_across_the_network.mdwn @@ -0,0 +1,15 @@ +Hi, + +Is it possible to have git-annex send requests across the repository network? Say I have a network topology like this: +Home (annex) <-> Cloud (S3) <-> Laptop (annex) + +Home has all files, cloud has zero, and laptop has subset of files. Let's also assume Laptop can't talk to Home directly (maybe it's behind a NAT), but both Home and Laptop are connected to the internet. +If I'm away on my laptop, can I retrieve a file from Home "through" Cloud? + +That is, Laptop checking its remotes and none of them have the file I want, so it checks remotes of remotes, etc. I'm not sure if git-annex knows the topology (seems likely considering it can generate the graphviz image). It also seems there is a communication medium of Jabber/XMPP where it could communicate between internet-connected git-annex servers (which might not otherwise be able to talk to each other directly)? So the fact that Cloud isn't a git-annex server, just a dumb key/value store would be okay? + +I realize that I could set it up so Home mirrors everything to Cloud and then that eventually mirrors over to Laptop, but let's assume both Cloud and Laptop have small storage capacities, so on-demand fetching would be needed. + +This is basically the same usecase as the USB transfer drive to sync two annexes not on the same network, but automated. + +Thanks! diff --git a/doc/forum/View_performance_with_7__44__000_files.mdwn b/doc/forum/View_performance_with_7__44__000_files.mdwn new file mode 100644 --- /dev/null +++ b/doc/forum/View_performance_with_7__44__000_files.mdwn @@ -0,0 +1,26 @@ +I've imported about half of my photos into an annex on an external HDD, +using metadata extensively for EXIF info, including place names. + +Checking out a new view is slower than I expected, at ~6 minutes. +Is this expected behavior, am I pushing the limits of file count already? + +Is there anything I can do to speed things up? + + % ls -1 | wc -l + 7050 + + % git branch -vv + git-annex 4e590d4 update + * master 985ba54 add jen's phone backups + views/Year=_;Month=_;Address=_ 795a58b refs/heads/views/Year=_;Month=_;Address=_ + + % /usr/bin/time -p git annex view "Year=*" "Address=*" + view (searching...) + + Checking out files: 100% (12789/12789), done. + Switched to branch 'views/Year=_;Address=_' + ok + real 376.80 + user 17.98 + sys 9.66 + diff --git a/doc/forum/Want_to_stop_using_Git-Annex.mdwn b/doc/forum/Want_to_stop_using_Git-Annex.mdwn new file mode 100644 --- /dev/null +++ b/doc/forum/Want_to_stop_using_Git-Annex.mdwn @@ -0,0 +1,9 @@ +Hi + +I created a git annex repo in one of my drives. But now all my files have turned into symbolic links. +I need to remove the git repo and get my files back. How can I do that. + +Some of the softwares am using will not follow symbolic links, so need put the files back properly as soon as possible. + +Please help. +Thank you in advance :) diff --git a/doc/forum/__91__announce__93___metadata_extration_utility.mdwn b/doc/forum/__91__announce__93___metadata_extration_utility.mdwn new file mode 100644 --- /dev/null +++ b/doc/forum/__91__announce__93___metadata_extration_utility.mdwn @@ -0,0 +1,30 @@ +Let me announce 'metatag', a simple metadata extraction utility. + +The Design Idea is to make it completely event driven. There are string matching rules over added metadata, +who invoke engines when matched, which in turn add more metadata and so on. +Thus the whole metadata extraction process is controlled by those easily configurable rules. Processing a file or +directory just starts by adding "/=filename" to the metadata, everything else bootstraps from that. After metadata +got extracted there are exporters which implement different backends for storing this metadata (currently only a +'print' and a 'gitannex' exporter are implemented) + +While still in a infancy state it already works for me. It now needs more rules and engines for metadata extraction +and some more efforts to 'standardize' generated metadata. I'd like to welcome comments and contributions. + +A README about it can be found at + + + +The code is available under git from + + git clone git://git.pipapo.org/metatag + +To make the contribution barrier as low as possible there is a public pushable 'mob' repository where everyone can +send changes too at `git://git.pipapo.org/mob/metatag` + +after installing it, using it on a annexed directory is like + + metatag -r -O gitannex,gitexclude -o gitannex:-stat ./ + +There is a mailinglist for the project, you can subscribe at + + diff --git a/doc/forum/downloading_from_moodle.mdwn b/doc/forum/downloading_from_moodle.mdwn new file mode 100644 --- /dev/null +++ b/doc/forum/downloading_from_moodle.mdwn @@ -0,0 +1,76 @@ +my school uses moodle for our classes. We have to sign in and then manually click to download each file, assignment and video uploaded. I asked the school's tech administrator if there was a direct way I could access the videos through the ssh access they've given us to one of the servers, but he said it wasn't possible. + +when I click on the link shown, the location I see is: http://moodle.jct.ac.il/mod/resource/view.php?id=135374 +Inspect element gives more information. the response from the server is: + + Remote Address:147.161.6.59:80 + Request URL:http://moodle.jct.ac.il/mod/resource/view.php?id=135374 + Request Method:GET + Status Code:303 See Other + Request Headersview source + Accept:text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8 + Accept-Encoding:gzip,deflate,sdch + Accept-Language:en-US,en;q=0.8,he;q=0.6 + Connection:keep-alive + Cookie:visid_incap_97364=qJx2WaKqQfGidGf9VfM6QWrnlFIAAAAAQUIPAAAAAAC5EXcbt00vqNu9jdVDwEDN; __utma=98014340.1409421308.1381214363.1381214363.1390387318.2; __utmz=98014340.1381214363.1.1.utmcsr=(direct)|utmccn=(direct)|utmcmd=(none); MoodleSession5771=7s1cfqfo4ahdtmna5h7vserg97; MOODLEID1_5771=%257F%25D39%2522N%25B4%25AFY + DNT:1 + Host:moodle.jct.ac.il + Referer:http://moodle.jct.ac.il/course/view.php?id=20151 + User-Agent:Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/36.0.1985.67 Safari/537.36 + Query String Parametersview sourceview URL encoded + id:135374 + Response Headersview source + Cache-Control:no-store, no-cache, must-revalidate, post-check=0, pre-check=0 + Connection:Keep-Alive + Content-Encoding:gzip + Content-Language:he + Content-Length:503 + Content-Type:text/html + Date:Mon, 16 Jun 2014 12:31:22 GMT + Expires:Thu, 19 Nov 1981 08:52:00 GMT + Keep-Alive:timeout=15, max=100 + Location:http://moodle.jct.ac.il/pluginfile.php/288409/mod_resource/content/0/movie%205773/150151.5773.week1.wmv?forcedownload=1 + Pragma:no-cache + Server:Apache/2.2.14 (Ubuntu) + Vary:Accept-Encoding + X-Powered-By:PHP/5.3.2-1ubuntu4.24 + +this then pulls the following: + + Remote Address:147.161.6.59:80 + Request URL:http://moodle.jct.ac.il/pluginfile.php/288409/mod_resource/content/0/movie%205773/150151.5773.week1.wmv?forcedownload=1 + Request Method:GET + Status Code:200 OK + Request Headersview source + Accept:text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8 + Accept-Encoding:gzip,deflate,sdch + Accept-Language:en-US,en;q=0.8,he;q=0.6 + Connection:keep-alive + Cookie:visid_incap_97364=qJx2WaKqQfGidGf9VfM6QWrnlFIAAAAAQUIPAAAAAAC5EXcbt00vqNu9jdVDwEDN; __utma=98014340.1409421308.1381214363.1381214363.1390387318.2; __utmz=98014340.1381214363.1.1.utmcsr=(direct)|utmccn=(direct)|utmcmd=(none); MoodleSession5771=7s1cfqfo4ahdtmna5h7vserg97; MOODLEID1_5771=%257F%25D39%2522N%25B4%25AFY + DNT:1 + Host:moodle.jct.ac.il + Referer:http://moodle.jct.ac.il/course/view.php?id=20151 + User-Agent:Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/36.0.1985.67 Safari/537.36 + Query String Parametersview sourceview URL encoded + forcedownload:1 + Response Headersview source + Accept-Ranges:bytes + Cache-Control:max-age=86400 + Connection:Keep-Alive + Content-Disposition:attachment; filename="150151.5773.week1.wmv" + Content-Length:1353673203 + Content-Type:application/x-forcedownload + Date:Mon, 16 Jun 2014 12:31:23 GMT + ETag:675e7d2cffd7a79afd8686c59ff2533f9e3508b7 + Expires:Tue, 17 Jun 2014 12:31:23 GMT + Keep-Alive:timeout=15, max=99 + Last-Modified:Fri, 19 Jul 2013 17:06:54 GMT + Pragma: + Server:Apache/2.2.14 (Ubuntu) + X-Powered-By:PHP/5.3.2-1ubuntu4.24 + +when I right-click on the second one in the inspect element window, I can select "copy as cURL" i get: + + curl 'http://moodle.jct.ac.il/pluginfile.php/288409/mod_resource/content/0/movie%205773/150151.5773.week1.wmv?forcedownload=1' -H 'DNT: 1' -H 'Accept-Encoding: gzip,deflate,sdch' -H 'Accept-Language: en-US,en;q=0.8,he;q=0.6' -H 'User-Agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/36.0.1985.67 Safari/537.36' -H 'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8' -H 'Referer: http://moodle.jct.ac.il/course/view.php?id=20151' -H 'Cookie: visid_incap_97364=qJx2WaKqQfGidGf9VfM6QWrnlFIAAAAAQUIPAAAAAAC5EXcbt00vqNu9jdVDwEDN; __utma=98014340.1409421308.1381214363.1381214363.1390387318.2; __utmz=98014340.1381214363.1.1.utmcsr=(direct)|utmccn=(direct)|utmcmd=(none); MoodleSession5771=7s1cfqfo4ahdtmna5h7vserg97; MOODLEID1_5771=%257F%25D39%2522N%25B4%25AFY' -H 'Connection: keep-alive' --compressed + +if I append " > week1.wmv" to the end of that output it downloads fine. How can I add this file to a git-annex repo? diff --git a/doc/forum/duplicated_content___40__user_error__41__._How_to_fix__63__.mdwn b/doc/forum/duplicated_content___40__user_error__41__._How_to_fix__63__.mdwn new file mode 100644 --- /dev/null +++ b/doc/forum/duplicated_content___40__user_error__41__._How_to_fix__63__.mdwn @@ -0,0 +1,24 @@ +I have Ubuntu and Debian systems, playing with git-annex. This is not mission critical data, just testing. I ended up with an extra duplicate of the media files on the laptop. + +The whereis listing is lots and lots like this: + +whereis 00-Unsorted/2008-RobustStats-AmerPsyc.pdf (3 copies) + 67e69242-d57c-4b50-aaf9-74876b899962 + 9e0bc9e4-f8bf-11e3-b9c1-9b4158540a9d -- pols110.pols.ku.edu_mediashare ( +pdf and mp3) + d82d2e6f-9200-49cf-86a3-1d674a768971 -- here (pauljohn@dellap14:~/medias +hare) +ok + +(I'm pretty sure) This happened because I copied the media files to /home/pauljohn/mediashare/manuscripts manually, and then I used the git-annex assistant to set up the remote linkage to same content, from the workstation, and it apparently copied in a whole new set. + +How to clean this up? Without erasing everything and starting over? + +Can I guess? + +Open a terminal and git remove manually 67e69242-d57c-4b50-aaf9-74876b899962 ??? + +Thanks in advance if you care to advise me :) + +Paul Johnson +http://pj.freefaculty.org diff --git a/doc/forum/empty_directory_handling.mdwn b/doc/forum/empty_directory_handling.mdwn new file mode 100644 --- /dev/null +++ b/doc/forum/empty_directory_handling.mdwn @@ -0,0 +1,3 @@ +I've just tried using git annex assistant for the first time, to synchronize a shared directory between machines. This shared directory contains a collection of bare git repositories for various projects. Unfortunately this doesn't seem to work, as to be recognised as valid bare repos, they need to have the ref/heads and ref/tags subdirectories. git annex assistant fails to synchronise these, as they are empty. + +What should I do? How can I make git annex reproduce the source directory structure when synchronising? diff --git a/doc/forum/how_to_prevent_accidentally_running___96__git_add__96____63__.mdwn b/doc/forum/how_to_prevent_accidentally_running___96__git_add__96____63__.mdwn new file mode 100644 --- /dev/null +++ b/doc/forum/how_to_prevent_accidentally_running___96__git_add__96____63__.mdwn @@ -0,0 +1,5 @@ +I fear that while using git annex I will at some point accidentally `git add` some small files and not notice it until the only way to fix the problem is to rewrite history. What would be the best way to prevent myself from ever `git add`-ing a file into my annex repository instead of `git annex add`-ing it? + +And secondly, how can I best search in my git annex repository whether I already did this mistake in the past or not? Currently I'm using this which returns everything that's not a symlink or a git submodule: + + git ls-files -s | awk ' $1 != 120000 && $1 != 160000 { print $4 }' diff --git a/doc/forum/overmounting_repository_at_home.mdwn b/doc/forum/overmounting_repository_at_home.mdwn new file mode 100644 --- /dev/null +++ b/doc/forum/overmounting_repository_at_home.mdwn @@ -0,0 +1,12 @@ +Consider the following scenario: + +- A Server which holds the full repository +- A Laptop with a small disk, cloned the repository + +Now when i am online i'd just like to mount the repository from the server on over to the client, shadowing the local repository. But when offline and the server is not +mounted the local repository takes place. + +The Question is now what would be a viable concept to get this right. Especially will the assistant become confused when it runs on the server side and locally on the laptop +while the mount is in effect. Would it be sensible not to mount the whole repository tree but only parts like `.git/annex` or `.git/annex/objects`? + +Not tried this yet, but I am wondering whats the most viable approach would be. diff --git a/doc/forum/public__44___read_only_annex_without_location_tracking.mdwn b/doc/forum/public__44___read_only_annex_without_location_tracking.mdwn new file mode 100644 --- /dev/null +++ b/doc/forum/public__44___read_only_annex_without_location_tracking.mdwn @@ -0,0 +1,7 @@ +I would like to use a public, read only annex to publish photos. I have a server, running gitolite, with git-annex setup, which I use successfully to sync content between my own devices. + +But, with a public annex, I would like the view of the repository available from the server to be that only the server has the content, and not to have, or give out any of the location tracking information about any other annexes? + +A more concrete example would be, how do I get a photo in to git annex locally, and then push this to the server for public access, without publishing information about my local repository? + +From the public annexes I have looked at, this does not appear to be done. So I am unsure if this is even possible, however it seems a desirable thing to do? diff --git a/doc/forum/recovery_from_failed_merge.mdwn b/doc/forum/recovery_from_failed_merge.mdwn new file mode 100644 --- /dev/null +++ b/doc/forum/recovery_from_failed_merge.mdwn @@ -0,0 +1,7 @@ +Starting the assistant version 5.20140613 on my repository (~60GB), it performed a merge +with an offline-repository, deleting a large part of the files. +Since the repo is in direct mode, I cannot do a git revert. The other repo is not available anymore + +Any way of getting them back? +Also, du shows me that the .git/annex/objects folder has approximately the size of my repo before the incident. + diff --git a/doc/forum/whereis_command_with_file_names_instead_of_hashes.mdwn b/doc/forum/whereis_command_with_file_names_instead_of_hashes.mdwn new file mode 100644 --- /dev/null +++ b/doc/forum/whereis_command_with_file_names_instead_of_hashes.mdwn @@ -0,0 +1,7 @@ +Hi + +I have a laptop, server and a regular PC. Laptop and PC are using same "backup" repo on server. Thay all get notified via ssh. My goal is to have synchronization and backup in one remote repo. When I wan to list all files on all repos i do: + + git-annex whereis -A (some files do fail. Don't know why) + +But that displays hashes. Not file names. How can to list file names on all repos instead of hashes ? diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -268,7 +268,7 @@ Use `--template` to control where the files are stored. The default template is '${feedtitle}/${itemtitle}${extension}' - (Other available variables: feedauthor, itemauthor, itemsummary, itemdescription, itemrights, itemid, itempubdate) + (Other available variables: feedauthor, itemauthor, itemsummary, itemdescription, itemrights, itemid, itempubdate, title, author) The `--relaxed` and `--fast` options behave the same as they do in addurl. @@ -644,7 +644,8 @@ `--format`. The default output format is the same as `--format='${file}\\n'` These variables are available for use in formats: file, key, backend, - bytesize, humansize, keyname, hashdirlower, hashdirmixed, mtime. + bytesize, humansize, keyname, hashdirlower, hashdirmixed, mtime (for + the mtime field of a WORM key). * `whereis [path ...]` @@ -1345,8 +1346,12 @@ * `annex.genmetadata` Set this to `true` to make git-annex automatically generate some metadata - when adding files to the repository. In particular, it stores - year and month metadata, from the file's modification date. + when adding files to the repository. + + In particular, it stores year and month metadata, from the file's + modification date. + + When importfeed is used, it stores additional metadata from the feed. * `annex.queuesize` diff --git a/doc/install/Android.mdwn b/doc/install/Android.mdwn --- a/doc/install/Android.mdwn +++ b/doc/install/Android.mdwn @@ -27,7 +27,7 @@ git-annex can be built from source for Android. 1. Run `standalone/android/buildchroot` as root (requires debootstrap). - This builds a chroot with an `builder` user. + This builds a chroot with a `builder` user. The rest of the build will run in this chroot as that user. 2. In the chroot, run `standalone/android/install-haskell-packages` Note that this will break from time to time as new versions of packages diff --git a/doc/install/Fedora.mdwn b/doc/install/Fedora.mdwn --- a/doc/install/Fedora.mdwn +++ b/doc/install/Fedora.mdwn @@ -3,6 +3,8 @@ Should be as simple as: `yum install git-annex` +Note: Fedora's build does not currently include the git-annex webapp. + ---- To install the latest version of git-annex on Fedora 18 and later, you can use `cabal`: diff --git a/doc/install/Windows.mdwn b/doc/install/Windows.mdwn --- a/doc/install/Windows.mdwn +++ b/doc/install/Windows.mdwn @@ -4,8 +4,9 @@ * Then, [install git-annex](https://downloads.kitenet.net/git-annex/windows/current/) This port is now in reasonably good shape for command-line use of -git-annex. The assistant and webapp are still in an early state. -See [[todo/windows_support]] for current status. +git-annex. The assistant and webapp are also usable. There are some known +problems and parts that don't work. See [[todo/windows_support]] for +current status. The autobuilder is not currently able to run the test suite, so testing git-annex on Windows is up to you! To check that the build of @@ -19,7 +20,7 @@ A daily build is also available, thanks to Yury V. Zaytsev and [NEST](http://nest-initiative.org/). -* [download](https://qa.nest-initiative.org/view/msysGit/job/msysgit-git-annex-assistant-test/lastSuccessfulBuild/artifact/git-annex/git-annex-installer.exe) ([build logs](https://qa.nest-initiative.org/view/msysGit/job/msysgit-git-annex-assistant-test/)) +* [download](https://downloads.kitenet.net/git-annex/autobuild/windows/) ([build logs](https://qa.nest-initiative.org/view/msysGit/job/msysgit-git-annex-assistant-test/)) ## building it yourself diff --git a/doc/install/cabal/comment_36_2a095a5af53a356bd29abd22a9cb1bea._comment b/doc/install/cabal/comment_36_2a095a5af53a356bd29abd22a9cb1bea._comment new file mode 100644 --- /dev/null +++ b/doc/install/cabal/comment_36_2a095a5af53a356bd29abd22a9cb1bea._comment @@ -0,0 +1,16 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawkNcHu5T1Pxzl-r2co9vf6SxXYWubv2P04" + nickname="Matthew" + subject="I did indeed get problems on Ubuntu 13.04" + date="2014-06-25T01:01:43Z" + content=""" +The issues I had were version mismatches when resolving dependencies of git-annex. + +It seems that when you install haskell-platform package with apt-get, it installs a bunch of haskell dependencies as apt packages, yet those aren't needed for any other system packages. So some people here who complain about version mismatches might not have intended to install any Haskell libraries with apt, they just come along for the ride by default. + +I can't remember the exact ones, but I ended up uninstalling some of the stuff that gets auto-installed along with haskell-platform, and using cabal to build those. Then all the git-annex dependencies worked. + +Why 13.04 in this day and age? Using Zentyal as a home server/gateway, and it currently runs on 13.04. + +This method might not work if you installed other apt packages that _do_ need those apt-based Haskell libraries. But if git-annex is all you need that uses the Haskell platform, might work. +"""]] diff --git a/doc/install/comment_1_0aa16754fb08d8f2a54c8c3f78b6c187._comment b/doc/install/comment_1_0aa16754fb08d8f2a54c8c3f78b6c187._comment new file mode 100644 --- /dev/null +++ b/doc/install/comment_1_0aa16754fb08d8f2a54c8c3f78b6c187._comment @@ -0,0 +1,14 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawm7eqCMh_B7mxE0tnchbr0JoYu11FUAFRY" + nickname="Stéphane" + subject="Old versions from distributions (e.g. Debian stable) fail with online instructions." + date="2014-06-28T15:36:12Z" + content=""" +Hello everyone. + +Be aware that your distribution's package may be very old. +For example, at the time I write this, latest Debian stable is Debian 7.5 which is 2 months old. +But git-annex package there is two *years* old (tomorrow, it will be exactly two yezrs old). + +So, beware. If following [online walkthrough](https://git-annex.branchable.com/walkthrough/), either install a more recent git-annex (e.g. from [Debain backports](http://backports.debian.org/Instructions/)) or follow instructions from your local `/usr/share/doc/git-annex/html/walkthrough.html` instead. +"""]] diff --git a/doc/install/fromscratch/comment_1_9d085e460553fa045999ab7cb945cdec._comment b/doc/install/fromscratch/comment_1_9d085e460553fa045999ab7cb945cdec._comment new file mode 100644 --- /dev/null +++ b/doc/install/fromscratch/comment_1_9d085e460553fa045999ab7cb945cdec._comment @@ -0,0 +1,13 @@ +[[!comment format=mdwn + username="azul" + ip="91.36.153.149" + subject="cabal fails to resolve dependencies" + date="2014-06-19T08:49:05Z" + content=""" +I tried this on ubuntu 14.04 without any previous haskell installs and cabal failed to resolve the dependencies: + +rejecting: optparse-applicative-0.9.0 (conflict: hjsmin => +optparse-applicative>=0.7 && <0.9) + +[full log](paste.debian.net/105771/) +"""]] diff --git a/doc/install/fromscratch/comment_2_b7954521d9ab40622b665f278dd72e17._comment b/doc/install/fromscratch/comment_2_b7954521d9ab40622b665f278dd72e17._comment new file mode 100644 --- /dev/null +++ b/doc/install/fromscratch/comment_2_b7954521d9ab40622b665f278dd72e17._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="azul" + ip="91.36.173.120" + subject="conflict solved" + date="2014-06-20T06:13:09Z" + content=""" +`apt-get install happy alex libghc-hjsmin-dev` +solved the problem for me. The hjsmin lib was probably crucial. It seems a bunch of dependencies can also be installed as debs rather than through cabal. +`standalone/android/buildchroot-inchroot` gave me a clue. +"""]] diff --git a/doc/install/fromscratch/comment_3_a3bf3ce57ea73515a059267f25b816eb._comment b/doc/install/fromscratch/comment_3_a3bf3ce57ea73515a059267f25b816eb._comment new file mode 100644 --- /dev/null +++ b/doc/install/fromscratch/comment_3_a3bf3ce57ea73515a059267f25b816eb._comment @@ -0,0 +1,23 @@ +[[!comment format=mdwn + username="azul" + ip="91.36.173.120" + subject="c2hs required for cabal to install dependencies" + date="2014-06-20T06:35:35Z" + content=""" +Next thing i ran into was missing c2hs. +So +`apt-get install c2hs` before running the cabal install otherwise... + +
+$ cabal install git-annex --only-dependencies
+Resolving dependencies...
+Configuring gnuidn-0.2.1...
+cabal: The program c2hs is required but it could not be found.
+Failed to install gnuidn-0.2.1
+cabal: Error: some packages failed to install:
+gnuidn-0.2.1 failed during the configure step. The exception was:
+ExitFailure 1
+network-protocol-xmpp-0.4.6 depends on gnuidn-0.2.1 which failed to install.
+
+ +"""]] diff --git a/doc/news/version_5.20140421.mdwn b/doc/news/version_5.20140421.mdwn deleted file mode 100644 --- a/doc/news/version_5.20140421.mdwn +++ /dev/null @@ -1,39 +0,0 @@ -git-annex 5.20140421 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * assistant: Now detects immediately when other repositories push - changes to a ssh remote, and pulls. - ** XMPP is no longer needed in this configuration! ** - This requires the remote server have git-annex-shell with - notifychanges support (>= 5.20140405) - * webapp: Show a network signal icon next to ssh and xmpp remotes that - it's currently connected with. - * webapp: Rework xmpp nudge to prompt for either xmpp or a ssh remote - to be set up. - * sync, assistant, remotedaemon: Use ssh connection caching for git pushes - and pulls. - * remotedaemon: When network connection is lost, close all cached ssh - connections. - * Improve handling of monthly/yearly scheduling. - * Avoid depending on shakespeare except for when building the webapp. - * uninit: Avoid making unncessary copies of files. - * info: Allow use in a repository where annex.uuid is not set. - * reinit: New command that can initialize a new repository using - the configuration of a previously known repository. - Useful if a repository got deleted and you want - to clone it back the way it was. - * drop --from: When local repository is untrusted, its copy of a file does - not count. - * Bring back rsync -p, but only when git-annex is running on a non-crippled - file system. This is a better approach to fix #700282 while not - unncessarily losing file permissions on non-crippled systems. - * webapp: Start even if the current directory is listed in - ~/.config/git-annex/autostart but no longer has a git repository in it. - * findref: New command, like find but shows files in a specified git ref. - * webapp: Fix UI for removing XMPP connection. - * When init detects that git is not configured to commit, and sets - user.email to work around the problem, also make it set user.name. - * webapp: Support using git-annex on a remote server, which was installed - from the standalone tarball or OSX app, and so does not have - git-annex in PATH (and may also not have git or rsync in PATH). - * standalone tarball, OSX app: Install a ~/.ssh/git-annex-wrapper, which - can be used to run git-annex, git, rsync, etc."""]] diff --git a/doc/news/version_5.20140707.mdwn b/doc/news/version_5.20140707.mdwn new file mode 100644 --- /dev/null +++ b/doc/news/version_5.20140707.mdwn @@ -0,0 +1,23 @@ +git-annex 5.20140707 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * assistant: Fix bug, introduced in last release, that caused the assistant + to make many unncessary empty merge commits. + * assistant: Fix one-way assistant->assistant sync in direct mode. + * Fix bug in annex.queuesize calculation that caused much more + queue flushing than necessary. + * importfeed: When annex.genmetadata is set, metadata from the feed + is added to files that are imported from it. + * Support users who have set commit.gpgsign, by disabling gpg signatures + for git-annex branch commits and commits made by the assistant. + * Fix memory leak when committing millions of changes to the git-annex + branch, eg after git-annex add has run on 2 million files in one go. + * Support building with bloomfilter 2.0.0. + * Run standalone install process when the assistant is started + (was only being run when the webapp was opened). + * Android: patch git to avoid fchmod, which fails on /sdcard. + * Windows: Got rid of that pesky DOS box when starting the webapp. + * Windows: Added Startup menu item so assistant starts automatically + on login. + * Windows: Fix opening file browser from webapp when repo is in a + directory with spaces. + * Windows: Assistant now logs to daemon.log."""]] diff --git a/doc/scalability.mdwn b/doc/scalability.mdwn --- a/doc/scalability.mdwn +++ b/doc/scalability.mdwn @@ -13,11 +13,6 @@ but git-annex is designed so that it does not need to hold all the details about your repository in memory. - The one exception is that [[todo/git-annex_unused_eats_memory]], - because it *does* need to hold the whole repo state in memory. But - that is still considered a bug, and hoped to be solved one day. - Luckily, that command is not often used. - * Many files can be managed. The limiting factor is git's own limitations in scaling to repositories with a lot of files, and as git improves this will improve. Scaling to hundreds of thousands of files diff --git a/doc/special_remotes.mdwn b/doc/special_remotes.mdwn --- a/doc/special_remotes.mdwn +++ b/doc/special_remotes.mdwn @@ -40,6 +40,7 @@ * [[Usenet|forum/nntp__47__usenet special remote]] * [chef-vault](https://github.com/3ofcoins/knife-annex/) * [hubiC](https://github.com/Schnouki/git-annex-remote-hubic) +* [pCloud](https://github.com/tochev/git-annex-remote-pcloud) Want to add support for something else? [[Write your own!|external]] diff --git a/doc/tips/downloading_podcasts.mdwn b/doc/tips/downloading_podcasts.mdwn --- a/doc/tips/downloading_podcasts.mdwn +++ b/doc/tips/downloading_podcasts.mdwn @@ -24,7 +24,7 @@ Other available template variables: feedauthor, itemauthor, itemsummary, itemdescription, itemrights, itemid, -itempubdate +itempubdate, author, title. ## catching up @@ -68,3 +68,12 @@ If your git-annex is also built with quvi support, you can also use `git annex importfeed` on youtube playlists. It will automatically download the videos linked to by the playlist. + +## metadata + +As well as storing the urls for items imported from a feed, git-annex can +store additional [[metadata]], like the author, and itemdescription. +This can then be looked up later, used in [[metadata_driven_views]], etc. + +To make all available metadata from the feed be stored: +`git config annex.genmetadata true` diff --git a/doc/todo/__171__git_annex_add__187___for_symlinks_in_direct_mode.mdwn b/doc/todo/__171__git_annex_add__187___for_symlinks_in_direct_mode.mdwn new file mode 100644 --- /dev/null +++ b/doc/todo/__171__git_annex_add__187___for_symlinks_in_direct_mode.mdwn @@ -0,0 +1,8 @@ +Please let me know if there already is a way of achieving this; I’ve googled around a lot, but could not find any information pertaining to my particular problem. + +I am using direct mode in a bunch of repositories where I need quick write access to content and where I am not interested in preserving history. Some of these repositories do contain regular symlinks, however. Now, I suppose that in indirect repos, the way of adding symlinks would be to just «git add» them. However, since these are direct mode repos, I cannot do this. + +Is there already a good way of adding symlinks in direct mode? If not, I would find it useful if there were one. + +Best regards, +T. diff --git a/doc/todo/windows_git-annex_service.mdwn b/doc/todo/windows_git-annex_service.mdwn new file mode 100644 --- /dev/null +++ b/doc/todo/windows_git-annex_service.mdwn @@ -0,0 +1,30 @@ +## git-annex as service on windows + +Use nssm to run git-annex as a service. Will need to include it in the +git-annex bundle. + +Problem: nssm runs git-annex as a service as a LocalService user. (Or some +similar user.) This leads to permission problems, when the normal user +tries to write to its directory. + +Solution: Make `git-annex mkservice $repo` command (only avilable on +Windows) that does: + +1. git -c core.sharedRepository=true init $repo +2. cd $repo; git annex init +4. chmod 777 -R $repo +5. Add $repo to C:\.config\git-annex\autostart +6. If git-annex service does not yet exist in nssm, set it up and start it. + +**Problem**: With 2 users writing to one repository, files and subdirs +will end up owned by git-annex or by the desktop user, and the other user +won't be able to eg, edit a file or remove a file from a directory. + +Make git-annex read `C:\.config\git-annex\autostart` +on Windows, in addition to the one in $HOME. This way, `git annex assistant +--autostart` and `git annex webapp` will use it, no matter which user. + +WIP git branch: `winservice` + +> I am calling this [[done]], it's not done using a service, but it works. +> --[[Joey]] diff --git a/doc/todo/windows_support.mdwn b/doc/todo/windows_support.mdwn --- a/doc/todo/windows_support.mdwn +++ b/doc/todo/windows_support.mdwn @@ -1,19 +1,9 @@ -The git-annex Windows port is not ready for prime time. But it does exist -now! --[[Joey]] +The git-annex Windows port is beta, but rapidly becoming polished and +usable! ## status -* Doesn't daemonize. Maybe use - - or perhaps easier, - - * XMPP library not yet built. (See below.) - -* View debug log is empty in windows -- all logs go to console. - This messes up a few parts of UI that direct user to the debug log. - Should try to get rid of the console, but only once ssh passwords - (and possibly gpg) are not prompted there anymore. * Local pairing seems to fail, after acking on Linux box, it stalls. (Also, of course, the Windows box is unlikely to have a ssh server, diff --git a/git-annex.1 b/git-annex.1 --- a/git-annex.1 +++ b/git-annex.1 @@ -248,7 +248,7 @@ .IP Use \fB\-\-template\fP to control where the files are stored. The default template is '${feedtitle}/${itemtitle}${extension}' -(Other available variables: feedauthor, itemauthor, itemsummary, itemdescription, itemrights, itemid, itempubdate) +(Other available variables: feedauthor, itemauthor, itemsummary, itemdescription, itemrights, itemid, itempubdate, title, author) .IP The \fB\-\-relaxed\fP and \fB\-\-fast\fP options behave the same as they do in addurl. .IP @@ -596,7 +596,8 @@ \fB\-\-format\fP. The default output format is the same as \fB\-\-format='${file}\\n'\fP .IP These variables are available for use in formats: file, key, backend, -bytesize, humansize, keyname, hashdirlower, hashdirmixed, mtime. +bytesize, humansize, keyname, hashdirlower, hashdirmixed, mtime (for +the mtime field of a WORM key). .IP .IP "\fBwhereis [path ...]\fP" Displays a information about where the contents of files are located. @@ -1215,8 +1216,12 @@ .IP .IP "\fBannex.genmetadata\fP" Set this to \fBtrue\fP to make git\-annex automatically generate some metadata -when adding files to the repository. In particular, it stores -year and month metadata, from the file's modification date. +when adding files to the repository. +.IP +In particular, it stores year and month metadata, from the file's +modification date. +.IP +When importfeed is used, it stores additional metadata from the feed. .IP .IP "\fBannex.queuesize\fP" git\-annex builds a queue of git commands, in order to combine similar diff --git a/git-annex.cabal b/git-annex.cabal --- a/git-annex.cabal +++ b/git-annex.cabal @@ -1,5 +1,5 @@ Name: git-annex -Version: 5.20140613 +Version: 5.20140707 Cabal-Version: >= 1.8 License: GPL-3 Maintainer: Joey Hess @@ -191,7 +191,7 @@ yesod, yesod-default, yesod-static, yesod-form, yesod-core, http-types, transformers, wai, wai-extra, warp, warp-tls, blaze-builder, crypto-api, hamlet, clientsession, - template-haskell, data-default, aeson, network-conduit, + template-haskell, data-default, aeson, shakespeare CPP-Options: -DWITH_WEBAPP if flag(Webapp) && flag (Webapp-secure) diff --git a/standalone/android/Makefile b/standalone/android/Makefile --- a/standalone/android/Makefile +++ b/standalone/android/Makefile @@ -114,7 +114,8 @@ cd $(GIT_ANNEX_ANDROID_SOURCETREE)/busybox && $(MAKE) touch $@ -$(GIT_ANNEX_ANDROID_SOURCETREE)/git/build-stamp: +$(GIT_ANNEX_ANDROID_SOURCETREE)/git/build-stamp: git.patch + cat git.patch | (cd $(GIT_ANNEX_ANDROID_SOURCETREE)/git && git am) cd $(GIT_ANNEX_ANDROID_SOURCETREE)/git && $(MAKE) install NO_OPENSSL=1 NO_GETTEXT=1 NO_GECOS_IN_PWENT=1 NO_GETPASS=1 NO_NSEC=1 NO_MKDTEMP=1 NO_PTHREADS=1 NO_PERL=1 NO_CURL=1 NO_EXPAT=1 NO_TCLTK=1 NO_ICONV=1 prefix= DESTDIR=installed-tree touch $@ diff --git a/standalone/android/git.patch b/standalone/android/git.patch new file mode 100644 --- /dev/null +++ b/standalone/android/git.patch @@ -0,0 +1,54 @@ +From ec690f617cab405ec2c6420bde53e9d9ed984e5c Mon Sep 17 00:00:00 2001 +From: Joey Hess +Date: Thu, 3 Jul 2014 15:55:17 -0400 +Subject: [PATCH] Revert "config: preserve config file permissions on edits" + +This reverts commit daa22c6f8da466bd7a438f1bc27375fd737ffcf3. + +This breaks on Android's /sdcard, which has a variety of FUSE +implentations, all total shite. + +diff --git a/config.c b/config.c +index a1aef1c..7f3303d 100644 +--- a/config.c ++++ b/config.c +@@ -1637,13 +1637,6 @@ int git_config_set_multivar_in_file(const char *config_filename, + MAP_PRIVATE, in_fd, 0); + close(in_fd); + +- if (fchmod(fd, st.st_mode & 07777) < 0) { +- error("fchmod on %s failed: %s", +- lock->filename, strerror(errno)); +- ret = CONFIG_NO_WRITE; +- goto out_free; +- } +- + if (store.seen == 0) + store.seen = 1; + +@@ -1792,7 +1785,6 @@ int git_config_rename_section_in_file(const char *config_filename, + int out_fd; + char buf[1024]; + FILE *config_file; +- struct stat st; + + if (new_name && !section_name_is_ok(new_name)) { + ret = error("invalid section name: %s", new_name); +@@ -1814,14 +1806,6 @@ int git_config_rename_section_in_file(const char *config_filename, + goto unlock_and_out; + } + +- fstat(fileno(config_file), &st); +- +- if (fchmod(out_fd, st.st_mode & 07777) < 0) { +- ret = error("fchmod on %s failed: %s", +- lock->filename, strerror(errno)); +- goto out; +- } +- + while (fgets(buf, sizeof(buf), config_file)) { + int i; + int length; +-- +2.0.1 + diff --git a/standalone/android/haskell-patches/unix-time_hack-for-Bionic.patch b/standalone/android/haskell-patches/unix-time_hack-for-Bionic.patch --- a/standalone/android/haskell-patches/unix-time_hack-for-Bionic.patch +++ b/standalone/android/haskell-patches/unix-time_hack-for-Bionic.patch @@ -1,7 +1,7 @@ -From e6d5c141186dbdbe97c698294485ffc4dcd3a843 Mon Sep 17 00:00:00 2001 +From 5433c4f62b1818e09682a64dee229142f88f17d9 Mon Sep 17 00:00:00 2001 From: dummy -Date: Fri, 18 Oct 2013 16:45:50 +0000 -Subject: [PATCH] hack for bionic + cross build +Date: Thu, 3 Jul 2014 20:48:02 +0000 +Subject: [PATCH] ihack for bionic and cross build --- Data/UnixTime/Types.hsc | 12 ------------ @@ -9,10 +9,10 @@ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/Data/UnixTime/Types.hsc b/Data/UnixTime/Types.hsc -index d30f39b..ec7ca4c 100644 +index 403daa6..4e66880 100644 --- a/Data/UnixTime/Types.hsc +++ b/Data/UnixTime/Types.hsc -@@ -9,8 +9,6 @@ import Foreign.Storable +@@ -10,8 +10,6 @@ import Data.Binary #include @@ -21,7 +21,7 @@ -- | -- Data structure for Unix time. data UnixTime = UnixTime { -@@ -20,16 +18,6 @@ data UnixTime = UnixTime { +@@ -21,16 +19,6 @@ data UnixTime = UnixTime { , utMicroSeconds :: {-# UNPACK #-} !Int32 } deriving (Eq,Ord,Show) @@ -35,14 +35,14 @@ - (#poke struct timeval, tv_sec) ptr (utSeconds ut) - (#poke struct timeval, tv_usec) ptr (utMicroSeconds ut) - - -- | - -- Format of the strptime()/strftime() style. - type Format = ByteString + instance Binary UnixTime where + put (UnixTime (CTime sec) msec) = do + put sec diff --git a/cbits/conv.c b/cbits/conv.c -index 7ff7b87..2e4c870 100644 +index ec31fef..b7bc0f9 100644 --- a/cbits/conv.c +++ b/cbits/conv.c -@@ -55,7 +55,7 @@ time_t c_parse_unix_time_gmt(char *fmt, char *src) { +@@ -96,7 +96,7 @@ time_t c_parse_unix_time_gmt(char *fmt, char *src) { #else strptime(src, fmt, &dst); #endif diff --git a/standalone/android/term.patch b/standalone/android/term.patch --- a/standalone/android/term.patch +++ b/standalone/android/term.patch @@ -585,7 +585,7 @@ # Make sure target-11 is installed -$ANDROID update sdk -u -t android-11 -+$ANDROID update sdk -u -t android-17 ++$ANDROID update sdk -u -t android-18 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" ATE_ROOT="$( cd $DIR/.. && pwd )" @@ -594,5 +594,5 @@ PROJECT_DIR="$( dirname "$PROJECT_FILE" )" echo "Updating $PROJECT_FILE" - $ANDROID update project -p "$PROJECT_DIR" --target android-11 -+ $ANDROID update project -p "$PROJECT_DIR" --target android-17 ++ $ANDROID update project -p "$PROJECT_DIR" --target android-18 done diff --git a/standalone/linux/install-haskell-packages b/standalone/linux/install-haskell-packages --- a/standalone/linux/install-haskell-packages +++ b/standalone/linux/install-haskell-packages @@ -13,7 +13,7 @@ set -e -if [ ! -d ../haskell-patches ]; then +if [ ! -d haskell-patches ]; then cd standalone/linux fi diff --git a/standalone/no-th/haskell-patches/shakespeare_remove-TH.patch b/standalone/no-th/haskell-patches/shakespeare_remove-TH.patch --- a/standalone/no-th/haskell-patches/shakespeare_remove-TH.patch +++ b/standalone/no-th/haskell-patches/shakespeare_remove-TH.patch @@ -1,24 +1,24 @@ -From a4b8a90dbb97392378a3c5980cbb9c033702dfb2 Mon Sep 17 00:00:00 2001 -From: Your Name -Date: Tue, 20 May 2014 21:17:27 +0000 -Subject: [PATCH] remove TN +From 6de4e75bfbfccb8aedcbf3ee75e5d544f1eeeca5 Mon Sep 17 00:00:00 2001 +From: dummy +Date: Thu, 3 Jul 2014 21:48:14 +0000 +Subject: [PATCH] remove TH --- - Text/Cassius.hs | 23 ------ - Text/Coffee.hs | 56 ++------------- - Text/Css.hs | 151 ---------------------------------------- - Text/CssCommon.hs | 4 -- - Text/Hamlet.hs | 86 +++++++---------------- - Text/Hamlet/Parse.hs | 3 +- - Text/Julius.hs | 67 +++--------------- - Text/Lucius.hs | 46 +----------- - Text/Roy.hs | 51 ++------------ - Text/Shakespeare.hs | 70 +++---------------- - Text/Shakespeare/Base.hs | 28 -------- - Text/Shakespeare/I18N.hs | 178 ++--------------------------------------------- - Text/Shakespeare/Text.hs | 125 +++------------------------------ - shakespeare.cabal | 2 +- - 14 files changed, 78 insertions(+), 812 deletions(-) + Text/Cassius.hs | 23 ------ + Text/Coffee.hs | 56 ++------------- + Text/Css.hs | 151 --------------------------------------- + Text/CssCommon.hs | 4 -- + Text/Hamlet.hs | 86 +++++++--------------- + Text/Hamlet/Parse.hs | 3 +- + Text/Julius.hs | 67 +++-------------- + Text/Lucius.hs | 46 +----------- + Text/Roy.hs | 51 ++----------- + Text/Shakespeare.hs | 70 +++--------------- + Text/Shakespeare/Base.hs | 28 -------- + Text/Shakespeare/I18N.hs | 178 ++-------------------------------------------- + Text/Shakespeare/Text.hs | 125 +++----------------------------- + shakespeare.cabal | 3 +- + 14 files changed, 78 insertions(+), 813 deletions(-) diff --git a/Text/Cassius.hs b/Text/Cassius.hs index 91fc90f..c515807 100644 @@ -345,7 +345,7 @@ -mkSizeType "ExSize" "ex" -mkSizeType "PixelSize" "px" diff --git a/Text/Hamlet.hs b/Text/Hamlet.hs -index 9500ecb..ec8471a 100644 +index 39c1528..6321cd3 100644 --- a/Text/Hamlet.hs +++ b/Text/Hamlet.hs @@ -11,36 +11,36 @@ @@ -497,7 +497,7 @@ -- | Checks for truth in the left value in each pair in the first argument. If -- a true exists, then the corresponding right action is performed. Only the -@@ -452,7 +420,7 @@ hamletUsedIdentifiers settings = +@@ -460,7 +428,7 @@ hamletUsedIdentifiers settings = data HamletRuntimeRules = HamletRuntimeRules { hrrI18n :: Bool } @@ -506,7 +506,7 @@ hamletFileReloadWithSettings :: HamletRuntimeRules -> HamletSettings -> FilePath -> Q Exp hamletFileReloadWithSettings hrr settings fp = do -@@ -479,7 +447,7 @@ hamletFileReloadWithSettings hrr settings fp = do +@@ -487,7 +455,7 @@ hamletFileReloadWithSettings hrr settings fp = do c VTUrlParam = [|EUrlParam|] c VTMixin = [|\r -> EMixin $ \c -> r c|] c VTMsg = [|EMsg|] @@ -1294,19 +1294,21 @@ - rendered <- shakespeareFile rs{ justVarInterpolation = True } fp - return (render `AppE` rendered) diff --git a/shakespeare.cabal b/shakespeare.cabal -index a555c24..d73da26 100644 +index 05b985e..dd8762a 100644 --- a/shakespeare.cabal +++ b/shakespeare.cabal -@@ -62,8 +62,8 @@ library +@@ -61,10 +61,9 @@ library + Text.Lucius Text.Cassius Text.Shakespeare.Base ++ Text.Css Text.Shakespeare -- other-modules: Text.Hamlet.Parse - Text.Css -+ other-modules: Text.Hamlet.Parse +- Text.TypeScript + other-modules: Text.Hamlet.Parse +- Text.Css Text.MkSizeType Text.IndentToBrace Text.CssCommon -- -2.0.0.rc2 +1.7.10.4 diff --git a/standalone/windows/build.sh b/standalone/windows/build.sh --- a/standalone/windows/build.sh +++ b/standalone/windows/build.sh @@ -68,3 +68,7 @@ # (doesn't currently work well on autobuilder, reason unknown) rm -rf .t withcyg dist/build/git-annex/git-annex.exe test || true + +rm -f dist/build-version +ghc --make Build/BuildVersion.hs +Build/BuildVersion > dist/build-version