git-annex 3.20111203 → 3.20111211
raw patch · 67 files changed
+1075/−292 lines, 67 filesdep ~monad-control
Dependency ranges changed: monad-control
Files
- Annex.hs +3/−2
- Annex/Branch.hs +134/−43
- Annex/CatFile.hs +6/−0
- Annex/Content.hs +1/−1
- Annex/Ssh.hs +1/−1
- Backend.hs +7/−1
- Backend/SHA.hs +6/−4
- CHANGELOG +23/−0
- CmdLine.hs +1/−1
- Command.hs +11/−4
- Command/Add.hs +14/−6
- Command/AddUrl.hs +9/−12
- Command/Drop.hs +9/−19
- Command/DropKey.hs +5/−12
- Command/DropUnused.hs +2/−2
- Command/Fix.hs +3/−6
- Command/Get.hs +12/−20
- Command/Map.hs +6/−5
- Command/Migrate.hs +10/−14
- Command/Move.hs +4/−10
- Command/Status.hs +2/−3
- Command/Sync.hs +70/−0
- Command/Unannex.hs +15/−26
- Command/Unused.hs +2/−3
- Config.hs +4/−3
- Git.hs +10/−15
- Git/UnionMerge.hs +1/−1
- GitAnnex.hs +3/−1
- Locations.hs +14/−5
- Logs/UUID.hs +3/−3
- Remote/Bup.hs +1/−1
- Remote/Git.hs +2/−1
- Remote/Helper/Encryptable.hs +13/−10
- Types/Crypto.hs +2/−0
- Upgrade/V2.hs +1/−1
- Utility/BadPrelude.hs +28/−0
- Utility/DataUnits.hs +1/−1
- Utility/Directory.hs +6/−7
- Utility/Misc.hs +13/−0
- configure.hs +1/−1
- debian/changelog +23/−0
- doc/bugs/Can__39__t___34__git-annex_get__34___with_3.20111203.mdwn +27/−0
- doc/bugs/bad_behaviour_with_file_names_with_newline_in_them.mdwn +5/−0
- doc/bugs/git-annex_branch_corruption.mdwn +95/−0
- doc/bugs/git-annex_branch_push_race.mdwn +45/−0
- doc/bugs/git-annex_losing_rsync_remotes_with_encryption_enabled.mdwn +101/−0
- doc/forum/git_annex_add_crash_and_subsequent_recovery.mdwn +25/−0
- doc/forum/git_pull_remote_git-annex.mdwn +11/−0
- doc/forum/git_pull_remote_git-annex/comment_1_9c245db3518d8b889ecdf5115ad9e053._comment +36/−0
- doc/forum/git_pull_remote_git-annex/comment_2_0f7f4a311b0ec1d89613e80847e69b42._comment +14/−0
- doc/forum/pure_git-annex_only_workflow.mdwn +46/−0
- doc/forum/pure_git-annex_only_workflow/comment_1_a32f7efd18d174845099a4ed59e6feae._comment +32/−0
- doc/forum/pure_git-annex_only_workflow/comment_2_66dc9b65523a9912411db03c039ba848._comment +15/−0
- doc/forum/pure_git-annex_only_workflow/comment_3_9b7d89da52f7ebb7801f9ec8545c3aba._comment +12/−0
- doc/git-annex-shell.mdwn +1/−1
- doc/git-annex.mdwn +12/−1
- doc/git-union-merge.mdwn +1/−1
- doc/internals.mdwn +3/−11
- doc/news/version_3.20111105.mdwn +0/−27
- doc/news/version_3.20111211.mdwn +20/−0
- doc/tips/using_git_annex_with_no_fixed_hostname_and_optimising_ssh.mdwn +72/−0
- doc/todo/Please_abort_build_if___34__make_test__34___fails.mdwn +7/−0
- doc/todo/Please_add_support_for_monad-control_0.3.x.mdwn +7/−0
- doc/users/gebi.mdwn +1/−0
- git-annex.cabal +3/−3
- git-union-merge.hs +1/−1
- test.hs +1/−2
Annex.hs view
@@ -36,6 +36,7 @@ import Types.TrustLevel import Types.UUID import qualified Utility.Matcher+import qualified Data.Map as M -- git-annex's monad newtype Annex a = Annex { runAnnex :: StateT AnnexState IO a }@@ -70,7 +71,7 @@ , limit :: Either [Utility.Matcher.Token (FilePath -> Annex Bool)] (Utility.Matcher.Matcher (FilePath -> Annex Bool)) , forcetrust :: [(UUID, TrustLevel)] , trustmap :: Maybe TrustMap- , cipher :: Maybe Cipher+ , ciphers :: M.Map EncryptedCipher Cipher } newState :: Git.Repo -> AnnexState@@ -93,7 +94,7 @@ , limit = Left [] , forcetrust = [] , trustmap = Nothing- , cipher = Nothing+ , ciphers = M.empty } {- Create and returns an Annex state object for the specified git repo. -}
Annex/Branch.hs view
@@ -43,26 +43,29 @@ originname :: Git.Ref originname = Git.Ref $ "origin/" ++ show name -{- A separate index file for the branch. -}-index :: Git.Repo -> FilePath-index g = gitAnnexDir g </> "index"- {- Populates the branch's index file with the current branch contents. - - - Usually, this is only done when the index doesn't yet exist, and- - the index is used to build up changes to be commited to the branch,- - and merge in changes from other branches.+ - This is only done when the index doesn't yet exist, and the index + - is used to build up changes to be commited to the branch, and merge+ - in changes from other branches. -} genIndex :: Git.Repo -> IO () genIndex g = Git.UnionMerge.stream_update_index g [Git.UnionMerge.ls_tree fullname g] +{- Merges the specified branches into the index.+ - Any changes staged in the index will be preserved. -}+mergeIndex :: [Git.Ref] -> Annex ()+mergeIndex branches = do+ h <- catFileHandle+ inRepo $ \g -> Git.UnionMerge.merge_index h g branches+ {- Runs an action using the branch's index file. -} withIndex :: Annex a -> Annex a withIndex = withIndex' False withIndex' :: Bool -> Annex a -> Annex a withIndex' bootstrapping a = do- f <- fromRepo index+ f <- fromRepo gitAnnexIndex bracketIO (Git.useIndex f) id $ do unlessM (liftIO $ doesFileExist f) $ do unless bootstrapping create@@ -70,6 +73,82 @@ unless bootstrapping $ inRepo genIndex a +{- Updates the branch's index to reflect the current contents of the branch.+ - Any changes staged in the index will be preserved.+ -+ - Compares the ref stored in the lock file with the current+ - ref of the branch to see if an update is needed.+ -}+updateIndex :: Annex (Maybe Git.Ref)+updateIndex = do+ branchref <- getRef fullname+ go branchref+ return branchref+ where+ go Nothing = return ()+ go (Just branchref) = do+ lock <- fromRepo gitAnnexIndexLock+ lockref <- firstRef <$> liftIO (catchDefaultIO (readFileStrict lock) "")+ when (lockref /= branchref) $ do+ withIndex $ mergeIndex [fullname]+ setIndexRef branchref++{- Record that the branch's index has been updated to correspond to a+ - given ref of the branch. -}+setIndexRef :: Git.Ref -> Annex ()+setIndexRef ref = do+ lock <- fromRepo gitAnnexIndexLock+ liftIO $ writeFile lock $ show ref ++ "\n"++{- Commits the staged changes in the index to the branch.+ - + - Ensures that the branch's index file is first updated to include the+ - current state of the branch, before running the commit action. This+ - is needed because the branch may have had changes pushed to it, that+ - are not yet reflected in the index.+ -+ - Also safely handles a race that can occur if a change is being pushed+ - into the branch at the same time. When the race happens, the commit will+ - be made on top of the newly pushed change, but without the index file+ - being updated to include it. The result is that the newly pushed+ - change is reverted. This race is detected and another commit made+ - to fix it.+ -}+commitBranch :: String -> [Git.Ref] -> Annex ()+commitBranch message parents = do+ expected <- updateIndex+ committedref <- inRepo $ Git.commit message fullname parents+ setIndexRef committedref+ parentrefs <- commitparents <$> catObject committedref+ when (racedetected expected parentrefs) $+ fixrace committedref parentrefs+ where+ -- look for "parent ref" lines and return the refs+ commitparents = map (Git.Ref . snd) . filter isparent .+ map (toassoc . L.unpack) . L.lines+ toassoc = separate (== ' ')+ isparent (k,_) = k == "parent"+ + {- The race can be detected by checking the commit's+ - parent, which will be the newly pushed branch,+ - instead of the expected ref that the index was updated to. -}+ racedetected Nothing parentrefs+ | null parentrefs = False -- first commit, no parents+ | otherwise = True -- race on first commit+ racedetected (Just expectedref) parentrefs+ | expectedref `elem` parentrefs = False -- good parent+ | otherwise = True -- race!+ + {- To recover from the race, union merge the lost refs+ - into the index, and recommit on top of the bad commit. -}+ fixrace committedref lostrefs = do+ mergeIndex lostrefs+ commitBranch racemessage [committedref]+ + racemessage = message ++ " (recovery from race)"++{- Runs an action using the branch's index file, first making sure that+ - the branch and index are up-to-date. -} withIndexUpdate :: Annex a -> Annex a withIndexUpdate a = update >> withIndex a @@ -99,22 +178,23 @@ {- Creates the branch, if it does not already exist. -} create :: Annex ()-create = unlessM hasBranch $ do- e <- hasOrigin- if e- then inRepo $ Git.run "branch"- [Param $ show name, Param $ show originname]- else withIndex' True $- inRepo $ Git.commit "branch created" fullname []+create = unlessM hasBranch $ hasOrigin >>= go+ where+ go True = do+ inRepo $ Git.run "branch"+ [Param $ show name, Param $ show originname]+ maybe (return ()) setIndexRef =<< getRef fullname+ go False = withIndex' True $ + setIndexRef =<< (inRepo $ Git.commit "branch created" fullname []) {- Stages the journal, and commits staged changes to the branch. -} commit :: String -> Annex () commit message = whenM journalDirty $ lockJournal $ do stageJournalFiles- withIndex $ inRepo $ Git.commit message fullname [fullname]+ withIndex $ commitBranch message [fullname] -{- Ensures that the branch is up-to-date; should be called before data is- - read from it. Runs only once per git-annex run.+{- Ensures that the branch and index are is up-to-date; should be+ - called before data is read from it. Runs only once per git-annex run. - - Before refs are merged into the index, it's important to first stage the - journal into the index. Otherwise, any changes in the journal would@@ -123,10 +203,8 @@ - (It would be cleaner to handle the merge by updating the journal, not the - index, with changes from the branches.) -- - The index is always updated using a union merge, as that's the most- - efficient way to update it. However, if the branch can be- - fast-forwarded, that is then done, rather than adding an unnecessary- - commit to it.+ - The branch is fast-forwarded if possible, otherwise a merge commit is+ - made. -} update :: Annex () update = onceonly $ do@@ -136,32 +214,31 @@ dirty <- journalDirty c <- filterM (changedBranch name . snd) =<< siblingBranches let (refs, branches) = unzip c- unless (not dirty && null refs) $ withIndex $ lockJournal $ do- when dirty stageJournalFiles- let merge_desc = if null branches- then "update" - else "merging " ++- (unwords $ map (show . Git.refDescribe) branches) ++ - " into " ++ show name- unless (null branches) $ do- showSideAction merge_desc- {- Note: This merges the branches into the index.- - Any unstaged changes in the git-annex branch- - (if it's checked out) will be removed. So,- - documentation advises users not to directly- - modify the branch.- -}- h <- catFileHandle- inRepo $ \g -> Git.UnionMerge.merge_index h g branches- ff <- if dirty then return False else tryFastForwardTo refs- unless ff $ inRepo $- Git.commit merge_desc fullname (nub $ fullname:refs)- invalidateCache+ if (not dirty && null refs)+ then simpleupdate+ else withIndex $ lockJournal $ do+ when dirty stageJournalFiles+ let merge_desc = if null branches+ then "update" + else "merging " +++ unwords (map Git.refDescribe branches) ++ + " into " ++ show name+ unless (null branches) $ do+ showSideAction merge_desc+ mergeIndex branches+ ff <- if dirty then return False else tryFastForwardTo refs+ if ff+ then simpleupdate+ else commitBranch merge_desc (nub $ fullname:refs)+ invalidateCache where onceonly a = unlessM (branchUpdated <$> getState) $ do r <- a disableUpdate return r+ simpleupdate = do+ _ <- updateIndex+ return () {- Checks if the second branch has any commits not present on the first - branch. -}@@ -247,6 +324,20 @@ where gen l = (Git.Ref $ head l, Git.Ref $ last l) uref (a, _) (b, _) = a == b++{- Get the ref of a branch. -}+getRef :: Git.Ref -> Annex (Maybe Git.Ref)+getRef branch = process . L.unpack <$> showref+ where+ showref = inRepo $ Git.pipeRead [Param "show-ref",+ Param "--hash", -- get the hash+ Params "--verify", -- only exact match+ Param $ show branch]+ process [] = Nothing+ process s = Just $ firstRef s++firstRef :: String-> Git.Ref+firstRef = Git.Ref . takeWhile (/= '\n') {- Applies a function to modifiy the content of a file. -
Annex/CatFile.hs view
@@ -7,6 +7,7 @@ module Annex.CatFile ( catFile,+ catObject, catFileHandle ) where @@ -21,6 +22,11 @@ catFile branch file = do h <- catFileHandle liftIO $ Git.CatFile.catFile h branch file++catObject :: Git.Ref -> Annex L.ByteString+catObject ref = do+ h <- catFileHandle+ liftIO $ Git.CatFile.catObject h ref catFileHandle :: Annex Git.CatFile.CatFileHandle catFileHandle = maybe startup return =<< Annex.getState Annex.catfilehandle
Annex/Content.hs view
@@ -43,7 +43,7 @@ {- Checks if a given key's content is currently present. -} inAnnex :: Key -> Annex Bool-inAnnex = inAnnex' $ doesFileExist+inAnnex = inAnnex' doesFileExist inAnnex' :: (FilePath -> IO a) -> Key -> Annex a inAnnex' a key = do whenM (fromRepo Git.repoIsUrl) $
Annex/Ssh.hs view
@@ -43,7 +43,7 @@ shellcmd = "git-annex-shell" shellopts = Param command : File dir : params sshcmd uuid = unwords $- shellcmd : (map shellEscape $ toCommand shellopts) +++ shellcmd : map shellEscape (toCommand shellopts) ++ uuidcheck uuid uuidcheck NoUUID = [] uuidcheck (UUID u) = ["--uuid", u]
Backend.hs view
@@ -64,7 +64,13 @@ r <- (B.getKey b) file case r of Nothing -> genKey' bs file- Just k -> return $ Just (k, b)+ Just k -> return $ Just (makesane k, b)+ where+ -- keyNames should not contain newline characters.+ makesane k = k { keyName = map fixbadchar (keyName k) }+ fixbadchar c+ | c == '\n' = '_'+ | otherwise = c {- Looks up the key and backend corresponding to an annexed file, - by examining what the file symlinks to. -}
Backend/SHA.hs view
@@ -90,10 +90,12 @@ , keyBackendName = shaNameE size } naiveextension = takeExtension file- extension = - if length naiveextension > 6- then "" -- probably not really an extension- else naiveextension+ extension+ -- long or newline containing extensions are + -- probably not really an extension+ | length naiveextension > 6 ||+ '\n' `elem` naiveextension = ""+ | otherwise = naiveextension {- A key's checksum is checked during fsck. -} checkKeyChecksum :: SHASize -> Key -> Annex Bool
CHANGELOG view
@@ -1,3 +1,26 @@+git-annex (3.20111211) unstable; urgency=medium++ * Fix bug in last version in getting contents from bare repositories.+ * Ensure that git-annex branch changes are merged into git-annex's index,+ which fixes a bug that could cause changes that were pushed to the+ git-annex branch to get reverted. As a side effect, it's now safe+ for users to check out and commit changes directly to the git-annex+ branch.+ * map: Fix a failure to detect a loop when both repositories are local+ and refer to each other with relative paths.+ * Prevent key names from containing newlines.+ * add: If interrupted, add can leave files converted to symlinks but not+ yet added to git. Running the add again will now clean up this situtation.+ * Fix caching of decrypted ciphers, which failed when drop had to check+ multiple different encrypted special remotes.+ * unannex: Can be run on files that have been added to the annex, but not+ yet committed.+ * sync: New command that synchronises the local repository and default+ remote, by running git commit, pull, and push for you.+ * Version monad-control dependency in cabal file.++ -- Joey Hess <joeyh@debian.org> Sun, 11 Dec 2011 21:24:39 -0400+ git-annex (3.20111203) unstable; urgency=low * The VFAT filesystem on recent versions of Linux, when mounted with
CmdLine.hs view
@@ -32,7 +32,7 @@ setupConsole r <- E.try getgitrepo :: IO (Either E.SomeException Git.Repo) case r of- Left e -> maybe (throw e) id (cmdnorepo cmd)+ Left e -> fromMaybe (throw e) (cmdnorepo cmd) Right g -> do state <- Annex.new g (actions, state') <- Annex.run state $ do
Command.hs view
@@ -10,10 +10,11 @@ noRepo, next, stop,+ stopUnless, prepCommand, doCommand, whenAnnexed,- notAnnexed,+ ifAnnexed, notBareRepo, isBareRepo, autoCopies,@@ -49,6 +50,12 @@ stop :: Annex (Maybe a) stop = return Nothing +{- Stops unless a condition is met. -}+stopUnless :: Annex Bool -> Annex (Maybe a) -> Annex (Maybe a)+stopUnless c a = do+ ok <- c+ if ok then a else stop+ {- Prepares to run a command via the check and seek stages, returning a - list of actions to perform to run the command. -} prepCommand :: Command -> [String] -> Annex [CommandCleanup]@@ -71,10 +78,10 @@ {- Modifies an action to only act on files that are already annexed, - and passes the key and backend on to it. -} whenAnnexed :: (FilePath -> (Key, Backend Annex) -> Annex (Maybe a)) -> FilePath -> Annex (Maybe a)-whenAnnexed a file = maybe (return Nothing) (a file) =<< Backend.lookupFile file+whenAnnexed a file = ifAnnexed file (a file) (return Nothing) -notAnnexed :: FilePath -> Annex (Maybe a) -> Annex (Maybe a)-notAnnexed file a = maybe a (const $ return Nothing) =<< Backend.lookupFile file+ifAnnexed :: FilePath -> ((Key, Backend Annex) -> Annex a) -> Annex a -> Annex a+ifAnnexed file yes no = maybe no yes =<< Backend.lookupFile file notBareRepo :: Annex a -> Annex a notBareRepo a = do
Command/Add.hs view
@@ -29,13 +29,21 @@ - moving it into the annex directory and setting up the symlink pointing - to its content. -} start :: BackendFile -> CommandStart-start p@(_, file) = notBareRepo $ notAnnexed file $ do- s <- liftIO $ getSymbolicLinkStatus file- if isSymbolicLink s || not (isRegularFile s)- then stop- else do+start p@(_, file) = notBareRepo $ ifAnnexed file fixup add+ where+ add = do+ s <- liftIO $ getSymbolicLinkStatus file+ if isSymbolicLink s || not (isRegularFile s)+ then stop+ else do+ showStart "add" file+ next $ perform p+ fixup (key, _) = do+ -- fixup from an interrupted add; the symlink+ -- is present but not yet added to git showStart "add" file- next $ perform p+ liftIO $ removeFile file+ next $ next $ cleanup file key =<< inAnnex key perform :: BackendFile -> CommandPerform perform (backend, file) = Backend.genKey file backend >>= go
Command/AddUrl.hs view
@@ -45,18 +45,15 @@ let dummykey = Backend.URL.fromUrl url tmp <- fromRepo $ gitAnnexTmpLocation dummykey liftIO $ createDirectoryIfMissing True (parentDir tmp)- ok <- liftIO $ Url.download url tmp- if ok- then do- [(backend, _)] <- Backend.chooseBackends [file]- k <- Backend.genKey tmp backend- case k of- Nothing -> stop- Just (key, _) -> do- moveAnnex key tmp- setUrlPresent key url- next $ Command.Add.cleanup file key True- else stop+ stopUnless (liftIO $ Url.download url tmp) $ do+ [(backend, _)] <- Backend.chooseBackends [file]+ k <- Backend.genKey tmp backend+ case k of+ Nothing -> stop+ Just (key, _) -> do+ moveAnnex key tmp+ setUrlPresent key url+ next $ Command.Add.cleanup file key True nodownload :: String -> FilePath -> CommandPerform nodownload url file = do
Command/Drop.hs view
@@ -37,13 +37,9 @@ else startRemote file numcopies key remote startLocal :: FilePath -> Maybe Int -> Key -> CommandStart-startLocal file numcopies key = do- present <- inAnnex key- if present- then do- showStart "drop" file- next $ performLocal key numcopies- else stop+startLocal file numcopies key = stopUnless (inAnnex key) $ do+ showStart "drop" file+ next $ performLocal key numcopies startRemote :: FilePath -> Maybe Int -> Key -> Remote.Remote Annex -> CommandStart startRemote file numcopies key remote = do@@ -55,12 +51,9 @@ (remotes, trusteduuids) <- Remote.keyPossibilitiesTrusted key untrusteduuids <- trustGet UnTrusted let tocheck = Remote.remotesWithoutUUID remotes (trusteduuids++untrusteduuids)- success <- canDropKey key numcopies trusteduuids tocheck []- if success- then do- whenM (inAnnex key) $ removeAnnex key- next $ cleanupLocal key- else stop+ stopUnless (canDropKey key numcopies trusteduuids tocheck []) $ do+ whenM (inAnnex key) $ removeAnnex key+ next $ cleanupLocal key performRemote :: Key -> Maybe Int -> Remote.Remote Annex -> CommandPerform performRemote key numcopies remote = lockContent key $ do@@ -75,12 +68,9 @@ untrusteduuids <- trustGet UnTrusted let tocheck = filter (/= remote) $ Remote.remotesWithoutUUID remotes (have++untrusteduuids)- success <- canDropKey key numcopies have tocheck [uuid]- if success- then do- ok <- Remote.removeKey remote key- next $ cleanupRemote key remote ok- else stop+ stopUnless (canDropKey key numcopies have tocheck [uuid]) $ do+ ok <- Remote.removeKey remote key+ next $ cleanupRemote key remote ok where uuid = Remote.uuid remote
Command/DropKey.hs view
@@ -21,18 +21,11 @@ seek = [withKeys start] start :: Key -> CommandStart-start key = do- present <- inAnnex key- if not present- then stop- else do- checkforced- showStart "dropkey" (show key)- next $ perform key- where- checkforced = - unlessM (Annex.getState Annex.force) $- error "dropkey can cause data loss; use --force if you're sure you want to do this"+start key = stopUnless (inAnnex key) $ do+ unlessM (Annex.getState Annex.force) $+ error "dropkey can cause data loss; use --force if you're sure you want to do this"+ showStart "dropkey" (show key)+ next $ perform key perform :: Key -> CommandPerform perform key = lockContent key $ do
Command/DropUnused.hs view
@@ -73,6 +73,6 @@ then M.fromList . map parse . lines <$> liftIO (readFile f) else return M.empty where- parse line = (num, fromJust $ readKey $ tail rest)+ parse line = (num, fromJust $ readKey rest) where- (num, rest) = break (== ' ') line+ (num, rest) = separate (== ' ') line
Command/Fix.hs view
@@ -23,12 +23,9 @@ start :: FilePath -> (Key, Backend Annex) -> CommandStart start file (key, _) = do link <- calcGitLink file key- l <- liftIO $ readSymbolicLink file- if link == l- then stop- else do- showStart "fix" file- next $ perform file link+ stopUnless ((/=) link <$> liftIO (readSymbolicLink file)) $ do+ showStart "fix" file+ next $ perform file link perform :: FilePath -> FilePath -> CommandPerform perform file link = do
Command/Get.hs view
@@ -22,32 +22,24 @@ seek = [withNumCopies $ \n -> whenAnnexed $ start n] start :: Maybe Int -> FilePath -> (Key, Backend Annex) -> CommandStart-start numcopies file (key, _) = do- inannex <- inAnnex key- if inannex- then stop- else autoCopies key (<) numcopies $ do- from <- Annex.getState Annex.fromremote- case from of- Nothing -> go $ perform key- Just name -> do- -- get --from = copy --from- src <- Remote.byName name- ok <- Command.Move.fromOk src key- if ok- then go $ Command.Move.fromPerform src False key- else stop+start numcopies file (key, _) = stopUnless (not <$> inAnnex key) $+ autoCopies key (<) numcopies $ do+ from <- Annex.getState Annex.fromremote+ case from of+ Nothing -> go $ perform key+ Just name -> do+ -- get --from = copy --from+ src <- Remote.byName name+ stopUnless (Command.Move.fromOk src key) $+ go $ Command.Move.fromPerform src False key where go a = do showStart "get" file next a perform :: Key -> CommandPerform-perform key = do- ok <- getViaTmp key (getKeyFile key)- if ok- then next $ return True -- no cleanup needed- else stop+perform key = stopUnless (getViaTmp key $ getKeyFile key) $ do+ next $ return True -- no cleanup needed {- Try to find a copy of the file in one of the remotes, - and copy it to here. -}
Command/Map.hs view
@@ -138,15 +138,16 @@ -- The remotes will be relative to r', and need to be -- made absolute for later use.- let remotes = map (absRepo r') (Git.remotes r')+ remotes <- mapM (absRepo r') (Git.remotes r') let r'' = Git.remotesAdd r' remotes spider' (rs ++ remotes) (r'':known) -absRepo :: Git.Repo -> Git.Repo -> Git.Repo+{- Converts repos to a common absolute form. -}+absRepo :: Git.Repo -> Git.Repo -> Annex Git.Repo absRepo reference r- | Git.repoIsUrl reference = Git.localToUrl reference r- | otherwise = r+ | Git.repoIsUrl reference = return $ Git.localToUrl reference r+ | otherwise = liftIO $ Git.repoFromAbsPath =<< absPath (Git.workTree r) {- Checks if two repos are the same. -} same :: Git.Repo -> Git.Repo -> Bool@@ -202,7 +203,7 @@ "git config --list" dir = Git.workTree r cddir- | take 2 dir == "/~" =+ | "/~" `isPrefixOf` dir = let (userhome, reldir) = span (/= '/') (drop 1 dir) in "cd " ++ userhome ++ " && cd " ++ shellEscape (drop 1 reldir) | otherwise = "cd " ++ shellEscape dir
Command/Migrate.hs view
@@ -58,22 +58,18 @@ cleantmp tmpfile case k of Nothing -> stop- Just (newkey, _) -> do- ok <- link src newkey- if ok- then do- -- Update symlink to use the new key.- liftIO $ removeFile file+ Just (newkey, _) -> stopUnless (link src newkey) $ do+ -- Update symlink to use the new key.+ liftIO $ removeFile file - -- If the old key had some- -- associated urls, record them for- -- the new key as well.- urls <- getUrls oldkey- unless (null urls) $- mapM_ (setUrlPresent newkey) urls+ -- If the old key had some+ -- associated urls, record them for+ -- the new key as well.+ urls <- getUrls oldkey+ unless (null urls) $+ mapM_ (setUrlPresent newkey) urls - next $ Command.Add.cleanup file newkey True- else stop+ next $ Command.Add.cleanup file newkey True where cleantmp t = liftIO $ whenM (doesFileExist t) $ removeFile t link src newkey = getViaTmpUnchecked newkey $ \t -> do
Command/Move.hs view
@@ -108,17 +108,11 @@ fromStart :: Remote.Remote Annex -> Bool -> FilePath -> Key -> CommandStart fromStart src move file key | move = go- | otherwise = do- ishere <- inAnnex key- if ishere then stop else go+ | otherwise = stopUnless (not <$> inAnnex key) go where- go = do- ok <- fromOk src key- if ok- then do- showMoveAction move file- next $ fromPerform src move key- else stop+ go = stopUnless (fromOk src key) $ do+ showMoveAction move file+ next $ fromPerform src move key fromOk :: Remote.Remote Annex -> Key -> Annex Bool fromOk src key = do u <- getUUID
Command/Status.hs view
@@ -191,9 +191,8 @@ keys <- lift (Command.Unused.staleKeys dirspec) if null keys then nostat- else do- stat label $ json (++ aside "clean up with git-annex unused") $- return $ keySizeSum $ S.fromList keys+ else stat label $ json (++ aside "clean up with git-annex unused") $+ return $ keySizeSum $ S.fromList keys aside :: String -> String aside s = " (" ++ s ++ ")"
+ Command/Sync.hs view
@@ -0,0 +1,70 @@+{- git-annex command+ -+ - Copyright 2011 Joey Hess <joey@kitenet.net>+ -+ - Licensed under the GNU GPL version 3 or higher.+ -}++module Command.Sync where++import Common.Annex+import Command+import qualified Annex.Branch+import qualified Git++import qualified Data.ByteString.Lazy.Char8 as L++def :: [Command]+def = [command "sync" paramPaths seek "synchronize local repository with remote"]++-- syncing involves several operations, any of which can independantly fail+seek :: [CommandSeek]+seek = map withNothing [commit, pull, push]++commit :: CommandStart+commit = do+ showStart "commit" ""+ next $ next $ do+ showOutput+ -- Commit will fail when the tree is clean, so ignore failure.+ _ <- inRepo $ Git.runBool "commit" [Param "-a", Param "-m", Param "sync"]+ return True++pull :: CommandStart+pull = do+ remote <- defaultRemote+ showStart "pull" remote+ next $ next $ do+ showOutput+ checkRemote remote+ inRepo $ Git.runBool "pull" [Param remote]++push :: CommandStart+push = do+ remote <- defaultRemote+ showStart "push" remote+ next $ next $ do+ Annex.Branch.update+ showOutput+ inRepo $ Git.runBool "push" [Param remote, matchingbranches]+ where+ -- git push may be configured to not push matching+ -- branches; this should ensure it always does.+ matchingbranches = Param ":"++-- the remote defaults to origin when not configured+defaultRemote :: Annex String+defaultRemote = do+ branch <- currentBranch+ fromRepo $ Git.configGet ("branch." ++ branch ++ ".remote") "origin"++currentBranch :: Annex String+currentBranch = last . split "/" . L.unpack . head . L.lines <$>+ inRepo (Git.pipeRead [Param "symbolic-ref", Param "HEAD"])++checkRemote :: String -> Annex ()+checkRemote remote = do+ remoteurl <- fromRepo $+ Git.configGet ("remote." ++ remote ++ ".url") ""+ when (null remoteurl) $ do+ error $ "No url is configured for the remote: " ++ remote
Command/Unannex.hs view
@@ -10,7 +10,6 @@ import Common.Annex import Command import qualified Annex-import qualified Annex.Queue import Utility.FileMode import Logs.Location import Annex.Content@@ -23,23 +22,10 @@ seek :: [CommandSeek] seek = [withFilesInGit $ whenAnnexed start] -{- The unannex subcommand undoes an add. -} start :: FilePath -> (Key, Backend Annex) -> CommandStart-start file (key, _) = do- ishere <- inAnnex key- if ishere- then do- force <- Annex.getState Annex.force- unless force $ do- top <- fromRepo Git.workTree- staged <- inRepo $ LsFiles.staged [top]- unless (null staged) $- error "This command cannot be run when there are already files staged for commit."- Annex.changeState $ \s -> s { Annex.force = True }-- showStart "unannex" file- next $ perform file key- else stop+start file (key, _) = stopUnless (inAnnex key) $ do+ showStart "unannex" file+ next $ perform file key perform :: FilePath -> Key -> CommandPerform perform file key = next $ cleanup file key@@ -47,9 +33,17 @@ cleanup :: FilePath -> Key -> CommandCleanup cleanup file key = do liftIO $ removeFile file- inRepo $ Git.run "rm" [Params "--quiet --", File file]- -- git rm deletes empty directories; put them back- liftIO $ createDirectoryIfMissing True (parentDir file)+ -- git rm deletes empty directory without --cached+ inRepo $ Git.run "rm" [Params "--cached --quiet --", File file]+ + -- If the file was already committed, it is now staged for removal.+ -- Commit that removal now, to avoid later confusing the+ -- pre-commit hook if this file is later added back to+ -- git as a normal, non-annexed file.+ whenM (not . null <$> inRepo (LsFiles.staged [file])) $ do+ inRepo $ Git.run "commit" [+ Param "-m", Param "content removed from git annex",+ Param "--", File file] fast <- Annex.getState Annex.fast if fast@@ -62,10 +56,5 @@ else do fromAnnex key file logStatus key InfoMissing- - -- Commit staged changes at end to avoid confusing the- -- pre-commit hook if this file is later added back to- -- git as a normal, non-annexed file.- Annex.Queue.add "commit" [Param "-m", Param "content removed from git annex"] []- + return True
Command/Unused.hs view
@@ -152,13 +152,12 @@ (S.fromList l) where -- Skip the git-annex branches, and get all other unique refs.- refs = map Git.Ref . - map last .+ refs = map (Git.Ref . last) . nubBy cmpheads . filter ourbranches . map words . lines . L.unpack cmpheads a b = head a == head b- ourbranchend = '/' : show (Annex.Branch.name)+ ourbranchend = '/' : show Annex.Branch.name ourbranches ws = not $ ourbranchend `isSuffixOf` last ws removewith [] s = return $ S.toList s removewith (a:as) s
Config.hs view
@@ -79,9 +79,10 @@ {- If a value is specified, it is used; otherwise the default is looked up - in git config. forcenumcopies overrides everything. -} getNumCopies :: Maybe Int -> Annex Int-getNumCopies v = - Annex.getState Annex.forcenumcopies >>= maybe (use v) (return . id)+getNumCopies v = perhaps (use v) =<< Annex.getState Annex.forcenumcopies where use (Just n) = return n- use Nothing = read <$> fromRepo (Git.configGet config "1")+ use Nothing = perhaps (return 1) =<< + readMaybe <$> fromRepo (Git.configGet config "1")+ perhaps fallback = maybe fallback (return . id) config = "annex.numcopies"
Git.hs view
@@ -345,7 +345,7 @@ urlPort r = case urlAuthPart uriPort r of ":" -> Nothing- (':':p) -> Just (read p)+ (':':p) -> readMaybe p _ -> Nothing {- Hostname of an URL repo, including any username (ie, "user@host") -}@@ -463,8 +463,8 @@ shaSize = 40 {- Commits the index into the specified branch (or other ref), - - with the specified parent refs. -}-commit :: String -> Ref -> [Ref] -> Repo -> IO ()+ - with the specified parent refs, and returns the new ref -}+commit :: String -> Ref -> [Ref] -> Repo -> IO Ref commit message newref parentrefs repo = do tree <- getSha "write-tree" $ asString $ pipeRead [Param "write-tree"] repo@@ -473,6 +473,7 @@ (map Param $ ["commit-tree", show tree] ++ ps) (L.pack message) repo run "update-ref" [Param $ show newref, Param $ show sha] repo+ return sha where ignorehandle a = snd <$> a asString a = L.unpack <$> a@@ -507,11 +508,7 @@ configParse :: String -> M.Map String String configParse s = M.fromList $ map pair $ lines s where- pair l = (key l, val l)- key l = head $ keyval l- val l = join sep $ drop 1 $ keyval l- keyval l = split sep l :: [String]- sep = "="+ pair = separate (== '=') {- Calculates a list of a repo's configured remotes, by parsing its config. -} configRemotes :: Repo -> IO [Repo]@@ -550,13 +547,11 @@ scpstyle v = ":" `isInfixOf` v && not ("//" `isInfixOf` v) scptourl v = "ssh://" ++ host ++ slash dir where- bits = split ":" v- host = head bits- dir = join ":" $ drop 1 bits- slash d | d == "" = "/~/" ++ dir- | head d == '/' = dir- | head d == '~' = '/':dir- | otherwise = "/~/" ++ dir+ (host, dir) = separate (== ':') v+ slash d | d == "" = "/~/" ++ d+ | "/" `isPrefixOf` d = d+ | "~" `isPrefixOf` d = '/':d+ | otherwise = "/~/" ++ d {- Checks if a string from git config is a true value. -} configTrue :: String -> Bool
Git/UnionMerge.hs view
@@ -48,7 +48,7 @@ - earlier ones, so the list can be generated from any combination of - ls_tree, merge_trees, and merge_tree_index. -} update_index :: Repo -> [String] -> IO ()-update_index repo ls = stream_update_index repo [\s -> mapM_ s ls]+update_index repo ls = stream_update_index repo [(`mapM_` ls)] {- Streams content into update-index. -} stream_update_index :: Repo -> [Streamer] -> IO ()
GitAnnex.hs view
@@ -47,6 +47,7 @@ import qualified Command.Untrust import qualified Command.Semitrust import qualified Command.Dead+import qualified Command.Sync import qualified Command.AddUrl import qualified Command.Map import qualified Command.Upgrade@@ -61,6 +62,8 @@ , Command.Copy.def , Command.Unlock.def , Command.Lock.def+ , Command.Sync.def+ , Command.AddUrl.def , Command.Init.def , Command.Describe.def , Command.InitRemote.def@@ -72,7 +75,6 @@ , Command.Untrust.def , Command.Semitrust.def , Command.Dead.def- , Command.AddUrl.def , Command.FromKey.def , Command.DropKey.def , Command.Fix.def
Locations.hs view
@@ -20,6 +20,8 @@ gitAnnexUnusedLog, gitAnnexJournalDir, gitAnnexJournalLock,+ gitAnnexIndex,+ gitAnnexIndexLock, isLinkToAnnex, annexHashes, hashDirMixed,@@ -80,16 +82,15 @@ | Git.repoIsLocalBare r = {- Bare repositories default to hashDirLower for new - content, as it's more portable. -}- go (Git.workTree r) (annexLocations key)+ check (map inrepo $ annexLocations key) | otherwise = {- Non-bare repositories only use hashDirMixed, so - don't need to do any work to check if the file is - present. -}- return $ Git.workTree r </> ".git" </>- annexLocation key hashDirMixed+ return $ inrepo ".git" </> annexLocation key hashDirMixed where- go dir locs = fromMaybe (dir </> head locs) <$> check dir locs- check dir = firstM $ \f -> doesFileExist $ dir </> f+ inrepo d = Git.workTree r </> d+ check locs = fromMaybe (head locs) <$> firstM doesFileExist locs {- The annex directory of a repository. -} gitAnnexDir :: Git.Repo -> FilePath@@ -131,6 +132,14 @@ {- Lock file for the journal. -} gitAnnexJournalLock :: Git.Repo -> FilePath gitAnnexJournalLock r = gitAnnexDir r </> "journal.lck"++{- .git/annex/index is used to stage changes to the git-annex branch -}+gitAnnexIndex :: Git.Repo -> FilePath+gitAnnexIndex r = gitAnnexDir r </> "index"++{- Lock file for .git/annex/index. -}+gitAnnexIndexLock :: Git.Repo -> FilePath+gitAnnexIndexLock r = gitAnnexDir r </> "index.lck" {- Checks a symlink target to see if it appears to point to annexed content. -} isLinkToAnnex :: FilePath -> Bool
Logs/UUID.hs view
@@ -55,15 +55,15 @@ | otherwise = (k, v) where kuuid = fromUUID k- isbad = (not $ isuuid kuuid) && isuuid lastword+ isbad = not (isuuid kuuid) && isuuid lastword ws = words $ value v lastword = last ws fixeduuid = toUUID lastword- fixedvalue = unwords $ kuuid:(take (length ws - 1) ws)+ fixedvalue = unwords $ kuuid: init ws -- For the fixed line to take precidence, it should be -- slightly newer, but only slightly. newertime (LogEntry (Date d) _) = d + minimumPOSIXTimeSlice- newertime (LogEntry (Unknown) _) = minimumPOSIXTimeSlice+ newertime (LogEntry Unknown _) = minimumPOSIXTimeSlice minimumPOSIXTimeSlice = 0.000001 isuuid s = length s == 36 && length (split "-" s) == 5
Remote/Bup.hs view
@@ -182,7 +182,7 @@ - local bup repositories to see if they are available, and getting their - uuid (which may be different from the stored uuid for the bup remote). -- - If a bup repository is not available, returns a dummy uuid of "".+ - If a bup repository is not available, returns NoUUID. - This will cause checkPresent to indicate nothing from the bup remote - is known to be present. -
Remote/Git.hs view
@@ -165,7 +165,7 @@ onLocal r a = do -- Avoid re-reading the repository's configuration if it was -- already read.- state <- if (M.null $ Git.configMap r)+ state <- if M.null $ Git.configMap r then Annex.new r else return $ Annex.newState r Annex.eval state $ do@@ -210,6 +210,7 @@ params <- rsyncParams r -- run copy from perspective of remote liftIO $ onLocal r $ do+ ensureInitialized ok <- Annex.Content.getViaTmp key $ rsyncOrCopyFile params keysrc Annex.Content.saveState
Remote/Helper/Encryptable.hs view
@@ -61,19 +61,22 @@ withkey a k = cip k >>= maybe (a k) (a . snd) cip = cipherKey c -{- Gets encryption Cipher. The decrypted Cipher is cached in the Annex+{- Gets encryption Cipher. The decrypted Ciphers are cached in the Annex - state. -} remoteCipher :: RemoteConfig -> Annex (Maybe Cipher)-remoteCipher c = maybe expensive cached =<< Annex.getState Annex.cipher+remoteCipher c = go $ extractCipher c where- cached cipher = return $ Just cipher- expensive = case extractCipher c of- Nothing -> return Nothing- Just encipher -> do- showNote "gpg"- cipher <- liftIO $ decryptCipher c encipher- Annex.changeState (\s -> s { Annex.cipher = Just cipher })- return $ Just cipher+ go Nothing = return Nothing+ go (Just encipher) = do+ cache <- Annex.getState Annex.ciphers+ case M.lookup encipher cache of+ Just cipher -> return $ Just cipher+ Nothing -> decrypt encipher cache+ decrypt encipher cache = do+ showNote "gpg"+ cipher <- liftIO $ decryptCipher c encipher+ Annex.changeState (\s -> s { Annex.ciphers = M.insert encipher cipher cache })+ return $ Just cipher {- Gets encryption Cipher, and encrypted version of Key. -} cipherKey :: Maybe RemoteConfig -> Key -> Annex (Maybe (Cipher, Key))
Types/Crypto.hs view
@@ -11,5 +11,7 @@ newtype Cipher = Cipher String data EncryptedCipher = EncryptedCipher String KeyIds+ deriving (Ord, Eq) newtype KeyIds = KeyIds [String]+ deriving (Ord, Eq)
Upgrade/V2.hs view
@@ -53,7 +53,7 @@ when e $ do inRepo $ Git.run "rm" [Param "-r", Param "-f", Param "-q", File old]- unless bare $ inRepo $ gitAttributesUnWrite+ unless bare $ inRepo gitAttributesUnWrite showProgress unless bare push
+ Utility/BadPrelude.hs view
@@ -0,0 +1,28 @@+{- Some stuff from Prelude should not be used, as it tends to be a source+ - of bugs.+ -+ - This exports functions that conflict with the prelude, which avoids+ - them being accidentially used.+ -}++module Utility.BadPrelude where++{- head is a partial function; head [] is an error -}+head :: [a] -> a+head = Prelude.head++{- tail is also partial -}+tail :: [a] -> a+tail = Prelude.tail++{- init too -}+init :: [a] -> a+init = Prelude.init++{- last too -}+last :: [a] -> a+last = Prelude.last++{- read should be avoided, as it throws an error -}+read :: Read a => String -> a+read = Prelude.read
Utility/DataUnits.hs view
@@ -99,7 +99,7 @@ {- Do you yearn for the days when men were men and megabytes were megabytes? -} oldSchoolUnits :: [Unit]-oldSchoolUnits = map mingle $ zip storageUnits memoryUnits+oldSchoolUnits = zipWith (curry mingle) storageUnits memoryUnits where mingle (Unit _ a n, Unit s' _ _) = Unit s' a n
Utility/Directory.hs view
@@ -11,6 +11,7 @@ import System.Posix.Files import System.Directory import Control.Exception (throw)+import Control.Monad import Utility.SafeCommand import Utility.Conditional@@ -37,13 +38,11 @@ mv tmp _ = do ok <- boolSystem "mv" [Param "-f", Param src, Param tmp]- if ok- then return ()- else do- -- delete any partial- _ <- try $- removeFile tmp- rethrow+ unless ok $ do+ -- delete any partial+ _ <- try $+ removeFile tmp+ rethrow isdir f = do r <- try (getFileStatus f) case r of
Utility/Misc.hs view
@@ -27,6 +27,19 @@ ((x,_):_) -> Just x _ -> Nothing +{- Like break, but the character matching the condition is not included+ - in the second result list.+ -+ - separate (== ':') "foo:bar" = ("foo", "bar")+ - separate (== ':') "foobar" = ("foo, "")+ -}+separate :: (a -> Bool) -> [a] -> ([a], [a])+separate c l = unbreak $ break c l+ where+ unbreak r@(a, b)+ | null b = r+ | otherwise = (a, tail b)+ {- Catches IO errors and returns a Bool -} catchBoolIO :: IO Bool -> IO Bool catchBoolIO a = catchDefaultIO a False
configure.hs view
@@ -71,7 +71,7 @@ dotted = sum . mult 1 . reverse . extend 10 . map readi . split "." extend n l = l ++ replicate (n - length l) 0 mult _ [] = []- mult n (x:xs) = (n*x) : (mult (n*100) xs)+ mult n (x:xs) = (n*x) : mult (n*100) xs readi :: String -> Integer readi s = case reads s of ((x,_):_) -> x
debian/changelog view
@@ -1,3 +1,26 @@+git-annex (3.20111211) unstable; urgency=medium++ * Fix bug in last version in getting contents from bare repositories.+ * Ensure that git-annex branch changes are merged into git-annex's index,+ which fixes a bug that could cause changes that were pushed to the+ git-annex branch to get reverted. As a side effect, it's now safe+ for users to check out and commit changes directly to the git-annex+ branch.+ * map: Fix a failure to detect a loop when both repositories are local+ and refer to each other with relative paths.+ * Prevent key names from containing newlines.+ * add: If interrupted, add can leave files converted to symlinks but not+ yet added to git. Running the add again will now clean up this situtation.+ * Fix caching of decrypted ciphers, which failed when drop had to check+ multiple different encrypted special remotes.+ * unannex: Can be run on files that have been added to the annex, but not+ yet committed.+ * sync: New command that synchronises the local repository and default+ remote, by running git commit, pull, and push for you.+ * Version monad-control dependency in cabal file.++ -- Joey Hess <joeyh@debian.org> Sun, 11 Dec 2011 21:24:39 -0400+ git-annex (3.20111203) unstable; urgency=low * The VFAT filesystem on recent versions of Linux, when mounted with
+ doc/bugs/Can__39__t___34__git-annex_get__34___with_3.20111203.mdwn view
@@ -0,0 +1,27 @@+Hi there,++After updating to 3.20111203 (on Arch Linux) I noticed I was not able to use `git annex get` from a SSH remote (server running Arch Linux, same version of git-annex): "requested key is not present". Same behavior with current master (commit 6cf28585). I had no issue with the previous version (3.20111122).++On this server, I was able to track down the issue using `git-annex-shell inannex` and `strace`:++ $ strace -f -o log git-annex-shell inannex ~/photos-annex.git WORM-s369360-m1321602916--2011-11-17.jpg + $ echo $?+ 1+ $ tail -n20 log+ [...]+ 25623 chdir("/home/schnouki/git-annex") = 0+ 25623 stat("/home/schnouki/photos-annex.git/annex/objects/082/676/WORM-s369360-m1321602916--2011-11-17.jpg/WORM-s369360-m1321602916--2011-11-17.jpg", {st_mode=S_IFREG|0400, st_size=369360, ...}) = 0+ 25623 open("annex/objects/082/676/WORM-s369360-m1321602916--2011-11-17.jpg/WORM-s369360-m1321602916--2011-11-17.jpg", O_RDONLY) = -1 ENOENT (No such file or directory)+ [...]++Note there is a call to `stat()` with the full path to the requested file, and *then* a call to `open()` with a relative path -- which calls this call to fail, and git-annex-shell to return 1. With 3.20111122, there was no call to `stat()`, just a successful call to `open()` with a full absolute path.++Using `git bisect` I was able to determine that this bug appeared in commit 64672c62 ("refactor"). Reverting it makes `git-annex-shell` work as expected, but I'm sure there are better ways to fix this. However I don't know enough Haskell to do it myself.++Could you please try to fix this in a future version?++> Thanks for a very good bug report. +> +> I've fixed this stupid mistake introduced in the code refactoring.+> [[done]]+> --[[Joey]]
+ doc/bugs/bad_behaviour_with_file_names_with_newline_in_them.mdwn view
@@ -0,0 +1,5 @@+Found this out the hard way. See the comment in the below post for what happens.++[[/forum/git_annex_add_crash_and_subsequent_recovery/]]++> [[fixed|done]] --[[Joey]]
+ doc/bugs/git-annex_branch_corruption.mdwn view
@@ -0,0 +1,95 @@+Below is a test case which shows a way that the git-annex branch+can become corrupted and lose data, including location log records and+uuid.log lines.++At the end, a commit on the git-annex branch removes one of the 2 lines+from the uuid.log; which should never happen.++The actual problem occurs earlier, at the "push point". Here a repo is+cloned from the main one, initialized (adding the last uuid.log line),+and then pushed back to the main one. That push is a fast-forward, so is+allowed to directly update the git-annex branch in the main repo:++ b884fe5..c497739 git-annex -> git-annex++Now the git-annex branch has a change that is not reflected in+`.git/annex/index`, so the next time a change is made, it's committed+using the out of date index, which causes a reversion of the changes+that were pushed to the branch.++---++## Thoughts++This is essentially the same reason why git blocks pushes to the checked-out+branch of a non-bare repository. ++This problem only affects workflows that involve pushing. Pulling workflows+do not directly update the local git-annex branch, so avoid the problem.++And while bare repos are pushed to, they rarely have changes made directly+to their git-annex branches, so while I think the same problem could+happen with pushing to a bare repo, it's unlikely.++None of which is to say this is not a bad bug that needs to be comprehensively+fixed. ++Probably git-annex needs to record which ref of the git-annex branch+corresponds to its index, and if the branch is at a different ref,+merge it into the index.++> And now that's [[done]]. I managed to do it with very little slowdown.+> +> A side benefit is that users can now safely check out the git-annex+> branch and commit changes to it, and git-annex will notice them.+> Before, it was documented to ignore such changes.+> --[[Joey]] ++---++## Workaround++Users who want to prevent this bug from occuring when pushing to their+non-bare repositories can install this script as `.git/hooks/update`++<pre>+#!/bin/sh+if [ "$1" = refs/heads/git-annex ]; then+ exit 1+fi+</pre>++--[[Joey]] ++---++## Test Case+<pre>+#!/bin/sh+mkdir annextest+cd annextest++git init dir1+cd dir1+git annex init+touch foo +echo hi > bar+git annex add+git commit -m add++cd ..+git clone dir1 dir2+cd dir2+git annex init otherdir+git annex get+# push point+git push++cd ..+cd dir1+echo "before"+git show git-annex:uuid.log+git annex drop foo --force+echo "after"+git show git-annex:uuid.log+</pre>
+ doc/bugs/git-annex_branch_push_race.mdwn view
@@ -0,0 +1,45 @@+The fix for the [[git-annex_branch_corruption]] bug is subject to a race.+With that fix, git-annex does this when committing a change to the branch:++1. lock the journal file (this avoids git-annex racing itself, FWIW)+2. check what the head of the branch points to, to see if a newer branch+ has appeared+3. if so, updates the index file from the branch+4. stages changes in the index+5. commits to the branch using the index file++If a push to the branch comes in during 2-5, then+[[git-annex_branch_corruption]] could still occur.++---++## approach 1, using locking++Add an update hook and a post-update hook. The update hook+will use locking to ensure that no git-annex is currently running+a commit, and block any git-annex's from starting one. It+will background itself, and remain running during the push.+The post-update hook will signal it to exit.++I don't like this approach much, since it involves a daemon, two hooks,+and lots of things to go wrong. And it blocks using git-annex during a+push. This approach should be a last resort.++## approach 2, lockless method++After a commit is made to the branch, check to see if the parent of+the commit is the same ref that the index file was last updated to. If it's+not, then the race occurred.++How to recover from the race? Well, just union merging the parent of the+commit into the index file and re-committing should work, I think. When+the race occurs, the commit reverts its parent's changes, and this will+redo them. ++(Of course, this re-commit will also be subject to the race, and+will need the same check for the race as the other commits. It won't loop+forever, I hope.)++> [[done]] and tested.++--[[Joey]]
+ doc/bugs/git-annex_losing_rsync_remotes_with_encryption_enabled.mdwn view
@@ -0,0 +1,101 @@+Somehow git-annex has again lost a complete rsync remote with encryption enabled...++git-annex version was 3.20111111++> "once again" ? When did it do it before?++>> It's the second time i uploaded all the files to an encrypted rsync remote and git-annex is not able to find it anymore. --[[gebi]]++> "lost" ? How is the remote lost?++>> git-annex is not able to find any files on the encrypted rsync remote anymore.+>> Copy does not copy the content again but drop doesn't find it, thus it's somehow "lost" and in an strange state.+>> I've also had the state where the content was already on the remote side but git-annex copy would copy it again,+>> ignoring all the data on the remote side. --[[gebi]]++Both *remoteserver* and *localserver* are rsync remotes with enabled encryption.+All commands are executed on the git repository on my laptop.+Target of origin is a gitolite repository without annex support (thus the two rsync remotes).++Is there a way in git-annex to verify that all files fullfill the numcopies, in my case+numcopies=2, and can be read from the remotes their are on?+I thought that *copy* would verify that, but seems not.+ + % g a copy --to remoteserver tools+ copy tools/md5_sha1_utility.exe (gpg) (checking remoteserver...) ok+ copy tools/win32diskimager-RELEASE-0.2-r23-win32.zip (checking remoteserver...) ok+ + % g a copy --to localserver tools+ copy tools/md5_sha1_utility.exe (gpg) (checking localserver...) ok+ copy tools/win32diskimager-RELEASE-0.2-r23-win32.zip (checking localserver...) ok+ + % g a drop tools+ drop tools/md5_sha1_utility.exe (gpg) (checking localserver...) (checking remoteserver...) (unsafe)+ Could only verify the existence of 1 out of 2 necessary copies+ + Try making some of these repositories available:+ 718a9b5c-1b4a-11e1-8211-6f094f20e050 -- remoteserver (remote backupserver)+ + (Use --force to override this check, or adjust annex.numcopies.)+ failed+ drop tools/win32diskimager-RELEASE-0.2-r23-win32.zip (checking localserver...) (checking remoteserver...) (unsafe)+ Could only verify the existence of 1 out of 2 necessary copies+ + Try making some of these repositories available:+ 718a9b5c-1b4a-11e1-8211-6f094f20e050 -- remoteserver (remote backupserver)+ + (Use --force to override this check, or adjust annex.numcopies.)+ failed+ git-annex: drop: 2 failed+ + % g a fsck tools+ fsck tools/md5_sha1_utility.exe (checksum...) ok+ fsck tools/win32diskimager-RELEASE-0.2-r23-win32.zip (checksum...) ok++> Copy does do an explicit check that the content is present on remoteserver,+> and based on the above, the content was found to be already there,+> which is why it did not copy it again.+> +> Drop does an indentical check that the content is present, and +> since it failed to find it, I am left thinking something must have+> happened to the remove in between the copy and the drop to cause the+> content to go away.+> +> What happens if you copy the data to remoteserver again? --[[Joey]]++The commands above are executed within a few seconds and completely repeatable. --[[gebi]]++> In that case, why don't you run the commands with `-d` to see the actual+> rsync command it's running to check if the content is present. +> Then you can try repeatedly running the command by hand and see why it+> sometimes succeeds and sometimes fail.++The commands fail and succeed consistently, not either or.+git annex copy succeeds consistently with not copying the content to remote because it checks and it's already there.++git annex drop fails consistently with error because content is missing on the exact same remote git annex copy checks+and thinks the content is there. --[[gebi]]++> The command will be something like this:+> `rsync --quiet hostname:/dir/file 2>/dev/null`+> +> The exit status is what's used to see if content is present -- and+> currently any failure even a failure to connect is taken to mean it's not+> present. --[[Joey]]++hm... thats interesting, git annex drop and git annex copy check for different hashes on the same file at the same remote...++git annex drop -d tools/md5_sha1_utility.exe+> Running: sh ["-c","rsync --quiet 'REMOVED_HOST:annex/work/JF/z7/'\"'\"'GPGHMACSHA1--7ffb3840f0e37aee964352e98808403655e8473a/GPGHMACSHA1--7ffb3840f0e37aee964352e98808403655e8473a'\"'\"'' 2>/dev/null"]++git annex copy --to remoteserver -d tools/md5_sha1_utility.exe+> Running: sh ["-c","rsync --quiet 'REMOVED_HOST:annex/work/1F/PQ/'\"'\"'GPGHMACSHA1--ff075e57f649300c5698e346be74fb6e22d70e35/GPGHMACSHA1--ff075e57f649300c5698e346be74fb6e22d70e35'\"'\"'' 2>/dev/null"]++And yes, only the hash *annex copy* is checking for exists on the remote side. --[[gebi]]++> Ok, this is due to too aggressive caching of the decrypted cipher+> for a remote. When dopping, it decrypts localserver's cipher, +> caches it, and then when checking remoteserver it says hey, +> here's an already decrypted cipher -- it must be the right one!+> +> Problem reproduced here, and fixed. [[done]] --[[Joey]]
+ doc/forum/git_annex_add_crash_and_subsequent_recovery.mdwn view
@@ -0,0 +1,25 @@+Perhaps stupidly I added some very large bare git repos into a git-annex.++This took a very long time, used lot's of memory, and then crashed. I didn't catch the error (which is annoying) - sorry about that. IIRC it is the same error if one Ctrl-c's the addition.++I ran `git annex add .` a second time and eventually killed it (I perhaps should have waited - I now think it was working).++A `git annex unannex` fixed up some files but somehow I managed to end up with tonnes of files all sym-linked into the git annex object directory but not somehow recognised as annexed files. I'm assuming that they somehow didn't make it into git annex's meta-data layer (or equivalent).++Commands such as `git annex {fsck,whereis,unannex} weirdfile` immediately returned without error.++I've now spent a lot of manual time copying the files back. Doing the following, not the cleverest but I was a little panicky about my data...++ find . -type l -exec mv \{} \{}.link \; #Move link names out of the way+ find . -type l -exec cp \{} \{}.cp \; #Copy follows links so we can copy target back to link location+ find . -type f -name "*.link.cp" | xargs -n 1 rename 's/\.link\.cp//' #Change to original name+ find . -type l -exec rm \{} \; #Ditch the links+ git annex unused+ git annex dropunused `seq 9228`++9228 files were found to be unused, this gives an idea of the scale of the number of "lost" files for want of a better term.++A pretty poor bug report as these things go. Anyone any idea what might have happened (it didn't seem space or memory related)? Or how I might have fixed it a little more cleverly?++For reference I am using stable Debian, git annex version 3.20111011.+
+ doc/forum/git_pull_remote_git-annex.mdwn view
@@ -0,0 +1,11 @@+I thought I'd followed the walk through when initially setting up my repos.++However I find that I have to do the following to sync my annex's.++ git pull remote master+ git checkout git-annex+ git pull remote git-annex+ git checkout master+ git annex get .++Has something gone wrong? I see no mention of syncing git-annex repos in the walk-through...
+ doc/forum/git_pull_remote_git-annex/comment_1_9c245db3518d8b889ecdf5115ad9e053._comment view
@@ -0,0 +1,36 @@+[[!comment format=mdwn+ username="http://joey.kitenet.net/"+ nickname="joey"+ subject="comment 1"+ date="2011-12-06T16:43:29Z"+ content="""+You're taking a very long and strange way to a place that you can reach as follows:++<pre>+git pull remote+git annex get .+</pre>++Which is just as shown in [[walkthrough/getting_file_content]]. ++In particular, \"git pull remote\" first fetches all branches from the remote, including the git-annex branch.+When you say \"git pull remote master\", you're preventing it from fetching the git-annex branch. +If for some reason you want the slightly longer way around, it is:++<pre>+git pull remote master+git fetch remote git-annex+git annex get .+</pre>++Or, eqivilantly but with less network connections:++<pre>+git fetch remote+git merge remote/master+git annex get .+</pre>++BTW, notice that this is all bog-standard git branch pulling stuff, not specific to git-annex in the least.+Consult your extensive and friendly git documentation for details. :)+"""]]
+ doc/forum/git_pull_remote_git-annex/comment_2_0f7f4a311b0ec1d89613e80847e69b42._comment view
@@ -0,0 +1,14 @@+[[!comment format=mdwn+ username="https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU"+ nickname="Matt"+ subject="comment 2"+ date="2011-12-06T23:23:29Z"+ content="""+Doh! Total brain melt on my part. Thanks for the additional info. Not taking my time and reading things properly - kept assuming that the full remote pull failed due to the warning:++ You asked to pull from the remote 'rss', but did not specify+ a branch. Because this is not the default configured remote+ for your current branch, you must specify a branch on the command line.++Rookie mistake indeed.+"""]]
+ doc/forum/pure_git-annex_only_workflow.mdwn view
@@ -0,0 +1,46 @@+I’m using git annex to manage my movie collection on various devices – my laptop, a NSLU tucked away somewhere with lots of space, some external hard drives. For this use case, I do not need the full power of git as a version control system, so having to run "git commit" and coming up with commit messages is annoying. Also, this makes sense for a version control system, but not for my media collection:++ $ git annex add Hot\ Fuzz\ -\ English.mkv + add Hot Fuzz - English.mkv (checksum...) ok+ (Recording state in git...)+ $ git commit -m 'another movie added'+ [master 851dc8a] another movie added+ 1 files changed, 1 insertions(+), 0 deletions(-)+ create mode 120000 00 Noch nicht gesehen/Hot Fuzz - English.mkv+ $ git push jeff+ Counting objects: 38, done.+ Delta compression using up to 2 threads.+ Compressing objects: 100% (20/20), done.+ Writing objects: 100% (26/26), 2.00 KiB, done.+ Total 26 (delta 11), reused 0 (delta 0)+ remote: error: refusing to update checked out branch: refs/heads/master+ remote: error: By default, updating the current branch in a non-bare repository+ remote: error: is denied, because it will make the index and work tree inconsistent+ remote: error: with what you pushed, and will require 'git reset --hard' to match+ remote: error: the work tree to HEAD.+ remote: error: + remote: error: You can set 'receive.denyCurrentBranch' configuration variable to+ remote: error: 'ignore' or 'warn' in the remote repository to allow pushing into+ remote: error: its current branch; however, this is not recommended unless you+ remote: error: arranged to update its work tree to match what you pushed in some+ remote: error: other way.+ remote: error: + remote: error: To squelch this message and still keep the default behaviour, set+ remote: error: 'receive.denyCurrentBranch' configuration variable to 'refuse'.+ To jeff:/mnt/media/Movies+ ! [rejected] git-annex -> git-annex (non-fast-forward)+ ! [remote rejected] master -> master (branch is currently checked out)+ error: failed to push some refs to 'jeff:/mnt/media/Movies'+ To prevent you from losing history, non-fast-forward updates were rejected+ Merge the remote changes (e.g. 'git pull') before pushing again. See the+ 'Note about fast-forwards' section of 'git push --help' for details.++It seems that to successfully make the new files known to the other side, I have to log into jeff and pull _from_ my current machine. ++What I would like to have is that++* git annex add does not require a commit afterwards.+* Changes to the files are automatically picked up with the next git-annex call (similar to how etckeeper works).+* Commands "git annex push" and "git annex pull" that will sync the metadata (i.e. the list of files) in both directions without further manual intervention, at least not until the two repositories have diverged in a way that is not possible to merge sensible.++Summay: git-annex is great. git is not always. Please make it possible to use git annex without having to use git.
+ doc/forum/pure_git-annex_only_workflow/comment_1_a32f7efd18d174845099a4ed59e6feae._comment view
@@ -0,0 +1,32 @@+[[!comment format=mdwn+ username="http://joey.kitenet.net/"+ nickname="joey"+ subject="comment 1"+ date="2011-12-09T22:56:11Z"+ content="""+First, you need a bare git repository that you can push to, and pull from. This simplifies most git workflow.++Secondly, I use [mr](http://kitenet.net/~joey/code/mr/), with this in `.mrconfig`:++<pre>+[DEFAULT]+lib =+ annexupdate() {+ git commit -a -m update || true+ git pull \"$@\"+ git annex merge+ git push || true+ }++[lib/sound]+update = annexupdate+[lib/big]+update = annexupdate+</pre>++Which makes \"mr update\" in repositories where I rarely care about git details take care of syncing my changes.++I also make \"mr update\" do a \"git annex get\" of some files in some repositories that I want to always populate. git-annex and mr go well together. :)++Perhaps my annexupdate above should be available as \"git annex sync\"?+"""]]
+ doc/forum/pure_git-annex_only_workflow/comment_2_66dc9b65523a9912411db03c039ba848._comment view
@@ -0,0 +1,15 @@+[[!comment format=mdwn+ username="http://www.joachim-breitner.de/"+ nickname="nomeata"+ subject="comment 2"+ date="2011-12-10T16:28:29Z"+ content="""+Thanks for the tips so far. I guess a bare-only repo helps, but as well is something that I don’t _need_ (for my use case), any only have to do because git works like this.++Also, if I have a mobile device that I want to push to, then I’d have to have two repositories on the device, as I might not be able to reach my main bare repository when traveling, but I cannot push to the „real“ repo on the mobile device from my computer. I guess I am spoiled by darcs, which will happily push to a checked out +remote repository, updating the checkout if possible without conflict.++If I introduce a central bare repository to push to and from; I’d still have to have the other non-bare repos as remotes, so that git-annex will know about them and their files, right?++I’d appreciate a \"git annex sync\" that does what you described (commit all, pull, merge, push). Especially if it comes in a \"git annex sync --all\" variant that syncs all reachable repositories.+"""]]
+ doc/forum/pure_git-annex_only_workflow/comment_3_9b7d89da52f7ebb7801f9ec8545c3aba._comment view
@@ -0,0 +1,12 @@+[[!comment format=mdwn+ username="http://joey.kitenet.net/"+ nickname="joey"+ subject="comment 3"+ date="2011-12-10T19:43:04Z"+ content="""+Git can actually push into a non-bare repository, so long as the branch you change there is not a checked out one. Pushing into `remotes/$foo/master` and `remotes/$foo/git-annex` would work, however determining the value that the repository expects for `$foo` is something git cannot do on its own. And of course you'd still have to `git merge remotes/$foo/master` to get the changes. ++Yes, you still keep the non-bare repos as remotes when adding a bare repository, so git-annex knows how to get to them.++I've made `git annex sync` run the simple script above. Perhaps it can later be improved to sync all repositories.+"""]]
doc/git-annex-shell.mdwn view
@@ -78,4 +78,4 @@ <http://git-annex.branchable.com/> -Warning: this page is automatically made into a man page via [mdwn2man](http://git.ikiwiki.info/?p=ikiwiki;a=blob;f=mdwn2man;hb=HEAD). Edit with care+Warning: Automatically converted into a man page by mdwn2man. Edit with care
doc/git-annex.mdwn view
@@ -120,6 +120,17 @@ Use this to undo an unlock command if you don't want to modify the files, or have made modifications you want to discard. +* sync++ Use this command when you want to synchronize the local repository+ with its default remote (typically "origin"). The sync process involves+ first committing all local changes, then pulling and merging any changes+ from the remote, and finally pushing the repository's state to the remote.+ You can use standard git commands to do each of those steps by hand,+ or if you don't want to worry about the details, you can use sync.++ Note that sync does not transfer any file contents from or to the remote.+ * addurl [url ...] Downloads each url to a file, which is added to the annex.@@ -623,4 +634,4 @@ <http://git-annex.branchable.com/> -Warning: this page is automatically made into a man page via [mdwn2man](http://git.ikiwiki.info/?p=ikiwiki;a=blob;f=mdwn2man;hb=HEAD). Edit with care+Warning: Automatically converted into a man page by mdwn2man. Edit with care
doc/git-union-merge.mdwn view
@@ -35,4 +35,4 @@ <http://git-annex.branchable.com/> -Warning: this page is automatically made into a man page via [mdwn2man](http://git.ikiwiki.info/?p=ikiwiki;a=blob;f=mdwn2man;hb=HEAD). Edit with care+Warning: Automatically converted into a man page by mdwn2man. Edit with care
doc/internals.mdwn view
@@ -22,17 +22,9 @@ This branch is managed by git-annex, with the contents listed below. The file `.git/annex/index` is a separate git index file it uses-to accumulate changes for the git-annex. Also, `.git/annex/journal/` is used-to record changes before they are added to git.--Note that for speed reasons, git-annex assumes only it will modify this-branch. If you go in and make changes directly, it will probably revert-your changes in its next commit to the branch.--The best way to make changes to the git-annex branch is instead-to create a branch of it, with a name like "my/git-annex", and then-use "git annex merge" to automerge your branch into the main git-annex-branch.+to accumulate changes for the git-annex branch.+Also, `.git/annex/journal/` is used to record changes before they+are added to git. ### `uuid.log`
− doc/news/version_3.20111105.mdwn
@@ -1,27 +0,0 @@-git-annex 3.20111105 released with [[!toggle text="these changes"]]-[[!toggleable text="""- * The default backend used when adding files to the annex is changed- from WORM to SHA256.- To get old behavior, add a .gitattributes containing: * annex.backend=WORM- * Sped up some operations on remotes that are on the same host.- * copy --to: Fixed leak when copying many files to a remote on the same- host.- * uninit: Add guard against being run with the git-annex branch checked out.- * Fail if --from or --to is passed to commands that do not support them.- * drop --from is now supported to remove file content from a remote.- * status: Now always shows the current repository, even when it does not- appear in uuid.log.- * fsck: Now works in bare repositories. Checks location log information,- and file contents. Does not check that numcopies is satisfied, as- .gitattributes information about numcopies is not available in a bare- repository.- * unused, dropunused: Now work in bare repositories.- * Removed the setkey command, and added a reinject command with a more- useful interface.- * The fromkey command now takes the key as its first parameter. The --key- option is no longer used.- * Built without any filename containing .git being excluded. Closes: #[647215](http://bugs.debian.org/647215)- * Record uuid when auto-initializing a remote so it shows in status.- * Bugfix: Fixed git-annex init crash in a bare repository when there was- already an existing git-annex branch.- * Pass -t to rsync to preserve timestamps."""]]
+ doc/news/version_3.20111211.mdwn view
@@ -0,0 +1,20 @@+git-annex 3.20111211 released with [[!toggle text="these changes"]]+[[!toggleable text="""+ * Fix bug in last version in getting contents from bare repositories.+ * Ensure that git-annex branch changes are merged into git-annex's index,+ which fixes a bug that could cause changes that were pushed to the+ git-annex branch to get reverted. As a side effect, it's now safe+ for users to check out and commit changes directly to the git-annex+ branch.+ * map: Fix a failure to detect a loop when both repositories are local+ and refer to each other with relative paths.+ * Prevent key names from containing newlines.+ * add: If interrupted, add can leave files converted to symlinks but not+ yet added to git. Running the add again will now clean up this situtation.+ * Fix caching of decrypted ciphers, which failed when drop had to check+ multiple different encrypted special remotes.+ * unannex: Can be run on files that have been added to the annex, but not+ yet committed.+ * sync: New command that synchronises the local repository and default+ remote, by running git commit, pull, and push for you.+ * Version monad-control dependency in cabal file."""]]
+ doc/tips/using_git_annex_with_no_fixed_hostname_and_optimising_ssh.mdwn view
@@ -0,0 +1,72 @@+## Intro++This tip is based on my (Matt Ford) experience of using `git annex` with my out-and-about netbook which hits many different wifi networks and has no fixed home or address.++I'm not using a bare repository that allows pushing (an alternative solution) nor do I fancy allowing `git push` to run against my desktop checked out repository (perhaps I worry over nothing?)++None of this is really `git annex` specific but I think it is useful to know...++## Dealing with no fixed hostname++Essentially set up two repos as per the [[walkthrough]].++Desktop as follows:++ cd ~/annex+ git init+ git annex init "desktop"++And the laptop like this++ git clone ssh://desktop/annex+ git init+ git annex init "laptop"++Now we want to add the the repos as remotes of each other. ++For the laptop it is easy:++ git remote add desktop ssh://desktop/~/annex ++However for the desktop to add an ever changing laptops hostname it's a little tricky. We make use of remote SSH tunnels to do this. Essentially we have the laptop (which always knows it's own name and address and knows the address of the desktop) create a tunnel starting on an arbitrary port at the desktop and heads back to the laptop on it's own SSH server port (22).++To do this make part of your laptop's SSH config look like this:++ Host desktop+ User matt+ HostName desktop.example.org+ RemoteForward 2222 localhost:22++Now on the desktop to connect over the tunnel to the laptop's SSH port you need this:++ Host laptop+ User matt+ HostName localhost+ port 2222++So to add the desktop's remote:++a) From the laptop ensure the tunnel is up++ ssh desktop++b) From the desktop add the remote++ git remote add laptop ssh://laptop/~/annex++So now you can work on the train, pop on the wifi at work upon arrival, and sync up with a `git pull && git annex get`.++An alternative solution may be to use direct tunnels over Openvpn.++## Optimising SSH++Running a `git annex get .`, at least in the version I have, creates a new SSH connection for every file transfer (maybe this should be a feature request?)++Lot's of new small files in an _annex_ cause lot's of connections to be made quickly: this is an relatively expensive overhead and is enough for connection limiting to start in my case. The process can be made much faster by using SSH's connection sharing capabilities. An SSH config like this should do it:++ # Global Settings+ ControlMaster auto+ ControlPersist 30+ ControlPath ~/.ssh/master-%r@%h:%p++This will create a master connection for sharing if one isn't present, maintain it for 30 seconds after closing down the connection (just-in-cases') and automatically use the master connection for subsequent connections. Wins all round!
+ doc/todo/Please_abort_build_if___34__make_test__34___fails.mdwn view
@@ -0,0 +1,7 @@+A failure during "make test" should be signalled to the caller by means of+a non-zero exit code. Without that signal, it's very hard to run the+regression test suite in an automated fashion.++> git-annex used to have a Makefile that ignored make test exit status,+> but that was fixed in commit dab5bddc64ab4ad479a1104748c15d194e138847,+> in October 6th. [[done]] --[[Joey]]
+ doc/todo/Please_add_support_for_monad-control_0.3.x.mdwn view
@@ -0,0 +1,7 @@+Git-annex doesn't compile with the latest version of monad-control. Would it be hard to support that new version?++> I have been waiting for it to land in Debian before trying to +> deal with its changes.+> +> There is now a branch in git called `new-monad-control` that will build+> with the new monad-control. --[[Joey]]
+ doc/users/gebi.mdwn view
@@ -0,0 +1,1 @@+Michael Gebetsroither <michael@mgeb.org>
git-annex.cabal view
@@ -1,5 +1,5 @@ Name: git-annex-Version: 3.20111203+Version: 3.20111211 Cabal-Version: >= 1.6 License: GPL Maintainer: Joey Hess <joey@kitenet.net>@@ -7,7 +7,7 @@ Stability: Stable Copyright: 2010-2011 Joey Hess License-File: GPL-Extra-Source-Files: ./debian/NEWS ./debian/control ./debian/rules ./debian/manpages ./debian/changelog ./debian/doc-base ./debian/copyright ./debian/compat ./Messages/JSON.hs ./configure.hs ./Annex.hs ./Seek.hs ./Crypto.hs ./Common.hs ./README ./Command/Merge.hs ./Command/AddUrl.hs ./Command/Whereis.hs ./Command/Unlock.hs ./Command/Version.hs ./Command/FromKey.hs ./Command/PreCommit.hs ./Command/Map.hs ./Command/Unused.hs ./Command/Uninit.hs ./Command/Migrate.hs ./Command/Init.hs ./Command/ConfigList.hs ./Command/Trust.hs ./Command/Lock.hs ./Command/SendKey.hs ./Command/RecvKey.hs ./Command/Reinject.hs ./Command/Add.hs ./Command/Fix.hs ./Command/Untrust.hs ./Command/Dead.hs ./Command/InitRemote.hs ./Command/Semitrust.hs ./Command/Fsck.hs ./Command/Move.hs ./Command/DropUnused.hs ./Command/Get.hs ./Command/Upgrade.hs ./Command/Describe.hs ./Command/Drop.hs ./Command/DropKey.hs ./Command/InAnnex.hs ./Command/Find.hs ./Command/Unannex.hs ./Command/Status.hs ./Command/Copy.hs ./Init.hs ./Types.hs ./Common/Annex.hs ./Makefile ./git-annex.cabal ./Upgrade/V1.hs ./Upgrade/V2.hs ./Upgrade/V0.hs ./CHANGELOG ./Git/LsFiles.hs ./Git/UnionMerge.hs ./Git/CatFile.hs ./Git/Queue.hs ./Git/LsTree.hs ./doc/upgrades.mdwn ./doc/forum/Recommended_number_of_repositories.mdwn ./doc/forum/wishlist:_define_remotes_that_must_have_all_files.mdwn ./doc/forum/Will_git_annex_work_on_a_FAT32_formatted_key__63__.mdwn ./doc/forum/wishlist:_command_options_changes/comment_2_f6a637c78c989382e3c22d41b7fb4cc2._comment ./doc/forum/wishlist:_command_options_changes/comment_3_bf1114533d2895804e531e76eb6b8095._comment ./doc/forum/wishlist:_command_options_changes/comment_1_bfba72a696789bf21b2435dea15f967a._comment ./doc/forum/wishlist:_git-annex_replicate/comment_3_c13f4f9c3d5884fc6255fd04feadc2b1._comment ./doc/forum/wishlist:_git-annex_replicate/comment_1_9926132ec6052760cdf28518a24e2358._comment ./doc/forum/wishlist:_git-annex_replicate/comment_2_c43932f4194aba8fb2470b18e0817599._comment ./doc/forum/wishlist:_git-annex_replicate/comment_4_63f24abf086d644dced8b01e1a9948c9._comment ./doc/forum/Podcast_syncing_use-case/comment_1_ace6f9d3a950348a3ac0ff592b62e786._comment ./doc/forum/Podcast_syncing_use-case/comment_2_930a6620b4d516e69ed952f9da5371bb._comment ./doc/forum/Behaviour_of_fsck/comment_4_e4911dc6793f98fb81151daacbe49968._comment ./doc/forum/Behaviour_of_fsck/comment_3_97848f9a3db89c0427cfb671ba13300e._comment ./doc/forum/Behaviour_of_fsck/comment_2_ead36a23c3e6efa1c41e4555f93e014e._comment ./doc/forum/Behaviour_of_fsck/comment_1_0e40f158b3f4ccdcaab1408d858b68b8._comment ./doc/forum/incompatible_versions__63__/comment_1_629f28258746d413e452cbd42a1a43f4._comment ./doc/forum/Recommended_number_of_repositories/comment_1_3ef256230756be8a9679b107cdbfd018._comment ./doc/forum/migration_to_git-annex_and_rsync.mdwn ./doc/forum/hashing_objects_directories.mdwn ./doc/forum/git_annex_ls___47___metadata_in_git_annex_whereis.mdwn ./doc/forum/Podcast_syncing_use-case.mdwn ./doc/forum/hashing_objects_directories/comment_5_ef6cfd49d24c180c2d0a062e5bd3a0be._comment ./doc/forum/hashing_objects_directories/comment_1_c55c56076be4f54251b0b7f79f28a607._comment ./doc/forum/hashing_objects_directories/comment_2_504c96959c779176f991f4125ea22009._comment ./doc/forum/hashing_objects_directories/comment_3_9134bde0a13aac0b6a4e5ebabd7f22e8._comment ./doc/forum/hashing_objects_directories/comment_4_0de9170e429cbfea66f5afa8980d45ac._comment ./doc/forum/location_tracking_cleanup.mdwn ./doc/forum/Wishlist:_Ways_of_selecting_files_based_on_meta-information.mdwn ./doc/forum/confusion_with_remotes__44___map.mdwn ./doc/forum/git-annex_on_OSX.mdwn ./doc/forum/git_tag_missing_for_3.20111011/comment_1_7a53bf273f3078ab3351369ef2b5f2a6._comment ./doc/forum/version_3_upgrade/comment_1_05fc9c9cad26c520bebb98c852c71e35._comment ./doc/forum/example_of_massively_disconnected_operation.mdwn ./doc/forum/git-annex_communication_channels/comment_2_c7aeefa6ef9a2e75d8667b479ade1b7f._comment ./doc/forum/git-annex_communication_channels/comment_5_404b723a681eb93fee015cea8024b6bc._comment ./doc/forum/git-annex_communication_channels/comment_1_198325d2e9337c90f026396de89eec0e._comment ./doc/forum/git-annex_communication_channels/comment_4_1ba6ddf54843c17c7d19a9996f2ab712._comment ./doc/forum/git-annex_communication_channels/comment_6_0d87d0e26461494b1d7f8a701a924729._comment ./doc/forum/git-annex_communication_channels/comment_3_1ff08a3e0e63fa0e560cbc9602245caa._comment ./doc/forum/git-annex_communication_channels/comment_7_2c87c7a0648fe87c2bf6b4391f1cc468._comment ./doc/forum/wishlist:_git-annex_replicate.mdwn ./doc/forum/advantages_of_SHA__42___over_WORM/comment_1_96c354cac4b5ce5cf6664943bc84db1d._comment ./doc/forum/performance_improvement:_git_on_ssd__44___annex_on_spindle_disk.mdwn ./doc/forum/Behaviour_of_fsck.mdwn ./doc/forum/working_without_git-annex_commits.mdwn ./doc/forum/migrate_existing_git_repository_to_git-annex.mdwn ./doc/forum/__34__git_annex_lock__34___very_slow_for_big_repo.mdwn ./doc/forum/wishlist:_traffic_accounting_for_git-annex.mdwn ./doc/forum/rsync_over_ssh__63__.mdwn ./doc/forum/unannex_alternatives/comment_3_b1687fc8f9e7744327bbeb6f0635d1cd._comment ./doc/forum/unannex_alternatives/comment_1_dcd4cd41280b41512bbdffafaf307993._comment ./doc/forum/unannex_alternatives/comment_2_58a72a9fe0f58c7af0b4d7927a2dd21d._comment ./doc/forum/wishlist:_git_annex_status/comment_4_9aeeb83d202dc8fb33ff364b0705ad94._comment ./doc/forum/wishlist:_git_annex_status/comment_3_d1fd70c67243971c96d59e1ffb7ef6e7._comment ./doc/forum/wishlist:_git_annex_status/comment_2_c2b0ce025805b774dc77ce264a222824._comment ./doc/forum/wishlist:_git_annex_status/comment_1_994bfd12c5d82e08040d6116915c5090._comment ./doc/forum/wishlist:_command_options_changes.mdwn ./doc/forum/location_tracking_cleanup/comment_3_c15428cec90e969284a5e690fb4b2fde._comment ./doc/forum/location_tracking_cleanup/comment_2_e7395cb6e01f42da72adf71ea3ebcde4._comment ./doc/forum/location_tracking_cleanup/comment_1_7d6319e8c94dfe998af9cfcbf170efb2._comment ./doc/forum/new_microfeatures/comment_2_41ad904c68e89c85e1fc49c9e9106969._comment ./doc/forum/new_microfeatures/comment_1_058bd517c6fffaf3446b1f5d5be63623._comment ./doc/forum/new_microfeatures/comment_3_a1a9347b5bc517f2a89a8b292c3f8517._comment ./doc/forum/new_microfeatures/comment_7_94045b9078b1fff877933b012d1b49e2._comment ./doc/forum/new_microfeatures/comment_5_3c627d275586ff499d928a8f8136babf._comment ./doc/forum/new_microfeatures/comment_4_5a6786dc52382fff5cc42fdb05770196._comment ./doc/forum/new_microfeatures/comment_6_31ea08c008500560c0b96c6601bc6362._comment ./doc/forum/Error_while_adding_a_file___34__createSymbolicLink:_already_exists__34__.mdwn ./doc/forum/advantages_of_SHA__42___over_WORM.mdwn ./doc/forum/wishlist:_git_annex_put_--_same_as_get__44___but_for_defaults.mdwn ./doc/forum/OSX__39__s_default_sshd_behaviour_has_limited_paths_set.mdwn ./doc/forum/bainstorming:_git_annex_push___38___pull.mdwn ./doc/forum/sparse_git_checkouts_with_annex.mdwn ./doc/forum/Need_new_build_instructions_for_Debian_stable.mdwn ./doc/forum/batch_check_on_remote_when_using_copy.mdwn ./doc/forum/tips:_special__95__remotes__47__hook_with_tahoe-lafs.mdwn ./doc/forum/wishlist:alias_system.mdwn ./doc/forum/incompatible_versions__63__.mdwn ./doc/forum/wishlist:_git_backend_for_git-annex.mdwn ./doc/forum/seems_to_build_fine_on_haskell_platform_2011.mdwn ./doc/forum/rsync_over_ssh__63__/comment_1_ee21f32e90303e20339e0a568321bbbe._comment ./doc/forum/rsync_over_ssh__63__/comment_2_aa690da6ecfb2b30fc5080ad76dc77b1._comment ./doc/forum/wishlist:_special_remote_for_sftp_or_rsync.mdwn ./doc/forum/OSX__39__s_haskell-platform_statically_links_things.mdwn ./doc/forum/git_tag_missing_for_3.20111011.mdwn ./doc/forum/unannex_alternatives.mdwn ./doc/forum/can_git-annex_replace_ddm__63__.mdwn ./doc/forum/sparse_git_checkouts_with_annex/comment_2_e357db3ccc4079f07a291843975535eb._comment ./doc/forum/sparse_git_checkouts_with_annex/comment_1_c7dc199c5740a0e7ba606dfb5e3e579a._comment ./doc/forum/sparse_git_checkouts_with_annex/comment_3_fcfafca994194d57dccf5319c7c9e646._comment ./doc/forum/sparse_git_checkouts_with_annex/comment_4_04dc14880f31eee2b6d767d4d4258c5a._comment ./doc/forum/git-annex_communication_channels.mdwn ./doc/forum/can_git-annex_replace_ddm__63__/comment_3_4c69097fe2ee81359655e59a03a9bb8d._comment ./doc/forum/can_git-annex_replace_ddm__63__/comment_2_008554306dd082d7f543baf283510e92._comment ./doc/forum/can_git-annex_replace_ddm__63__/comment_1_aa05008dfe800474ff76678a400099e1._comment ./doc/forum/version_3_upgrade.mdwn ./doc/forum/relying_on_git_for_numcopies/comment_3_43d8e1513eb9947f8a503f094c03f307._comment ./doc/forum/relying_on_git_for_numcopies/comment_2_be6acbc26008a9cb54e7b8f498f2c2a2._comment ./doc/forum/relying_on_git_for_numcopies/comment_1_8ad3cccd7f66f6423341d71241ba89fc._comment ./doc/forum/confusion_with_remotes__44___map/comment_1_a38ded23b7f288292a843abcb1a56f38._comment ./doc/forum/confusion_with_remotes__44___map/comment_2_cd1c98b1276444e859a22c3dbd6f2a79._comment ./doc/forum/confusion_with_remotes__44___map/comment_6_496b0d9b86869bbac3a1356d53a3dda4._comment ./doc/forum/confusion_with_remotes__44___map/comment_5_27801584325d259fa490f67273f2ff71._comment ./doc/forum/confusion_with_remotes__44___map/comment_4_3b89b6d1518267fcbc050c9de038b9ca._comment ./doc/forum/confusion_with_remotes__44___map/comment_3_18531754089c991b6caefc57a5c17fe9._comment ./doc/forum/confusion_with_remotes__44___map/comment_7_9a456f61f956a3d5e81e723d5a90794c._comment ./doc/forum/--print0_option_as_in___34__find__34__.mdwn ./doc/forum/relying_on_git_for_numcopies.mdwn ./doc/forum/wishlist:_do_round_robin_downloading_of_data.mdwn ./doc/forum/wishlist:_git_annex_status.mdwn ./doc/forum/getting_git_annex_to_do_a_force_copy_to_a_remote.mdwn ./doc/forum/Problems_with_large_numbers_of_files.mdwn ./doc/forum/Can_I_store_normal_files_in_the_git-annex_git_repository__63__.mdwn ./doc/forum/Is_an_automagic_upgrade_of_the_object_directory_safe__63__.mdwn ./doc/forum/wishlist:_push_to_cia.vc_from_the_website__39__s_repo__44___not_your_personal_one.mdwn ./doc/forum/new_microfeatures.mdwn ./doc/backends.mdwn ./doc/bugs/__39__annex_add__39___fails_to___39__git_add__39___for_parent_relative_path.mdwn ./doc/bugs/uuid.log_trust.log_and_remote.log_merge_wackiness.mdwn ./doc/bugs/softlink_mtime.mdwn ./doc/bugs/uninit_should_not_run_when_branch_git-annex_is_checked_out.mdwn ./doc/bugs/ordering.mdwn ./doc/bugs/dropping_files_with_a_URL_backend_fails.mdwn ./doc/bugs/fsck__47__fix_should_check__47__fix_the_permissions_of_.git__47__annex.mdwn ./doc/bugs/dropunused_doesn__39__t_handle_double_spaces_in_filename.mdwn ./doc/bugs/add_script-friendly_output_options.mdwn ./doc/bugs/uninit_does_not_work_in_old_repos.mdwn ./doc/bugs/git_annex_get_choke_when_remote_is_an_ssh_url_with_a_port.mdwn ./doc/bugs/unannex_and_uninit_do_not_work_when_git_index_is_broken.mdwn ./doc/bugs/git_annex_migrate_leaves_old_backend_versions_around.mdwn ./doc/bugs/git_annex_unused_failes_on_empty_repository.mdwn ./doc/bugs/git_annex_add_eats_files_when_filename_is_too_long.mdwn ./doc/bugs/S3_bucket_uses_the_same_key_for_encryption_and_hashing.mdwn ./doc/bugs/problem_with_upgrade_v2_-__62___v3.mdwn ./doc/bugs/git_annex_copy_--fast_does_not_copy_files.mdwn ./doc/bugs/Cabal_dependency_monadIO_missing.mdwn ./doc/bugs/dotdot_problem.mdwn ./doc/bugs/Problems_running_make_on_osx.mdwn ./doc/bugs/free_space_checking/comment_2_8a65f6d3dcf5baa3f7f2dbe1346e2615._comment ./doc/bugs/free_space_checking/comment_3_0fc6ff79a357b1619d13018ccacc7c10._comment ./doc/bugs/free_space_checking/comment_1_a868e805be43c5a7c19c41f1af8e41e6._comment ./doc/bugs/Error_when_moving_annexed_file_to_a_.gitignored_location.mdwn ./doc/bugs/done.mdwn ./doc/bugs/git_annex_copy_-f_REMOTE_._doesn__39__t_work_as_expected.mdwn ./doc/bugs/Displayed_copy_speed_is_wrong/comment_2_8b240de1d5ae9229fa2d77d1cc15a552._comment ./doc/bugs/Displayed_copy_speed_is_wrong/comment_1_74de3091e8bfd7acd6795e61f39f07c6._comment ./doc/bugs/Build_error_on_Mac_OSX_10.6.mdwn ./doc/bugs/bare_git_repos.mdwn ./doc/bugs/fat_support.mdwn ./doc/bugs/problems_with_utf8_names.mdwn ./doc/bugs/error_with_file_names_starting_with_dash.mdwn ./doc/bugs/not_possible_to_have_annex_on_a_separate_filesystem.mdwn ./doc/bugs/unhappy_without_UTF8_locale.mdwn ./doc/bugs/S3_memory_leaks.mdwn ./doc/bugs/git_annex_map_has_problems_with_urls_containing___126__.mdwn ./doc/bugs/interrupting_migration_causes_problems.mdwn ./doc/bugs/upgrade_left_untracked_.git-annex__47____42___directories.mdwn ./doc/bugs/cyclic_drop.mdwn ./doc/bugs/Problems_running_make_on_osx/comment_9_cc283b485b3c95ba7eebc8f0c96969b3._comment ./doc/bugs/Problems_running_make_on_osx/comment_4_c52be386f79f14c8570a8f1397c68581._comment ./doc/bugs/Problems_running_make_on_osx/comment_18_64fab50d95de619eb2e8f08f90237de1._comment ./doc/bugs/Problems_running_make_on_osx/comment_16_5c2dd6002aadaab30841b77a5f5aed34._comment ./doc/bugs/Problems_running_make_on_osx/comment_10_94e4ac430140042a2d0fb5a16d86b4e5._comment ./doc/bugs/Problems_running_make_on_osx/comment_15_6b8867b8e48bf807c955779c9f8f0909._comment ./doc/bugs/Problems_running_make_on_osx/comment_11_56f1143fa191361d63b441741699e17f._comment ./doc/bugs/Problems_running_make_on_osx/comment_20_7db27d1a22666c831848bc6c06d66a84._comment ./doc/bugs/Problems_running_make_on_osx/comment_12_ec5131624d0d2285d3b6880e47033f97._comment ./doc/bugs/Problems_running_make_on_osx/comment_3_68f0f8ae953589ae26d57310b40c878d._comment ./doc/bugs/Problems_running_make_on_osx/comment_14_89a960b6706ed703b390a81a8bc4e311._comment ./doc/bugs/Problems_running_make_on_osx/comment_17_62fccb04b0e4b695312f7a3f32fb96ee._comment ./doc/bugs/Problems_running_make_on_osx/comment_19_4253988ed178054c8b6400beeed68a29._comment ./doc/bugs/Problems_running_make_on_osx/comment_6_0c46f5165ceb5a7b9ea9689c33b3a4f8._comment ./doc/bugs/Problems_running_make_on_osx/comment_1_34120e82331ace01a6a4960862d38f2d._comment ./doc/bugs/Problems_running_make_on_osx/comment_7_237a137cce58a28abcc736cbf2c420b0._comment ./doc/bugs/Problems_running_make_on_osx/comment_5_7f1330a1e541b0f3e2192e596d7f7bee._comment ./doc/bugs/Problems_running_make_on_osx/comment_2_cc53d1681d576186dbc868dd9801d551._comment ./doc/bugs/Problems_running_make_on_osx/comment_13_88ed095a448096bf8a69015a04e64df1._comment ./doc/bugs/Problems_running_make_on_osx/comment_8_efafa203addf8fa79e33e21a87fb5a2b._comment ./doc/bugs/git-annex_directory_hashing_problems_on_osx.mdwn ./doc/bugs/No_easy_way_to_re-inject_a_file_into_an_annex.mdwn ./doc/bugs/git_annex_unlock_is_not_atomic.mdwn ./doc/bugs/free_space_checking.mdwn ./doc/bugs/wishlist:_more_descriptive_commit_messages_in_git-annex_branch.mdwn ./doc/bugs/Displayed_copy_speed_is_wrong.mdwn ./doc/bugs/git_annex_should_use___39__git_add_-f__39___internally.mdwn ./doc/bugs/minor_bug:_errors_are_not_verbose_enough.mdwn ./doc/bugs/No_version_information_from_cli.mdwn ./doc/bugs/Error_while_adding_a_file___34__createSymbolicLink:_already_exists__34__.mdwn ./doc/bugs/old_data_isn__39__t_unused_after_migration.mdwn ./doc/bugs/fails_to_handle_lot_of_files.mdwn ./doc/bugs/tests_fail_when_there_is_no_global_.gitconfig_for_the_user.mdwn ./doc/bugs/git_annex_initremote_walks_.git-annex.mdwn ./doc/bugs/git-annex_incorrectly_parses_bare_IPv6_addresses.mdwn ./doc/bugs/git_annex_version_should_without_being_in_a_repo_.mdwn ./doc/bugs/Prevent_accidental_merges/comment_1_4c46a193915eab8f308a04175cb2e40a._comment ./doc/bugs/conflicting_haskell_packages/comment_1_e552a6cc6d7d1882e14130edfc2d6b3b._comment ./doc/bugs/tmp_file_handling.mdwn ./doc/bugs/annex_add_in_annex.mdwn ./doc/bugs/making_annex-merge_try_a_fast-forward.mdwn ./doc/bugs/on--git-dir_and_--work-tree_options.mdwn ./doc/bugs/Makefile_is_missing_dependancies.mdwn ./doc/bugs/test_suite_shouldn__39__t_fail_silently.mdwn ./doc/bugs/git_annex_upgrade_output_is_inconsistent_and_spammy.mdwn ./doc/bugs/problem_with_upgrade_v2_-__62___v3/comment_4_91439d4dbbf1461e281b276eb0003691._comment ./doc/bugs/problem_with_upgrade_v2_-__62___v3/comment_6_f360f0006bc9115bc5a3e2eb9fe58abd._comment ./doc/bugs/problem_with_upgrade_v2_-__62___v3/comment_3_86d9e7244ae492bcbe62720b8c4fc4a9._comment ./doc/bugs/problem_with_upgrade_v2_-__62___v3/comment_2_cd0123392b16d89db41b45464165c247._comment ./doc/bugs/problem_with_upgrade_v2_-__62___v3/comment_1_5f60006c9bb095167d817f234a14d20b._comment ./doc/bugs/problem_with_upgrade_v2_-__62___v3/comment_5_ca33a9ca0df33f7c1b58353d7ffb943d._comment ./doc/bugs/wishlist:_query_things_like_description__44___trust_level.mdwn ./doc/bugs/git_rename_detection_on_file_move/comment_3_57010bcaca42089b451ad8659a1e018e._comment ./doc/bugs/git_rename_detection_on_file_move/comment_4_79d96599f757757f34d7b784e6c0e81c._comment ./doc/bugs/git_rename_detection_on_file_move/comment_5_d61f5693d947b9736b29fca1dbc7ad76._comment ./doc/bugs/git_rename_detection_on_file_move/comment_2_7101d07400ad5935f880dc00d89bf90e._comment ./doc/bugs/git_rename_detection_on_file_move/comment_1_0531dcfa833b0321a7009526efe3df33._comment ./doc/bugs/fsck_claims_failed_checksum_when_less_copies_than_required_are_found.mdwn ./doc/bugs/add_range_argument_to___34__git_annex_dropunused__34___.mdwn ./doc/bugs/git_rename_detection_on_file_move.mdwn ./doc/bugs/problem_commit_normal_links.mdwn ./doc/bugs/extraneous_shell_escaping_for_rsync_remotes.mdwn ./doc/bugs/git_annex_unused_seems_to_check_for_current_path.mdwn ./doc/bugs/Makefile_is_missing_dependancies/comment_6_24119fc5d5963ce9dd669f7dcf006859._comment ./doc/bugs/Makefile_is_missing_dependancies/comment_3_c38b6f4abc9b9ad413c3b83ca04386c3._comment ./doc/bugs/Makefile_is_missing_dependancies/comment_8_a3555e3286cdc2bfeb9cde0ff727ba74._comment ./doc/bugs/Makefile_is_missing_dependancies/comment_2_416f12dbd0c2b841fac8164645b81df5._comment ./doc/bugs/Makefile_is_missing_dependancies/comment_5_0a1c52e2c96d19b9c3eb7e99b8c2434f._comment ./doc/bugs/Makefile_is_missing_dependancies/comment_7_96fd4725df4b54e670077a18d3ac4943._comment ./doc/bugs/Makefile_is_missing_dependancies/comment_1_5a3da5f79c8563c7a450aa29728abe7c._comment ./doc/bugs/Makefile_is_missing_dependancies/comment_4_cc13873175edf191047282700315beee._comment ./doc/bugs/Trouble_initializing_git_annex_on_NFS.mdwn ./doc/bugs/touch.hsc_has_problems_on_non-linux_based_systems.mdwn ./doc/bugs/build_issue_with_latest_release_0.20110522-1-gde817ba.mdwn ./doc/bugs/weird_local_clone_confuses.mdwn ./doc/bugs/fsck_output.mdwn ./doc/bugs/wishlist:_allow_users_to_provide_UUID_when_running___96__git_annex_init__96__.mdwn ./doc/bugs/git-annex_has_issues_with_git_when_staging__47__commiting_logs.mdwn ./doc/bugs/git_annex_gets_confused_about_remotes_with_dots_in_their_names.mdwn ./doc/bugs/unannex_vs_unlock_hook_confusion.mdwn ./doc/bugs/Cabal_dependency_monadIO_missing/comment_2_4f4d8e1e00a2a4f7e8a8ab082e16adac._comment ./doc/bugs/Cabal_dependency_monadIO_missing/comment_1_14be660aa57fadec0d81b32a8b52c66f._comment ./doc/bugs/conflicting_haskell_packages.mdwn ./doc/bugs/git_command_line_constructed_by_unannex_command_has_tons_of_redundant_-a_paramters.mdwn ./doc/bugs/backend_version_upgrade_leaves_repo_unusable.mdwn ./doc/bugs/fat_support/comment_3_df3b943bc1081a8f3f7434ae0c8e061e._comment ./doc/bugs/fat_support/comment_4_90a8a15bedd94480945a374f9d706b86._comment ./doc/bugs/fat_support/comment_5_64bbf89de0836673224b83fdefa0407b._comment ./doc/bugs/fat_support/comment_1_04bcc4795d431e8cb32293aab29bbfe2._comment ./doc/bugs/fat_support/comment_2_bb4a97ebadb5c53809fc78431eabd7c8._comment ./doc/bugs/unannex_command_doesn__39__t_all_files.mdwn ./doc/bugs/annex_unannex__47__uninit_should_handle_copies.mdwn ./doc/bugs/git_annex_fsck_is_a_no-op_in_bare_repos.mdwn ./doc/bugs/Unfortunate_interaction_with_Calibre.mdwn ./doc/bugs/error_propigation.mdwn ./doc/bugs/wishlist:_support_drop__44___find_on_special_remotes.mdwn ./doc/bugs/scp_interrupt_to_background.mdwn ./doc/bugs/copy_fast_confusing_with_broken_locationlog.mdwn ./doc/bugs/uninit_does_not_work_in_old_repos/comment_1_bc0619c6e17139df74639448aa6a0f72._comment ./doc/bugs/configure_script_should_detect_uuidgen_instead_of_just_uuid.mdwn ./doc/bugs/check_for_curl_in_configure.hs.mdwn ./doc/bugs/fails_to_handle_lot_of_files/comment_1_09d8e4e66d8273fab611bd29e82dc7fc._comment ./doc/bugs/fails_to_handle_lot_of_files/comment_2_fd2ec05f4b5a7a6ae6bd9f5dbc3156de._comment ./doc/bugs/Name_scheme_does_not_follow_git__39__s_rules.mdwn ./doc/bugs/concurrent_git-annex_processes_can_lead_to_locking_issues.mdwn ./doc/bugs/Prevent_accidental_merges.mdwn ./doc/bugs/building_on_lenny.mdwn ./doc/bugs/case_sensitivity_on_FAT.mdwn ./doc/bugs/encrypted_S3_stalls.mdwn ./doc/bugs/support_bare_git_repo__44___with_the_annex_directory_exposed_to_http.mdwn ./doc/bugs/WORM:_Handle_long_filenames_correctly.mdwn ./doc/logo_small.png ./doc/tips.mdwn ./doc/use_case/Bob.mdwn ./doc/use_case/Alice.mdwn ./doc/upgrades/SHA_size.mdwn ./doc/news/sharebox_a_FUSE_filesystem_for_git-annex.mdwn ./doc/news/version_3.20111122.mdwn ./doc/news/version_3.20111203.mdwn ./doc/news/version_3.20111105.mdwn ./doc/news/version_3.20111107.mdwn ./doc/news/LWN_article.mdwn ./doc/news/version_3.20111111.mdwn ./doc/git-union-merge.mdwn ./doc/special_remotes/S3.mdwn ./doc/special_remotes/web.mdwn ./doc/special_remotes/bup.mdwn ./doc/special_remotes/directory.mdwn ./doc/special_remotes/hook.mdwn ./doc/special_remotes/rsync.mdwn ./doc/users/joey.mdwn ./doc/users/fmarier.mdwn ./doc/users/chrysn.mdwn ./doc/templates/walkthrough.tmpl ./doc/templates/bare.tmpl ./doc/index.mdwn ./doc/summary.mdwn ./doc/forum.mdwn ./doc/encryption/comment_1_1afca8d7182075d46db41f6ad3dd5911._comment ./doc/transferring_data.mdwn ./doc/download.mdwn ./doc/future_proofing.mdwn ./doc/todo/auto_remotes/discussion.mdwn ./doc/todo/file_copy_progress_bar.mdwn ./doc/todo/use_cp_reflink.mdwn ./doc/todo/gitrm.mdwn ./doc/todo/exclude_files_on_a_given_remote.mdwn ./doc/todo/git-annex_unused_eats_memory.mdwn ./doc/todo/add_--exclude_option_to_git_annex_find.mdwn ./doc/todo/tahoe_lfs_for_reals/comment_2_80b9e848edfdc7be21baab7d0cef0e3a._comment ./doc/todo/tahoe_lfs_for_reals/comment_1_0a4793ce6a867638f6e510e71dd4bb44._comment ./doc/todo/object_dir_reorg_v2.mdwn ./doc/todo/S3.mdwn ./doc/todo/auto_remotes.mdwn ./doc/todo/wishlist:_support_for_more_ssh_urls_.mdwn ./doc/todo/support-non-utf8-locales.mdwn ./doc/todo/done.mdwn ./doc/todo/fsck.mdwn ./doc/todo/support_S3_multipart_uploads.mdwn ./doc/todo/wishlist:_Provide_a___34__git_annex__34___command_that_will_skip_duplicates.mdwn ./doc/todo/pushpull.mdwn ./doc/todo/smudge.mdwn ./doc/todo/cache_key_info/comment_1_578df1b3b2cbfdc4aa1805378f35dc48._comment ./doc/todo/optimise_git-annex_merge.mdwn ./doc/todo/object_dir_reorg_v2/comment_3_79bdf9c51dec9f52372ce95b53233bb2._comment ./doc/todo/object_dir_reorg_v2/comment_7_42501404c82ca07147e2cce0cff59474._comment ./doc/todo/object_dir_reorg_v2/comment_5_821c382987f105da72a50e0a5ce61fdc._comment ./doc/todo/object_dir_reorg_v2/comment_1_ba03333dc76ff49eccaba375e68cb525._comment ./doc/todo/object_dir_reorg_v2/comment_2_81276ac309959dc741bc90101c213ab7._comment ./doc/todo/object_dir_reorg_v2/comment_6_8834c3a3f1258c4349d23aff8549bf35._comment ./doc/todo/object_dir_reorg_v2/comment_4_93aada9b1680fed56cc6f0f7c3aca5e5._comment ./doc/todo/union_mounting.mdwn ./doc/todo/wishlist:_swift_backend.mdwn ./doc/todo/wishlist:_swift_backend/comment_1_e6efbb35f61ee521b473a92674036788._comment ./doc/todo/wishlist:_swift_backend/comment_2_5d8c83b0485112e98367b7abaab3f4e3._comment ./doc/todo/git_annex_init_:_include_repo_description_and__47__or_UUID_in_commit_message.mdwn ./doc/todo/gitolite_and_gitosis_support.mdwn ./doc/todo/wishlist:___34__git_annex_add__34___multiple_processes.mdwn ./doc/todo/hidden_files.mdwn ./doc/todo/smudge/comment_1_4ea616bcdbc9e9a6fae9f2e2795c31c9._comment ./doc/todo/smudge/comment_2_e04b32caa0d2b4c577cdaf382a3ff7f6._comment ./doc/todo/network_remotes.mdwn ./doc/todo/add_a_git_backend.mdwn ./doc/todo/parallel_possibilities/comment_1_d8e34fc2bc4e5cf761574608f970d496._comment ./doc/todo/parallel_possibilities/comment_2_adb76f06a7997abe4559d3169a3181c3._comment ./doc/todo/checkout.mdwn ./doc/todo/immutable_annexed_files.mdwn ./doc/todo/wishlist:_Prevent_repeated_password_prompts_for_one_command.mdwn ./doc/todo/git-annex-shell.mdwn ./doc/todo/speed_up_fsck.mdwn ./doc/todo/tahoe_lfs_for_reals.mdwn ./doc/todo/avoid_unnecessary_union_merges.mdwn ./doc/todo/support_fsck_in_bare_repos.mdwn ./doc/todo/add_-all_option.mdwn ./doc/todo/using_url_backend.mdwn ./doc/todo/branching.mdwn ./doc/todo/rsync.mdwn ./doc/todo/backendSHA1.mdwn ./doc/todo/cache_key_info.mdwn ./doc/todo/parallel_possibilities.mdwn ./doc/todo/symlink_farming_commit_hook.mdwn ./doc/feeds.mdwn ./doc/copies.mdwn ./doc/repomap.png ./doc/special_remotes.mdwn ./doc/todo.mdwn ./doc/walkthrough/using_ssh_remotes.mdwn ./doc/walkthrough/automatically_managing_content.mdwn ./doc/walkthrough/removing_files/comment_1_cb65e7c510b75be1c51f655b058667c6._comment ./doc/walkthrough/removing_files/comment_2_64709ea4558915edd5c8ca4486965b07._comment ./doc/walkthrough/moving_file_content_between_repositories.mdwn ./doc/walkthrough/modifying_annexed_files.mdwn ./doc/walkthrough/more.mdwn ./doc/walkthrough/removing_files.mdwn ./doc/walkthrough/creating_a_repository.mdwn ./doc/walkthrough/adding_a_remote.mdwn ./doc/walkthrough/adding_a_remote/comment_1_0a59355bd33a796aec97173607e6adc9._comment ./doc/walkthrough/adding_a_remote/comment_2_f8cd79ef1593a8181a7f1086a87713e8._comment ./doc/walkthrough/adding_a_remote/comment_3_60691af4400521b5a8c8d75efe3b44cb._comment ./doc/walkthrough/adding_a_remote/comment_4_6f7cf5c330272c96b3abeb6612075c9d._comment ./doc/walkthrough/removing_files:_When_things_go_wrong.mdwn ./doc/walkthrough/renaming_files.mdwn ./doc/walkthrough/using_bup.mdwn ./doc/walkthrough/fsck:_when_things_go_wrong.mdwn ./doc/walkthrough/adding_files.mdwn ./doc/walkthrough/unused_data.mdwn ./doc/walkthrough/fsck:_verifying_your_data.mdwn ./doc/walkthrough/getting_file_content.mdwn ./doc/walkthrough/backups.mdwn ./doc/walkthrough/transferring_files:_When_things_go_wrong.mdwn ./doc/GPL ./doc/logo.png ./doc/location_tracking.mdwn ./doc/design.mdwn ./doc/news.mdwn ./doc/tips/untrusted_repositories.mdwn ./doc/tips/automatically_getting_files_on_checkout.mdwn ./doc/tips/what_to_do_when_a_repository_is_corrupted.mdwn ./doc/tips/Internet_Archive_via_S3.mdwn ./doc/tips/what_to_do_when_you_lose_a_repository.mdwn ./doc/tips/using_Amazon_S3.mdwn ./doc/tips/using_the_web_as_a_special_remote.mdwn ./doc/tips/powerful_file_matching.mdwn ./doc/tips/using_gitolite_with_git-annex.mdwn ./doc/tips/recover_data_from_lost+found.mdwn ./doc/tips/centralized_git_repository_tutorial.mdwn ./doc/tips/using_the_SHA1_backend.mdwn ./doc/tips/migrating_data_to_a_new_backend.mdwn ./doc/encryption.mdwn ./doc/not.mdwn ./doc/download/comment_7_a5eebd214b135f34b18274a682211943._comment ./doc/download/comment_3_cf6044ebe99f71158034e21197228abd._comment ./doc/download/comment_5_c6b1bc40226fc2c8ba3e558150856992._comment ./doc/download/comment_6_3a52993d3553deb9a413debec9a5f92d._comment ./doc/download/comment_2_f85f72b33aedc3425f0c0c47867d02f3._comment ./doc/download/comment_8_59a976de6c7d333709b92f7cd5830850._comment ./doc/download/comment_4_10fc013865c7542c2ed9d6c0963bb391._comment ./doc/download/comment_1_fbd8b6d39e9d3c71791551358c863966._comment ./doc/contact.mdwn ./doc/trust.mdwn ./doc/bare_repositories.mdwn ./doc/distributed_version_control.mdwn ./doc/install.mdwn ./doc/git-annex-shell.mdwn ./doc/bugs.mdwn ./doc/meta.mdwn ./doc/design/encryption/comment_2_a610b3d056a059899178859a3a821ea5._comment ./doc/design/encryption/comment_3_cca186a9536cd3f6e86994631b14231c._comment ./doc/design/encryption/comment_1_4715ffafb3c4a9915bc33f2b26aaa9c1._comment ./doc/design/encryption/comment_4_8f3ba3e504b058791fc6e6f9c38154cf._comment ./doc/design/encryption.mdwn ./doc/comments.mdwn ./doc/git-annex.mdwn ./doc/internals.mdwn ./doc/users.mdwn ./doc/install/Ubuntu.mdwn ./doc/install/Debian.mdwn ./doc/install/OSX.mdwn ./doc/install/FreeBSD.mdwn ./doc/install/OSX/comment_1_0a1760bf0db1f1ba89bdb4c62032f631._comment ./doc/install/comment_3_cff163ea3e7cad926f4ed9e78b896598._comment ./doc/install/Debian/comment_2_648e3467e260cdf233acdb0b53313ce0._comment ./doc/install/Debian/comment_1_029486088d098c2d4f1099f2f0e701a9._comment ./doc/install/Fedora.mdwn ./doc/install/comment_4_82a17eee4a076c6c79fddeda347e0c9a._comment ./doc/walkthrough.mdwn ./CmdLine.hs ./Messages.hs ./Setup.hs ./GPL ./mdwn2man ./Remote.hs ./git-annex.hs ./Locations.hs ./Backend/WORM.hs ./Backend/URL.hs ./Backend/SHA.hs ./Options.hs ./git-annex-shell.hs ./test.hs ./INSTALL ./Remote/Web.hs ./Remote/S3stub.hs ./Remote/Helper/Encryptable.hs ./Remote/Helper/Special.hs ./Remote/Directory.hs ./Remote/S3real.hs ./Remote/Bup.hs ./Remote/Hook.hs ./Remote/Rsync.hs ./Remote/Git.hs ./Build/TestConfig.hs ./Upgrade.hs ./Annex/Version.hs ./Annex/Exception.hs ./Annex/CatFile.hs ./Annex/Ssh.hs ./Annex/Queue.hs ./Annex/Branch.hs ./Annex/UUID.hs ./Annex/Content.hs ./git-union-merge.hs ./Utility/Path.hs ./Utility/Matcher.hs ./Utility/TempFile.hs ./Utility/Url.hs ./Utility/DataUnits.hs ./Utility/StatFS.hsc ./Utility/Conditional.hs ./Utility/Monad.hs ./Utility/RsyncFile.hs ./Utility/CopyFile.hs ./Utility/Misc.hs ./Utility/SafeCommand.hs ./Utility/Directory.hs ./Utility/FileMode.hs ./Utility/JSONStream.hs ./Utility/Dot.hs ./Utility/Touch.hsc ./Utility/Base64.hs ./Types/Crypto.hs ./Types/UUID.hs ./Types/TrustLevel.hs ./Types/Remote.hs ./Types/BranchState.hs ./Types/Command.hs ./Types/Backend.hs ./Types/Key.hs ./Config.hs ./Checks.hs ./Command.hs ./.gitignore ./Backend.hs ./Logs/Web.hs ./Logs/UUIDBased.hs ./Logs/Trust.hs ./Logs/Location.hs ./Logs/UUID.hs ./Logs/Remote.hs ./Logs/Presence.hs ./.gitattributes ./Git.hs ./Limit.hs ./GitAnnex.hs+Extra-Source-Files: ./debian/NEWS ./debian/control ./debian/rules ./debian/manpages ./debian/changelog ./debian/doc-base ./debian/copyright ./debian/compat ./Messages/JSON.hs ./configure.hs ./Annex.hs ./Seek.hs ./Crypto.hs ./Common.hs ./README ./Command/Merge.hs ./Command/AddUrl.hs ./Command/Whereis.hs ./Command/Unlock.hs ./Command/Version.hs ./Command/FromKey.hs ./Command/PreCommit.hs ./Command/Sync.hs ./Command/Map.hs ./Command/Unused.hs ./Command/Uninit.hs ./Command/Migrate.hs ./Command/Init.hs ./Command/ConfigList.hs ./Command/Trust.hs ./Command/Lock.hs ./Command/SendKey.hs ./Command/RecvKey.hs ./Command/Reinject.hs ./Command/Add.hs ./Command/Fix.hs ./Command/Untrust.hs ./Command/Dead.hs ./Command/InitRemote.hs ./Command/Semitrust.hs ./Command/Fsck.hs ./Command/Move.hs ./Command/DropUnused.hs ./Command/Get.hs ./Command/Upgrade.hs ./Command/Describe.hs ./Command/Drop.hs ./Command/DropKey.hs ./Command/InAnnex.hs ./Command/Find.hs ./Command/Unannex.hs ./Command/Status.hs ./Command/Copy.hs ./Init.hs ./Types.hs ./Common/Annex.hs ./Makefile ./git-annex.cabal ./Upgrade/V1.hs ./Upgrade/V2.hs ./Upgrade/V0.hs ./CHANGELOG ./Git/LsFiles.hs ./Git/UnionMerge.hs ./Git/CatFile.hs ./Git/Queue.hs ./Git/LsTree.hs ./doc/upgrades.mdwn ./doc/forum/Recommended_number_of_repositories.mdwn ./doc/forum/wishlist:_define_remotes_that_must_have_all_files.mdwn ./doc/forum/Will_git_annex_work_on_a_FAT32_formatted_key__63__.mdwn ./doc/forum/wishlist:_command_options_changes/comment_2_f6a637c78c989382e3c22d41b7fb4cc2._comment ./doc/forum/wishlist:_command_options_changes/comment_3_bf1114533d2895804e531e76eb6b8095._comment ./doc/forum/wishlist:_command_options_changes/comment_1_bfba72a696789bf21b2435dea15f967a._comment ./doc/forum/pure_git-annex_only_workflow/comment_1_a32f7efd18d174845099a4ed59e6feae._comment ./doc/forum/pure_git-annex_only_workflow/comment_3_9b7d89da52f7ebb7801f9ec8545c3aba._comment ./doc/forum/pure_git-annex_only_workflow/comment_2_66dc9b65523a9912411db03c039ba848._comment ./doc/forum/wishlist:_git-annex_replicate/comment_3_c13f4f9c3d5884fc6255fd04feadc2b1._comment ./doc/forum/wishlist:_git-annex_replicate/comment_1_9926132ec6052760cdf28518a24e2358._comment ./doc/forum/wishlist:_git-annex_replicate/comment_2_c43932f4194aba8fb2470b18e0817599._comment ./doc/forum/wishlist:_git-annex_replicate/comment_4_63f24abf086d644dced8b01e1a9948c9._comment ./doc/forum/Podcast_syncing_use-case/comment_1_ace6f9d3a950348a3ac0ff592b62e786._comment ./doc/forum/Podcast_syncing_use-case/comment_2_930a6620b4d516e69ed952f9da5371bb._comment ./doc/forum/Behaviour_of_fsck/comment_4_e4911dc6793f98fb81151daacbe49968._comment ./doc/forum/Behaviour_of_fsck/comment_3_97848f9a3db89c0427cfb671ba13300e._comment ./doc/forum/Behaviour_of_fsck/comment_2_ead36a23c3e6efa1c41e4555f93e014e._comment ./doc/forum/Behaviour_of_fsck/comment_1_0e40f158b3f4ccdcaab1408d858b68b8._comment ./doc/forum/incompatible_versions__63__/comment_1_629f28258746d413e452cbd42a1a43f4._comment ./doc/forum/Recommended_number_of_repositories/comment_1_3ef256230756be8a9679b107cdbfd018._comment ./doc/forum/migration_to_git-annex_and_rsync.mdwn ./doc/forum/hashing_objects_directories.mdwn ./doc/forum/git_annex_ls___47___metadata_in_git_annex_whereis.mdwn ./doc/forum/Podcast_syncing_use-case.mdwn ./doc/forum/hashing_objects_directories/comment_5_ef6cfd49d24c180c2d0a062e5bd3a0be._comment ./doc/forum/hashing_objects_directories/comment_1_c55c56076be4f54251b0b7f79f28a607._comment ./doc/forum/hashing_objects_directories/comment_2_504c96959c779176f991f4125ea22009._comment ./doc/forum/hashing_objects_directories/comment_3_9134bde0a13aac0b6a4e5ebabd7f22e8._comment ./doc/forum/hashing_objects_directories/comment_4_0de9170e429cbfea66f5afa8980d45ac._comment ./doc/forum/location_tracking_cleanup.mdwn ./doc/forum/Wishlist:_Ways_of_selecting_files_based_on_meta-information.mdwn ./doc/forum/confusion_with_remotes__44___map.mdwn ./doc/forum/git-annex_on_OSX.mdwn ./doc/forum/git_tag_missing_for_3.20111011/comment_1_7a53bf273f3078ab3351369ef2b5f2a6._comment ./doc/forum/version_3_upgrade/comment_1_05fc9c9cad26c520bebb98c852c71e35._comment ./doc/forum/example_of_massively_disconnected_operation.mdwn ./doc/forum/git-annex_communication_channels/comment_2_c7aeefa6ef9a2e75d8667b479ade1b7f._comment ./doc/forum/git-annex_communication_channels/comment_5_404b723a681eb93fee015cea8024b6bc._comment ./doc/forum/git-annex_communication_channels/comment_1_198325d2e9337c90f026396de89eec0e._comment ./doc/forum/git-annex_communication_channels/comment_4_1ba6ddf54843c17c7d19a9996f2ab712._comment ./doc/forum/git-annex_communication_channels/comment_6_0d87d0e26461494b1d7f8a701a924729._comment ./doc/forum/git-annex_communication_channels/comment_3_1ff08a3e0e63fa0e560cbc9602245caa._comment ./doc/forum/git-annex_communication_channels/comment_7_2c87c7a0648fe87c2bf6b4391f1cc468._comment ./doc/forum/wishlist:_git-annex_replicate.mdwn ./doc/forum/advantages_of_SHA__42___over_WORM/comment_1_96c354cac4b5ce5cf6664943bc84db1d._comment ./doc/forum/performance_improvement:_git_on_ssd__44___annex_on_spindle_disk.mdwn ./doc/forum/Behaviour_of_fsck.mdwn ./doc/forum/git_annex_add_crash_and_subsequent_recovery.mdwn ./doc/forum/working_without_git-annex_commits.mdwn ./doc/forum/migrate_existing_git_repository_to_git-annex.mdwn ./doc/forum/__34__git_annex_lock__34___very_slow_for_big_repo.mdwn ./doc/forum/wishlist:_traffic_accounting_for_git-annex.mdwn ./doc/forum/git_pull_remote_git-annex.mdwn ./doc/forum/rsync_over_ssh__63__.mdwn ./doc/forum/unannex_alternatives/comment_3_b1687fc8f9e7744327bbeb6f0635d1cd._comment ./doc/forum/unannex_alternatives/comment_1_dcd4cd41280b41512bbdffafaf307993._comment ./doc/forum/unannex_alternatives/comment_2_58a72a9fe0f58c7af0b4d7927a2dd21d._comment ./doc/forum/wishlist:_git_annex_status/comment_4_9aeeb83d202dc8fb33ff364b0705ad94._comment ./doc/forum/wishlist:_git_annex_status/comment_3_d1fd70c67243971c96d59e1ffb7ef6e7._comment ./doc/forum/wishlist:_git_annex_status/comment_2_c2b0ce025805b774dc77ce264a222824._comment ./doc/forum/wishlist:_git_annex_status/comment_1_994bfd12c5d82e08040d6116915c5090._comment ./doc/forum/git_pull_remote_git-annex/comment_2_0f7f4a311b0ec1d89613e80847e69b42._comment ./doc/forum/git_pull_remote_git-annex/comment_1_9c245db3518d8b889ecdf5115ad9e053._comment ./doc/forum/wishlist:_command_options_changes.mdwn ./doc/forum/location_tracking_cleanup/comment_3_c15428cec90e969284a5e690fb4b2fde._comment ./doc/forum/location_tracking_cleanup/comment_2_e7395cb6e01f42da72adf71ea3ebcde4._comment ./doc/forum/location_tracking_cleanup/comment_1_7d6319e8c94dfe998af9cfcbf170efb2._comment ./doc/forum/new_microfeatures/comment_2_41ad904c68e89c85e1fc49c9e9106969._comment ./doc/forum/new_microfeatures/comment_1_058bd517c6fffaf3446b1f5d5be63623._comment ./doc/forum/new_microfeatures/comment_3_a1a9347b5bc517f2a89a8b292c3f8517._comment ./doc/forum/new_microfeatures/comment_7_94045b9078b1fff877933b012d1b49e2._comment ./doc/forum/new_microfeatures/comment_5_3c627d275586ff499d928a8f8136babf._comment ./doc/forum/new_microfeatures/comment_4_5a6786dc52382fff5cc42fdb05770196._comment ./doc/forum/new_microfeatures/comment_6_31ea08c008500560c0b96c6601bc6362._comment ./doc/forum/Error_while_adding_a_file___34__createSymbolicLink:_already_exists__34__.mdwn ./doc/forum/advantages_of_SHA__42___over_WORM.mdwn ./doc/forum/wishlist:_git_annex_put_--_same_as_get__44___but_for_defaults.mdwn ./doc/forum/OSX__39__s_default_sshd_behaviour_has_limited_paths_set.mdwn ./doc/forum/bainstorming:_git_annex_push___38___pull.mdwn ./doc/forum/sparse_git_checkouts_with_annex.mdwn ./doc/forum/Need_new_build_instructions_for_Debian_stable.mdwn ./doc/forum/batch_check_on_remote_when_using_copy.mdwn ./doc/forum/tips:_special__95__remotes__47__hook_with_tahoe-lafs.mdwn ./doc/forum/wishlist:alias_system.mdwn ./doc/forum/incompatible_versions__63__.mdwn ./doc/forum/wishlist:_git_backend_for_git-annex.mdwn ./doc/forum/seems_to_build_fine_on_haskell_platform_2011.mdwn ./doc/forum/rsync_over_ssh__63__/comment_1_ee21f32e90303e20339e0a568321bbbe._comment ./doc/forum/rsync_over_ssh__63__/comment_2_aa690da6ecfb2b30fc5080ad76dc77b1._comment ./doc/forum/wishlist:_special_remote_for_sftp_or_rsync.mdwn ./doc/forum/OSX__39__s_haskell-platform_statically_links_things.mdwn ./doc/forum/git_tag_missing_for_3.20111011.mdwn ./doc/forum/unannex_alternatives.mdwn ./doc/forum/can_git-annex_replace_ddm__63__.mdwn ./doc/forum/sparse_git_checkouts_with_annex/comment_2_e357db3ccc4079f07a291843975535eb._comment ./doc/forum/sparse_git_checkouts_with_annex/comment_1_c7dc199c5740a0e7ba606dfb5e3e579a._comment ./doc/forum/sparse_git_checkouts_with_annex/comment_3_fcfafca994194d57dccf5319c7c9e646._comment ./doc/forum/sparse_git_checkouts_with_annex/comment_4_04dc14880f31eee2b6d767d4d4258c5a._comment ./doc/forum/git-annex_communication_channels.mdwn ./doc/forum/can_git-annex_replace_ddm__63__/comment_3_4c69097fe2ee81359655e59a03a9bb8d._comment ./doc/forum/can_git-annex_replace_ddm__63__/comment_2_008554306dd082d7f543baf283510e92._comment ./doc/forum/can_git-annex_replace_ddm__63__/comment_1_aa05008dfe800474ff76678a400099e1._comment ./doc/forum/version_3_upgrade.mdwn ./doc/forum/relying_on_git_for_numcopies/comment_3_43d8e1513eb9947f8a503f094c03f307._comment ./doc/forum/relying_on_git_for_numcopies/comment_2_be6acbc26008a9cb54e7b8f498f2c2a2._comment ./doc/forum/relying_on_git_for_numcopies/comment_1_8ad3cccd7f66f6423341d71241ba89fc._comment ./doc/forum/confusion_with_remotes__44___map/comment_1_a38ded23b7f288292a843abcb1a56f38._comment ./doc/forum/confusion_with_remotes__44___map/comment_2_cd1c98b1276444e859a22c3dbd6f2a79._comment ./doc/forum/confusion_with_remotes__44___map/comment_6_496b0d9b86869bbac3a1356d53a3dda4._comment ./doc/forum/confusion_with_remotes__44___map/comment_5_27801584325d259fa490f67273f2ff71._comment ./doc/forum/confusion_with_remotes__44___map/comment_4_3b89b6d1518267fcbc050c9de038b9ca._comment ./doc/forum/confusion_with_remotes__44___map/comment_3_18531754089c991b6caefc57a5c17fe9._comment ./doc/forum/confusion_with_remotes__44___map/comment_7_9a456f61f956a3d5e81e723d5a90794c._comment ./doc/forum/--print0_option_as_in___34__find__34__.mdwn ./doc/forum/relying_on_git_for_numcopies.mdwn ./doc/forum/wishlist:_do_round_robin_downloading_of_data.mdwn ./doc/forum/pure_git-annex_only_workflow.mdwn ./doc/forum/wishlist:_git_annex_status.mdwn ./doc/forum/getting_git_annex_to_do_a_force_copy_to_a_remote.mdwn ./doc/forum/Problems_with_large_numbers_of_files.mdwn ./doc/forum/Can_I_store_normal_files_in_the_git-annex_git_repository__63__.mdwn ./doc/forum/Is_an_automagic_upgrade_of_the_object_directory_safe__63__.mdwn ./doc/forum/wishlist:_push_to_cia.vc_from_the_website__39__s_repo__44___not_your_personal_one.mdwn ./doc/forum/new_microfeatures.mdwn ./doc/backends.mdwn ./doc/bugs/__39__annex_add__39___fails_to___39__git_add__39___for_parent_relative_path.mdwn ./doc/bugs/uuid.log_trust.log_and_remote.log_merge_wackiness.mdwn ./doc/bugs/softlink_mtime.mdwn ./doc/bugs/uninit_should_not_run_when_branch_git-annex_is_checked_out.mdwn ./doc/bugs/ordering.mdwn ./doc/bugs/dropping_files_with_a_URL_backend_fails.mdwn ./doc/bugs/fsck__47__fix_should_check__47__fix_the_permissions_of_.git__47__annex.mdwn ./doc/bugs/dropunused_doesn__39__t_handle_double_spaces_in_filename.mdwn ./doc/bugs/add_script-friendly_output_options.mdwn ./doc/bugs/uninit_does_not_work_in_old_repos.mdwn ./doc/bugs/git_annex_get_choke_when_remote_is_an_ssh_url_with_a_port.mdwn ./doc/bugs/unannex_and_uninit_do_not_work_when_git_index_is_broken.mdwn ./doc/bugs/git_annex_migrate_leaves_old_backend_versions_around.mdwn ./doc/bugs/git_annex_unused_failes_on_empty_repository.mdwn ./doc/bugs/git_annex_add_eats_files_when_filename_is_too_long.mdwn ./doc/bugs/S3_bucket_uses_the_same_key_for_encryption_and_hashing.mdwn ./doc/bugs/problem_with_upgrade_v2_-__62___v3.mdwn ./doc/bugs/git_annex_copy_--fast_does_not_copy_files.mdwn ./doc/bugs/Cabal_dependency_monadIO_missing.mdwn ./doc/bugs/dotdot_problem.mdwn ./doc/bugs/Problems_running_make_on_osx.mdwn ./doc/bugs/free_space_checking/comment_2_8a65f6d3dcf5baa3f7f2dbe1346e2615._comment ./doc/bugs/free_space_checking/comment_3_0fc6ff79a357b1619d13018ccacc7c10._comment ./doc/bugs/free_space_checking/comment_1_a868e805be43c5a7c19c41f1af8e41e6._comment ./doc/bugs/Error_when_moving_annexed_file_to_a_.gitignored_location.mdwn ./doc/bugs/done.mdwn ./doc/bugs/git_annex_copy_-f_REMOTE_._doesn__39__t_work_as_expected.mdwn ./doc/bugs/Displayed_copy_speed_is_wrong/comment_2_8b240de1d5ae9229fa2d77d1cc15a552._comment ./doc/bugs/Displayed_copy_speed_is_wrong/comment_1_74de3091e8bfd7acd6795e61f39f07c6._comment ./doc/bugs/Build_error_on_Mac_OSX_10.6.mdwn ./doc/bugs/bare_git_repos.mdwn ./doc/bugs/fat_support.mdwn ./doc/bugs/problems_with_utf8_names.mdwn ./doc/bugs/error_with_file_names_starting_with_dash.mdwn ./doc/bugs/not_possible_to_have_annex_on_a_separate_filesystem.mdwn ./doc/bugs/unhappy_without_UTF8_locale.mdwn ./doc/bugs/S3_memory_leaks.mdwn ./doc/bugs/git_annex_map_has_problems_with_urls_containing___126__.mdwn ./doc/bugs/interrupting_migration_causes_problems.mdwn ./doc/bugs/upgrade_left_untracked_.git-annex__47____42___directories.mdwn ./doc/bugs/cyclic_drop.mdwn ./doc/bugs/Problems_running_make_on_osx/comment_9_cc283b485b3c95ba7eebc8f0c96969b3._comment ./doc/bugs/Problems_running_make_on_osx/comment_4_c52be386f79f14c8570a8f1397c68581._comment ./doc/bugs/Problems_running_make_on_osx/comment_18_64fab50d95de619eb2e8f08f90237de1._comment ./doc/bugs/Problems_running_make_on_osx/comment_16_5c2dd6002aadaab30841b77a5f5aed34._comment ./doc/bugs/Problems_running_make_on_osx/comment_10_94e4ac430140042a2d0fb5a16d86b4e5._comment ./doc/bugs/Problems_running_make_on_osx/comment_15_6b8867b8e48bf807c955779c9f8f0909._comment ./doc/bugs/Problems_running_make_on_osx/comment_11_56f1143fa191361d63b441741699e17f._comment ./doc/bugs/Problems_running_make_on_osx/comment_20_7db27d1a22666c831848bc6c06d66a84._comment ./doc/bugs/Problems_running_make_on_osx/comment_12_ec5131624d0d2285d3b6880e47033f97._comment ./doc/bugs/Problems_running_make_on_osx/comment_3_68f0f8ae953589ae26d57310b40c878d._comment ./doc/bugs/Problems_running_make_on_osx/comment_14_89a960b6706ed703b390a81a8bc4e311._comment ./doc/bugs/Problems_running_make_on_osx/comment_17_62fccb04b0e4b695312f7a3f32fb96ee._comment ./doc/bugs/Problems_running_make_on_osx/comment_19_4253988ed178054c8b6400beeed68a29._comment ./doc/bugs/Problems_running_make_on_osx/comment_6_0c46f5165ceb5a7b9ea9689c33b3a4f8._comment ./doc/bugs/Problems_running_make_on_osx/comment_1_34120e82331ace01a6a4960862d38f2d._comment ./doc/bugs/Problems_running_make_on_osx/comment_7_237a137cce58a28abcc736cbf2c420b0._comment ./doc/bugs/Problems_running_make_on_osx/comment_5_7f1330a1e541b0f3e2192e596d7f7bee._comment ./doc/bugs/Problems_running_make_on_osx/comment_2_cc53d1681d576186dbc868dd9801d551._comment ./doc/bugs/Problems_running_make_on_osx/comment_13_88ed095a448096bf8a69015a04e64df1._comment ./doc/bugs/Problems_running_make_on_osx/comment_8_efafa203addf8fa79e33e21a87fb5a2b._comment ./doc/bugs/git-annex_directory_hashing_problems_on_osx.mdwn ./doc/bugs/No_easy_way_to_re-inject_a_file_into_an_annex.mdwn ./doc/bugs/git_annex_unlock_is_not_atomic.mdwn ./doc/bugs/free_space_checking.mdwn ./doc/bugs/wishlist:_more_descriptive_commit_messages_in_git-annex_branch.mdwn ./doc/bugs/Displayed_copy_speed_is_wrong.mdwn ./doc/bugs/git_annex_should_use___39__git_add_-f__39___internally.mdwn ./doc/bugs/minor_bug:_errors_are_not_verbose_enough.mdwn ./doc/bugs/No_version_information_from_cli.mdwn ./doc/bugs/Error_while_adding_a_file___34__createSymbolicLink:_already_exists__34__.mdwn ./doc/bugs/old_data_isn__39__t_unused_after_migration.mdwn ./doc/bugs/fails_to_handle_lot_of_files.mdwn ./doc/bugs/tests_fail_when_there_is_no_global_.gitconfig_for_the_user.mdwn ./doc/bugs/git_annex_initremote_walks_.git-annex.mdwn ./doc/bugs/git-annex_incorrectly_parses_bare_IPv6_addresses.mdwn ./doc/bugs/git_annex_version_should_without_being_in_a_repo_.mdwn ./doc/bugs/Can__39__t___34__git-annex_get__34___with_3.20111203.mdwn ./doc/bugs/Prevent_accidental_merges/comment_1_4c46a193915eab8f308a04175cb2e40a._comment ./doc/bugs/conflicting_haskell_packages/comment_1_e552a6cc6d7d1882e14130edfc2d6b3b._comment ./doc/bugs/tmp_file_handling.mdwn ./doc/bugs/annex_add_in_annex.mdwn ./doc/bugs/making_annex-merge_try_a_fast-forward.mdwn ./doc/bugs/bad_behaviour_with_file_names_with_newline_in_them.mdwn ./doc/bugs/on--git-dir_and_--work-tree_options.mdwn ./doc/bugs/Makefile_is_missing_dependancies.mdwn ./doc/bugs/test_suite_shouldn__39__t_fail_silently.mdwn ./doc/bugs/git_annex_upgrade_output_is_inconsistent_and_spammy.mdwn ./doc/bugs/problem_with_upgrade_v2_-__62___v3/comment_4_91439d4dbbf1461e281b276eb0003691._comment ./doc/bugs/problem_with_upgrade_v2_-__62___v3/comment_6_f360f0006bc9115bc5a3e2eb9fe58abd._comment ./doc/bugs/problem_with_upgrade_v2_-__62___v3/comment_3_86d9e7244ae492bcbe62720b8c4fc4a9._comment ./doc/bugs/problem_with_upgrade_v2_-__62___v3/comment_2_cd0123392b16d89db41b45464165c247._comment ./doc/bugs/problem_with_upgrade_v2_-__62___v3/comment_1_5f60006c9bb095167d817f234a14d20b._comment ./doc/bugs/problem_with_upgrade_v2_-__62___v3/comment_5_ca33a9ca0df33f7c1b58353d7ffb943d._comment ./doc/bugs/wishlist:_query_things_like_description__44___trust_level.mdwn ./doc/bugs/git_rename_detection_on_file_move/comment_3_57010bcaca42089b451ad8659a1e018e._comment ./doc/bugs/git_rename_detection_on_file_move/comment_4_79d96599f757757f34d7b784e6c0e81c._comment ./doc/bugs/git_rename_detection_on_file_move/comment_5_d61f5693d947b9736b29fca1dbc7ad76._comment ./doc/bugs/git_rename_detection_on_file_move/comment_2_7101d07400ad5935f880dc00d89bf90e._comment ./doc/bugs/git_rename_detection_on_file_move/comment_1_0531dcfa833b0321a7009526efe3df33._comment ./doc/bugs/fsck_claims_failed_checksum_when_less_copies_than_required_are_found.mdwn ./doc/bugs/add_range_argument_to___34__git_annex_dropunused__34___.mdwn ./doc/bugs/git_rename_detection_on_file_move.mdwn ./doc/bugs/problem_commit_normal_links.mdwn ./doc/bugs/extraneous_shell_escaping_for_rsync_remotes.mdwn ./doc/bugs/git_annex_unused_seems_to_check_for_current_path.mdwn ./doc/bugs/Makefile_is_missing_dependancies/comment_6_24119fc5d5963ce9dd669f7dcf006859._comment ./doc/bugs/Makefile_is_missing_dependancies/comment_3_c38b6f4abc9b9ad413c3b83ca04386c3._comment ./doc/bugs/Makefile_is_missing_dependancies/comment_8_a3555e3286cdc2bfeb9cde0ff727ba74._comment ./doc/bugs/Makefile_is_missing_dependancies/comment_2_416f12dbd0c2b841fac8164645b81df5._comment ./doc/bugs/Makefile_is_missing_dependancies/comment_5_0a1c52e2c96d19b9c3eb7e99b8c2434f._comment ./doc/bugs/Makefile_is_missing_dependancies/comment_7_96fd4725df4b54e670077a18d3ac4943._comment ./doc/bugs/Makefile_is_missing_dependancies/comment_1_5a3da5f79c8563c7a450aa29728abe7c._comment ./doc/bugs/Makefile_is_missing_dependancies/comment_4_cc13873175edf191047282700315beee._comment ./doc/bugs/Trouble_initializing_git_annex_on_NFS.mdwn ./doc/bugs/touch.hsc_has_problems_on_non-linux_based_systems.mdwn ./doc/bugs/build_issue_with_latest_release_0.20110522-1-gde817ba.mdwn ./doc/bugs/weird_local_clone_confuses.mdwn ./doc/bugs/fsck_output.mdwn ./doc/bugs/git-annex_branch_push_race.mdwn ./doc/bugs/wishlist:_allow_users_to_provide_UUID_when_running___96__git_annex_init__96__.mdwn ./doc/bugs/git-annex_has_issues_with_git_when_staging__47__commiting_logs.mdwn ./doc/bugs/git_annex_gets_confused_about_remotes_with_dots_in_their_names.mdwn ./doc/bugs/unannex_vs_unlock_hook_confusion.mdwn ./doc/bugs/Cabal_dependency_monadIO_missing/comment_2_4f4d8e1e00a2a4f7e8a8ab082e16adac._comment ./doc/bugs/Cabal_dependency_monadIO_missing/comment_1_14be660aa57fadec0d81b32a8b52c66f._comment ./doc/bugs/conflicting_haskell_packages.mdwn ./doc/bugs/git_command_line_constructed_by_unannex_command_has_tons_of_redundant_-a_paramters.mdwn ./doc/bugs/backend_version_upgrade_leaves_repo_unusable.mdwn ./doc/bugs/fat_support/comment_3_df3b943bc1081a8f3f7434ae0c8e061e._comment ./doc/bugs/fat_support/comment_4_90a8a15bedd94480945a374f9d706b86._comment ./doc/bugs/fat_support/comment_5_64bbf89de0836673224b83fdefa0407b._comment ./doc/bugs/fat_support/comment_1_04bcc4795d431e8cb32293aab29bbfe2._comment ./doc/bugs/fat_support/comment_2_bb4a97ebadb5c53809fc78431eabd7c8._comment ./doc/bugs/unannex_command_doesn__39__t_all_files.mdwn ./doc/bugs/annex_unannex__47__uninit_should_handle_copies.mdwn ./doc/bugs/git-annex_branch_corruption.mdwn ./doc/bugs/git_annex_fsck_is_a_no-op_in_bare_repos.mdwn ./doc/bugs/Unfortunate_interaction_with_Calibre.mdwn ./doc/bugs/error_propigation.mdwn ./doc/bugs/wishlist:_support_drop__44___find_on_special_remotes.mdwn ./doc/bugs/scp_interrupt_to_background.mdwn ./doc/bugs/copy_fast_confusing_with_broken_locationlog.mdwn ./doc/bugs/uninit_does_not_work_in_old_repos/comment_1_bc0619c6e17139df74639448aa6a0f72._comment ./doc/bugs/git-annex_losing_rsync_remotes_with_encryption_enabled.mdwn ./doc/bugs/configure_script_should_detect_uuidgen_instead_of_just_uuid.mdwn ./doc/bugs/check_for_curl_in_configure.hs.mdwn ./doc/bugs/fails_to_handle_lot_of_files/comment_1_09d8e4e66d8273fab611bd29e82dc7fc._comment ./doc/bugs/fails_to_handle_lot_of_files/comment_2_fd2ec05f4b5a7a6ae6bd9f5dbc3156de._comment ./doc/bugs/Name_scheme_does_not_follow_git__39__s_rules.mdwn ./doc/bugs/concurrent_git-annex_processes_can_lead_to_locking_issues.mdwn ./doc/bugs/Prevent_accidental_merges.mdwn ./doc/bugs/building_on_lenny.mdwn ./doc/bugs/case_sensitivity_on_FAT.mdwn ./doc/bugs/encrypted_S3_stalls.mdwn ./doc/bugs/support_bare_git_repo__44___with_the_annex_directory_exposed_to_http.mdwn ./doc/bugs/WORM:_Handle_long_filenames_correctly.mdwn ./doc/logo_small.png ./doc/tips.mdwn ./doc/use_case/Bob.mdwn ./doc/use_case/Alice.mdwn ./doc/upgrades/SHA_size.mdwn ./doc/news/sharebox_a_FUSE_filesystem_for_git-annex.mdwn ./doc/news/version_3.20111122.mdwn ./doc/news/version_3.20111203.mdwn ./doc/news/version_3.20111107.mdwn ./doc/news/LWN_article.mdwn ./doc/news/version_3.20111211.mdwn ./doc/news/version_3.20111111.mdwn ./doc/git-union-merge.mdwn ./doc/special_remotes/S3.mdwn ./doc/special_remotes/web.mdwn ./doc/special_remotes/bup.mdwn ./doc/special_remotes/directory.mdwn ./doc/special_remotes/hook.mdwn ./doc/special_remotes/rsync.mdwn ./doc/users/joey.mdwn ./doc/users/fmarier.mdwn ./doc/users/chrysn.mdwn ./doc/users/gebi.mdwn ./doc/templates/walkthrough.tmpl ./doc/templates/bare.tmpl ./doc/index.mdwn ./doc/summary.mdwn ./doc/forum.mdwn ./doc/encryption/comment_1_1afca8d7182075d46db41f6ad3dd5911._comment ./doc/transferring_data.mdwn ./doc/download.mdwn ./doc/future_proofing.mdwn ./doc/todo/auto_remotes/discussion.mdwn ./doc/todo/file_copy_progress_bar.mdwn ./doc/todo/use_cp_reflink.mdwn ./doc/todo/gitrm.mdwn ./doc/todo/exclude_files_on_a_given_remote.mdwn ./doc/todo/git-annex_unused_eats_memory.mdwn ./doc/todo/Please_abort_build_if___34__make_test__34___fails.mdwn ./doc/todo/add_--exclude_option_to_git_annex_find.mdwn ./doc/todo/tahoe_lfs_for_reals/comment_2_80b9e848edfdc7be21baab7d0cef0e3a._comment ./doc/todo/tahoe_lfs_for_reals/comment_1_0a4793ce6a867638f6e510e71dd4bb44._comment ./doc/todo/object_dir_reorg_v2.mdwn ./doc/todo/S3.mdwn ./doc/todo/auto_remotes.mdwn ./doc/todo/wishlist:_support_for_more_ssh_urls_.mdwn ./doc/todo/support-non-utf8-locales.mdwn ./doc/todo/done.mdwn ./doc/todo/fsck.mdwn ./doc/todo/support_S3_multipart_uploads.mdwn ./doc/todo/wishlist:_Provide_a___34__git_annex__34___command_that_will_skip_duplicates.mdwn ./doc/todo/pushpull.mdwn ./doc/todo/smudge.mdwn ./doc/todo/cache_key_info/comment_1_578df1b3b2cbfdc4aa1805378f35dc48._comment ./doc/todo/optimise_git-annex_merge.mdwn ./doc/todo/object_dir_reorg_v2/comment_3_79bdf9c51dec9f52372ce95b53233bb2._comment ./doc/todo/object_dir_reorg_v2/comment_7_42501404c82ca07147e2cce0cff59474._comment ./doc/todo/object_dir_reorg_v2/comment_5_821c382987f105da72a50e0a5ce61fdc._comment ./doc/todo/object_dir_reorg_v2/comment_1_ba03333dc76ff49eccaba375e68cb525._comment ./doc/todo/object_dir_reorg_v2/comment_2_81276ac309959dc741bc90101c213ab7._comment ./doc/todo/object_dir_reorg_v2/comment_6_8834c3a3f1258c4349d23aff8549bf35._comment ./doc/todo/object_dir_reorg_v2/comment_4_93aada9b1680fed56cc6f0f7c3aca5e5._comment ./doc/todo/union_mounting.mdwn ./doc/todo/wishlist:_swift_backend.mdwn ./doc/todo/Please_add_support_for_monad-control_0.3.x.mdwn ./doc/todo/wishlist:_swift_backend/comment_1_e6efbb35f61ee521b473a92674036788._comment ./doc/todo/wishlist:_swift_backend/comment_2_5d8c83b0485112e98367b7abaab3f4e3._comment ./doc/todo/git_annex_init_:_include_repo_description_and__47__or_UUID_in_commit_message.mdwn ./doc/todo/gitolite_and_gitosis_support.mdwn ./doc/todo/wishlist:___34__git_annex_add__34___multiple_processes.mdwn ./doc/todo/hidden_files.mdwn ./doc/todo/smudge/comment_1_4ea616bcdbc9e9a6fae9f2e2795c31c9._comment ./doc/todo/smudge/comment_2_e04b32caa0d2b4c577cdaf382a3ff7f6._comment ./doc/todo/network_remotes.mdwn ./doc/todo/add_a_git_backend.mdwn ./doc/todo/parallel_possibilities/comment_1_d8e34fc2bc4e5cf761574608f970d496._comment ./doc/todo/parallel_possibilities/comment_2_adb76f06a7997abe4559d3169a3181c3._comment ./doc/todo/checkout.mdwn ./doc/todo/immutable_annexed_files.mdwn ./doc/todo/wishlist:_Prevent_repeated_password_prompts_for_one_command.mdwn ./doc/todo/git-annex-shell.mdwn ./doc/todo/speed_up_fsck.mdwn ./doc/todo/tahoe_lfs_for_reals.mdwn ./doc/todo/avoid_unnecessary_union_merges.mdwn ./doc/todo/support_fsck_in_bare_repos.mdwn ./doc/todo/add_-all_option.mdwn ./doc/todo/using_url_backend.mdwn ./doc/todo/branching.mdwn ./doc/todo/rsync.mdwn ./doc/todo/backendSHA1.mdwn ./doc/todo/cache_key_info.mdwn ./doc/todo/parallel_possibilities.mdwn ./doc/todo/symlink_farming_commit_hook.mdwn ./doc/feeds.mdwn ./doc/copies.mdwn ./doc/repomap.png ./doc/special_remotes.mdwn ./doc/todo.mdwn ./doc/walkthrough/using_ssh_remotes.mdwn ./doc/walkthrough/automatically_managing_content.mdwn ./doc/walkthrough/removing_files/comment_1_cb65e7c510b75be1c51f655b058667c6._comment ./doc/walkthrough/removing_files/comment_2_64709ea4558915edd5c8ca4486965b07._comment ./doc/walkthrough/moving_file_content_between_repositories.mdwn ./doc/walkthrough/modifying_annexed_files.mdwn ./doc/walkthrough/more.mdwn ./doc/walkthrough/removing_files.mdwn ./doc/walkthrough/creating_a_repository.mdwn ./doc/walkthrough/adding_a_remote.mdwn ./doc/walkthrough/adding_a_remote/comment_1_0a59355bd33a796aec97173607e6adc9._comment ./doc/walkthrough/adding_a_remote/comment_2_f8cd79ef1593a8181a7f1086a87713e8._comment ./doc/walkthrough/adding_a_remote/comment_3_60691af4400521b5a8c8d75efe3b44cb._comment ./doc/walkthrough/adding_a_remote/comment_4_6f7cf5c330272c96b3abeb6612075c9d._comment ./doc/walkthrough/removing_files:_When_things_go_wrong.mdwn ./doc/walkthrough/renaming_files.mdwn ./doc/walkthrough/using_bup.mdwn ./doc/walkthrough/fsck:_when_things_go_wrong.mdwn ./doc/walkthrough/adding_files.mdwn ./doc/walkthrough/unused_data.mdwn ./doc/walkthrough/fsck:_verifying_your_data.mdwn ./doc/walkthrough/getting_file_content.mdwn ./doc/walkthrough/backups.mdwn ./doc/walkthrough/transferring_files:_When_things_go_wrong.mdwn ./doc/GPL ./doc/logo.png ./doc/location_tracking.mdwn ./doc/design.mdwn ./doc/news.mdwn ./doc/tips/untrusted_repositories.mdwn ./doc/tips/automatically_getting_files_on_checkout.mdwn ./doc/tips/what_to_do_when_a_repository_is_corrupted.mdwn ./doc/tips/Internet_Archive_via_S3.mdwn ./doc/tips/what_to_do_when_you_lose_a_repository.mdwn ./doc/tips/using_Amazon_S3.mdwn ./doc/tips/using_the_web_as_a_special_remote.mdwn ./doc/tips/powerful_file_matching.mdwn ./doc/tips/using_gitolite_with_git-annex.mdwn ./doc/tips/recover_data_from_lost+found.mdwn ./doc/tips/centralized_git_repository_tutorial.mdwn ./doc/tips/using_git_annex_with_no_fixed_hostname_and_optimising_ssh.mdwn ./doc/tips/using_the_SHA1_backend.mdwn ./doc/tips/migrating_data_to_a_new_backend.mdwn ./doc/encryption.mdwn ./doc/not.mdwn ./doc/download/comment_7_a5eebd214b135f34b18274a682211943._comment ./doc/download/comment_3_cf6044ebe99f71158034e21197228abd._comment ./doc/download/comment_5_c6b1bc40226fc2c8ba3e558150856992._comment ./doc/download/comment_6_3a52993d3553deb9a413debec9a5f92d._comment ./doc/download/comment_2_f85f72b33aedc3425f0c0c47867d02f3._comment ./doc/download/comment_8_59a976de6c7d333709b92f7cd5830850._comment ./doc/download/comment_4_10fc013865c7542c2ed9d6c0963bb391._comment ./doc/download/comment_1_fbd8b6d39e9d3c71791551358c863966._comment ./doc/contact.mdwn ./doc/trust.mdwn ./doc/bare_repositories.mdwn ./doc/distributed_version_control.mdwn ./doc/install.mdwn ./doc/git-annex-shell.mdwn ./doc/bugs.mdwn ./doc/meta.mdwn ./doc/design/encryption/comment_2_a610b3d056a059899178859a3a821ea5._comment ./doc/design/encryption/comment_3_cca186a9536cd3f6e86994631b14231c._comment ./doc/design/encryption/comment_1_4715ffafb3c4a9915bc33f2b26aaa9c1._comment ./doc/design/encryption/comment_4_8f3ba3e504b058791fc6e6f9c38154cf._comment ./doc/design/encryption.mdwn ./doc/comments.mdwn ./doc/git-annex.mdwn ./doc/internals.mdwn ./doc/users.mdwn ./doc/install/Ubuntu.mdwn ./doc/install/Debian.mdwn ./doc/install/OSX.mdwn ./doc/install/FreeBSD.mdwn ./doc/install/OSX/comment_1_0a1760bf0db1f1ba89bdb4c62032f631._comment ./doc/install/comment_3_cff163ea3e7cad926f4ed9e78b896598._comment ./doc/install/Debian/comment_2_648e3467e260cdf233acdb0b53313ce0._comment ./doc/install/Debian/comment_1_029486088d098c2d4f1099f2f0e701a9._comment ./doc/install/Fedora.mdwn ./doc/install/comment_4_82a17eee4a076c6c79fddeda347e0c9a._comment ./doc/walkthrough.mdwn ./CmdLine.hs ./Messages.hs ./Setup.hs ./GPL ./mdwn2man ./Remote.hs ./git-annex.hs ./Locations.hs ./Backend/WORM.hs ./Backend/URL.hs ./Backend/SHA.hs ./Options.hs ./git-annex-shell.hs ./test.hs ./INSTALL ./Remote/Web.hs ./Remote/S3stub.hs ./Remote/Helper/Encryptable.hs ./Remote/Helper/Special.hs ./Remote/Directory.hs ./Remote/S3real.hs ./Remote/Bup.hs ./Remote/Hook.hs ./Remote/Rsync.hs ./Remote/Git.hs ./Build/TestConfig.hs ./Upgrade.hs ./Annex/Version.hs ./Annex/Exception.hs ./Annex/CatFile.hs ./Annex/Ssh.hs ./Annex/Queue.hs ./Annex/Branch.hs ./Annex/UUID.hs ./Annex/Content.hs ./git-union-merge.hs ./Utility/Path.hs ./Utility/BadPrelude.hs ./Utility/Matcher.hs ./Utility/TempFile.hs ./Utility/Url.hs ./Utility/DataUnits.hs ./Utility/StatFS.hsc ./Utility/Conditional.hs ./Utility/Monad.hs ./Utility/RsyncFile.hs ./Utility/CopyFile.hs ./Utility/Misc.hs ./Utility/SafeCommand.hs ./Utility/Directory.hs ./Utility/FileMode.hs ./Utility/JSONStream.hs ./Utility/Dot.hs ./Utility/Touch.hsc ./Utility/Base64.hs ./Types/Crypto.hs ./Types/UUID.hs ./Types/TrustLevel.hs ./Types/Remote.hs ./Types/BranchState.hs ./Types/Command.hs ./Types/Backend.hs ./Types/Key.hs ./Config.hs ./Checks.hs ./Command.hs ./.gitignore ./Backend.hs ./Logs/Web.hs ./Logs/UUIDBased.hs ./Logs/Trust.hs ./Logs/Location.hs ./Logs/UUID.hs ./Logs/Remote.hs ./Logs/Presence.hs ./.gitattributes ./Git.hs ./Limit.hs ./GitAnnex.hs Homepage: http://git-annex.branchable.com/ Build-type: Custom Category: Utility@@ -31,7 +31,7 @@ Build-Depends: MissingH, hslogger, directory, filepath, unix, containers, utf8-string, network, mtl, bytestring, old-locale, time, pcre-light, extensible-exceptions, dataenc, SHA, process, hS3, HTTP,- base < 5, monad-control, json+ base < 5, monad-control < 0.3, json Executable git-annex-shell Main-Is: git-annex-shell.hs
git-union-merge.hs view
@@ -42,5 +42,5 @@ _ <- Git.useIndex (tmpIndex g) setup g Git.UnionMerge.merge aref bref g- Git.commit "union merge" newref [aref, bref] g+ _ <- Git.commit "union merge" newref [aref, bref] g cleanup g
test.hs view
@@ -11,11 +11,10 @@ import System.Posix.Directory (changeWorkingDirectory) import System.Posix.Files-import Control.Exception (bracket_, bracket)+import Control.Exception (bracket_, bracket, throw) import System.IO.Error import System.Posix.Env import qualified Control.Exception.Extensible as E-import Control.Exception (throw) import qualified Data.Map as M import System.IO.HVFS (SystemFS(..))