webapp: Rename "Upgrade Repository" to "Convert Repository"

To avoid confusion with git-annex upgrade.

Sponsored-by: Graham Spencer on Patreon
This commit is contained in:
Joey Hess 2025-06-24 12:33:48 -04:00
parent 064fdf531f
commit 34c4ae5696
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
5 changed files with 25 additions and 7 deletions

View file

@ -291,9 +291,9 @@ encrypted using gpg key:
|]
getRepoEncryption _ _ = return () -- local repo
getUpgradeRepositoryR :: RepoId -> Handler ()
getUpgradeRepositoryR (RepoUUID _) = redirect DashboardR
getUpgradeRepositoryR r = go =<< liftAnnex (repoIdRemote r)
getConvertRepositoryR :: RepoId -> Handler ()
getConvertRepositoryR (RepoUUID _) = redirect DashboardR
getConvertRepositoryR r = go =<< liftAnnex (repoIdRemote r)
where
go Nothing = redirect DashboardR
go (Just rmt) = do

View file

@ -36,7 +36,7 @@
/config/repository/edit/new/cloud/#UUID EditNewCloudRepositoryR GET POST
/config/repository/sync/disable/#RepoId DisableSyncR GET
/config/repository/sync/enable/#RepoId EnableSyncR GET
/config/repository/upgrade/#RepoId UpgradeRepositoryR GET
/config/repository/convert/#RepoId ConvertRepositoryR GET
/config/repository/add/drive AddDriveR GET POST
/config/repository/add/drive/confirm/#RemovableDrive ConfirmAddDriveR GET

View file

@ -4,6 +4,8 @@ git-annex (10.20250606) UNRELEASED; urgency=medium
which can happen with eg a S3 bucket.
* Avoid a problem with temp file names ending in whitespace on
filesystems like VFAT that don't support such filenames.
* webapp: Rename "Upgrade Repository" to "Convert Repository"
to avoid confusion with git-annex upgrade.
-- Joey Hess <id@joeyh.name> Mon, 23 Jun 2025 11:11:29 -0400

View file

@ -0,0 +1,16 @@
[[!comment format=mdwn
username="joey"
subject="""comment 1"""
date="2025-06-24T16:27:05Z"
content="""
This sets `remote.<name>.annex-ignore` to false in the git config.
You would normally only see this if the remote server didn't have
git-annex-shell installed so was only a git repository with no annex.
If it then got installed, so you were able to use git-annex to store
files there, this makes git-annex try again to use git-annex-shell in
that repository.
The naming is unfortunate since it's not related to upgrading the
repository version at all. I'll rename it to "Convert Repository".
"""]]

View file

@ -8,11 +8,11 @@
$if sshrepo
<p>
If this repository's ssh server has git-annex installed, you can #
upgrade this repository to a full git annex, which will store the
convert this repository to a full git annex, which will store the
contents of your files, not only their metadata.
<p>
<a .btn .btn-default href="@{UpgradeRepositoryR r}">
Upgrade Repository
<a .btn .btn-default href="@{ConvertRepositoryR r}">
Convert Repository
<h2>
Repository information
<p>