diff options
| -rw-r--r-- | Assistant/Threads/WebApp.hs | 3 | ||||
| -rw-r--r-- | Command/Dead.hs | 6 | ||||
| -rw-r--r-- | Test.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | doc/assistant/deleterepository.png | bin | 0 -> 22780 bytes |
5 files changed, 9 insertions, 3 deletions
diff --git a/Assistant/Threads/WebApp.hs b/Assistant/Threads/WebApp.hs index 55f3d35b8..b7bfd0c4a 100644 --- a/Assistant/Threads/WebApp.hs +++ b/Assistant/Threads/WebApp.hs @@ -18,7 +18,6 @@ import Assistant.WebApp.SideBar import Assistant.WebApp.Notifications import Assistant.WebApp.RepoList import Assistant.WebApp.Configurators -import Assistant.WebApp.Configurators.Edit import Assistant.WebApp.Configurators.Local import Assistant.WebApp.Configurators.Ssh import Assistant.WebApp.Configurators.Pairing @@ -26,6 +25,8 @@ import Assistant.WebApp.Configurators.AWS import Assistant.WebApp.Configurators.WebDAV import Assistant.WebApp.Configurators.XMPP import Assistant.WebApp.Configurators.Preferences +import Assistant.WebApp.Configurators.Edit +import Assistant.WebApp.Configurators.Delete import Assistant.WebApp.Documentation import Assistant.WebApp.Control import Assistant.WebApp.OtherRepos diff --git a/Command/Dead.hs b/Command/Dead.hs index f4b654ed9..58bb093e7 100644 --- a/Command/Dead.hs +++ b/Command/Dead.hs @@ -31,6 +31,10 @@ start ws = do perform :: UUID -> CommandPerform perform uuid = do + markDead uuid + next $ return True + +markDead :: UUID -> Annex () +markDead uuid = do trustSet uuid DeadTrusted groupSet uuid S.empty - next $ return True @@ -851,7 +851,7 @@ cleanup dir = do -- removed via directory permissions; undo recurseDir SystemFS dir >>= filterM doesDirectoryExist >>= - mapM_ Utility.FileMode.allowWrite + mapM_ Utility.FileMode.allowWrite removeDirectoryRecursive dir checklink :: FilePath -> Assertion diff --git a/debian/changelog b/debian/changelog index a0fec4856..cc61a25af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ git-annex (4.20130324) UNRELEASED; urgency=low Thanks, guilhem for the patch. * git-annex-shell: Passes rsync --bwlimit options on rsync. Thanks, guilhem for the patch. + * webapp: Added UI to delete repositories. Closes: #689847 -- Joey Hess <joeyh@debian.org> Mon, 25 Mar 2013 10:21:46 -0400 diff --git a/doc/assistant/deleterepository.png b/doc/assistant/deleterepository.png Binary files differnew file mode 100644 index 000000000..20db674ca --- /dev/null +++ b/doc/assistant/deleterepository.png |
