b6d46c212e
* unannex, uninit: Avoid committing after every file is unannexed,
for massive speedup.
* --notify-finish switch will cause desktop notifications after each
file upload/download/drop completes
(using the dbus Desktop Notifications Specification)
* --notify-start switch will show desktop notifications when each
file upload/download starts.
* webapp: Automatically install Nautilus integration scripts
to get and drop files.
* tahoe: Pass -d parameter before subcommand; putting it after
the subcommand no longer works with tahoe-lafs version 1.10.
(Thanks, Alberto Berti)
* forget --drop-dead: Avoid removing the dead remote from the trust.log,
so that if git remotes for it still exist anywhere, git annex info
will still know it's dead and not show it.
* git-annex-shell: Make configlist automatically initialize
a remote git repository, as long as a git-annex branch has
been pushed to it, to simplify setup of remote git repositories,
including via gitolite.
* add --include-dotfiles: New option, perhaps useful for backups.
* Version 5.20140227 broke creation of glacier repositories,
not including the datacenter and vault in their configuration.
This bug is fixed, but glacier repositories set up with the broken
version of git-annex need to have the datacenter and vault set
in order to be usable. This can be done using git annex enableremote
to add the missing settings. For details, see
http://git-annex.branchable.com/bugs/problems_with_glacier/
* Added required content configuration.
* assistant: Improve ssh authorized keys line generated in local pairing
or for a remote ssh server to set environment variables in an
alternative way that works with the non-POSIX fish shell, as well
as POSIX shells.
# imported from the archive
84 lines
2.8 KiB
Haskell
84 lines
2.8 KiB
Haskell
{- git-annex command
|
|
-
|
|
- Copyright 2013 Joey Hess <joey@kitenet.net>
|
|
-
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
-}
|
|
|
|
module Command.Repair where
|
|
|
|
import Common.Annex
|
|
import Command
|
|
import qualified Annex
|
|
import qualified Git.Repair
|
|
import qualified Annex.Branch
|
|
import qualified Git.Ref
|
|
import Git.Types
|
|
import Annex.Version
|
|
|
|
def :: [Command]
|
|
def = [noCommit $ dontCheck repoExists $
|
|
command "repair" paramNothing seek SectionMaintenance "recover broken git repository"]
|
|
|
|
seek :: CommandSeek
|
|
seek = withNothing start
|
|
|
|
start :: CommandStart
|
|
start = next $ next $ runRepair =<< Annex.getState Annex.force
|
|
|
|
runRepair :: Bool -> Annex Bool
|
|
runRepair forced = do
|
|
(ok, modifiedbranches) <- inRepo $
|
|
Git.Repair.runRepair isAnnexSyncBranch forced
|
|
-- This command can be run in git repos not using git-annex,
|
|
-- so avoid git annex branch stuff in that case.
|
|
whenM (isJust <$> getVersion) $
|
|
repairAnnexBranch modifiedbranches
|
|
return ok
|
|
|
|
{- After git repository repair, the .git/annex/index file could
|
|
- still be broken, by pointing to bad objects, or might just be corrupt on
|
|
- its own. Since this index file is not used to stage things
|
|
- for long durations of time, it can safely be deleted if it is broken.
|
|
-
|
|
- Otherwise, if the git-annex branch was modified by the repair,
|
|
- commit the index file to the git-annex branch.
|
|
- This way, if the git-annex branch got rewound to an old version by
|
|
- the repository repair, or was completely deleted, this will get it back
|
|
- to a good state. Note that in the unlikely case where the git-annex
|
|
- branch was rewound to a state that, had new changes from elsewhere not
|
|
- yet reflected in the index, this does properly merge those into the
|
|
- index before committing.
|
|
-}
|
|
repairAnnexBranch :: [Branch] -> Annex ()
|
|
repairAnnexBranch modifiedbranches
|
|
| Annex.Branch.fullname `elem` modifiedbranches = ifM okindex
|
|
( commitindex
|
|
, do
|
|
nukeindex
|
|
missingbranch
|
|
)
|
|
| otherwise = ifM okindex
|
|
( noop
|
|
, do
|
|
nukeindex
|
|
ifM (null <$> inRepo (Git.Ref.matching [Annex.Branch.fullname]))
|
|
( missingbranch
|
|
, liftIO $ putStrLn "No data was lost."
|
|
)
|
|
)
|
|
where
|
|
okindex = Annex.Branch.withIndex $ inRepo $ Git.Repair.checkIndex
|
|
commitindex = do
|
|
Annex.Branch.forceCommit "committing index after git repository repair"
|
|
liftIO $ putStrLn "Successfully recovered the git-annex branch using .git/annex/index"
|
|
nukeindex = do
|
|
inRepo $ nukeFile . gitAnnexIndex
|
|
liftIO $ putStrLn "Had to delete the .git/annex/index file as it was corrupt."
|
|
missingbranch = liftIO $ putStrLn "Since the git-annex branch is not up-to-date anymore. It would be a very good idea to run: git annex fsck --fast"
|
|
|
|
trackingOrSyncBranch :: Ref -> Bool
|
|
trackingOrSyncBranch b = Git.Repair.isTrackingBranch b || isAnnexSyncBranch b
|
|
|
|
isAnnexSyncBranch :: Ref -> Bool
|
|
isAnnexSyncBranch b = "refs/synced/" `isPrefixOf` fromRef b
|