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

To avoid confusion with git-annex upgrade.

Sponsored-by: Graham Spencer on Patreon

diff --git a/Assistant/WebApp/Configurators/Edit.hs b/Assistant/WebApp/Configurators/Edit.hs
index 4103f6bccb18c8f3f6af4780f502783cfcb3e8aa..b0a9d7f4f1260e66050af60ecb8d872daa01a76e 100644 (file)
--- a/Assistant/WebApp/Configurators/Edit.hs
+++ b/Assistant/WebApp/Configurators/Edit.hs
@@ -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

diff --git a/Assistant/WebApp/routes b/Assistant/WebApp/routes
index 8774228081159bdaac5114f6faa4fff664e355ad..526a8741bcc1a96adea858d47262f1dec4c34e91 100644 (file)
--- a/Assistant/WebApp/routes
+++ b/Assistant/WebApp/routes
@@ -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

diff --git a/CHANGELOG b/CHANGELOG
index 2ce4f60831e9f093e168c66ad883733b9953be9c..bf58959309b2093b49e7724b14c57889f2bc3043 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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
 

diff --git a/doc/forum/What_does___34__upgrade__34___in_the_webapp_do__63__/comment_1_9fcb53dcfaa815e872ea5a84612d214b._comment b/doc/forum/What_does___34__upgrade__34___in_the_webapp_do__63__/comment_1_9fcb53dcfaa815e872ea5a84612d214b._comment
new file mode 100644 (file)
index 0000000..7b4abeb
--- /dev/null
+++ b/doc/forum/What_does___34__upgrade__34___in_the_webapp_do__63__/comment_1_9fcb53dcfaa815e872ea5a84612d214b._comment
@@ -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".
+"""]]

diff --git a/templates/configurators/edit/nonannexremote.hamlet b/templates/configurators/edit/nonannexremote.hamlet
index acfa10ec6634357926f2169e424327768c12a817..98be4763ef8252ff5ac75e76af786340da78c106 100644 (file)
--- a/templates/configurators/edit/nonannexremote.hamlet
+++ b/templates/configurators/edit/nonannexremote.hamlet
@@ -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>