diff options
author | Joey Hess <joey@kitenet.net> | 2013-10-22 16:30:23 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2013-10-22 16:30:23 -0400 |
commit | ab8e457f99ebe309d6155607026051e52f59216d (patch) | |
tree | 6887b45ba758e60cc80b4e3a3006aa870b0b38c9 | |
parent | 3ca53d2779c695ebb6cbdd210fea2167562637ff (diff) |
UI tweaks
-rw-r--r-- | Assistant/Alert.hs | 4 | ||||
-rw-r--r-- | Assistant/Threads/Cronner.hs | 2 | ||||
-rw-r--r-- | doc/assistant/brokenrepositoryalert.png | bin | 0 -> 5806 bytes | |||
-rw-r--r-- | doc/assistant/repairrepository.png | bin | 0 -> 31791 bytes | |||
-rw-r--r-- | doc/design/assistant/disaster_recovery.mdwn | 10 |
5 files changed, 10 insertions, 6 deletions
diff --git a/Assistant/Alert.hs b/Assistant/Alert.hs index 4e6dab033..7e47e8396 100644 --- a/Assistant/Alert.hs +++ b/Assistant/Alert.hs @@ -82,7 +82,7 @@ warningAlert name msg = Alert errorAlert :: String -> AlertButton -> Alert errorAlert msg button = Alert { alertClass = Error - , alertHeader = Just $ tenseWords ["error"] + , alertHeader = Nothing , alertMessageRender = renderData , alertData = [UnTensed $ T.pack msg] , alertCounter = 0 @@ -175,7 +175,7 @@ fsckAlert button n = baseActivityAlert } brokenRepositoryAlert :: AlertButton -> Alert -brokenRepositoryAlert = errorAlert "Your repository needs repairs." +brokenRepositoryAlert = errorAlert "Serious problems have been detected with your repository. This needs your immediate attention!" pairingAlert :: AlertButton -> Alert pairingAlert button = baseActivityAlert diff --git a/Assistant/Threads/Cronner.hs b/Assistant/Threads/Cronner.hs index 786044b20..d0d277d77 100644 --- a/Assistant/Threads/Cronner.hs +++ b/Assistant/Threads/Cronner.hs @@ -192,7 +192,7 @@ runActivity' urlrenderer (ScheduledSelfFsck _ d) = do when (Git.Fsck.foundBroken fsckresults) $ do u <- liftAnnex getUUID liftAnnex $ writeFsckResults u fsckresults - button <- mkAlertButton True (T.pack "Repair") urlrenderer $ + button <- mkAlertButton True (T.pack "Click Here") urlrenderer $ RepairRepositoryR u void $ addAlert $ brokenRepositoryAlert button mapM_ reget =<< liftAnnex (dirKeys gitAnnexBadDir) diff --git a/doc/assistant/brokenrepositoryalert.png b/doc/assistant/brokenrepositoryalert.png Binary files differnew file mode 100644 index 000000000..ea001aec0 --- /dev/null +++ b/doc/assistant/brokenrepositoryalert.png diff --git a/doc/assistant/repairrepository.png b/doc/assistant/repairrepository.png Binary files differnew file mode 100644 index 000000000..d49ea9d95 --- /dev/null +++ b/doc/assistant/repairrepository.png diff --git a/doc/design/assistant/disaster_recovery.mdwn b/doc/design/assistant/disaster_recovery.mdwn index c630a72b4..ef6eb4730 100644 --- a/doc/design/assistant/disaster_recovery.mdwn +++ b/doc/design/assistant/disaster_recovery.mdwn @@ -57,10 +57,14 @@ call it for non-local remotes. ## git fsck -Have the sanity checker run git fsck periodically (it's fairly inexpensive, -but still not too often, and should be ioniced and niced). +Add git fsck to scheduled self fsck **done** -If committing to the repository fails, after resolving any dangling lock +TODO: Add git fsck of local remotes to scheduled remote fscks. + +TODO: Display an alert to nudge user to schedule a fsck, if none is +scheduled. Without being annoying about it. + +TODO: If committing to the repository fails, after resolving any dangling lock files (see above), it should git fsck. If git fsck finds problems, launch git repository repair. |