Rename svn_root -> git_root

benmezger · benmezger · commit 53d96d1362ed · 2026-04-11T13:35:31.000+02:00
diff --git a/main/admin.py b/main/admin.py
@@ -17,7 +17,7 @@ class ArchAdmin(admin.ModelAdmin):
 
 
 class RepoAdmin(admin.ModelAdmin):
-    list_display = ('name', 'testing', 'staging', 'bugs_project', 'bugs_category', 'svn_root')
+    list_display = ('name', 'testing', 'staging', 'bugs_project', 'bugs_category', 'git_root')
     list_filter = ('testing', 'staging')
     search_fields = ('name',)
 
diff --git a/main/fixtures/repos.json b/main/fixtures/repos.json
@@ -7,7 +7,7 @@
             "staging": false, 
             "name": "Extra-Testing",
             "bugs_project": 5, 
-            "svn_root": "packages",
+            "git_root": "packages",
             "testing": true
         }
     }, 
@@ -19,7 +19,7 @@
             "staging": true, 
             "name": "Extra-Staging",
             "bugs_project": 5, 
-            "svn_root": "packages",
+            "git_root": "packages",
             "testing": false
         }
     }, 
@@ -31,7 +31,7 @@
             "staging": false, 
             "name": "Core", 
             "bugs_project": 1, 
-            "svn_root": "packages", 
+            "git_root": "packages", 
             "testing": false
         }
     }, 
@@ -43,7 +43,7 @@
             "staging": false, 
             "name": "Extra", 
             "bugs_project": 1, 
-            "svn_root": "packages", 
+            "git_root": "packages", 
             "testing": false
         }
     }, 
@@ -55,7 +55,7 @@
             "staging": true, 
             "name": "Gnome-Unstable", 
             "bugs_project": 1, 
-            "svn_root": "packages", 
+            "git_root": "packages", 
             "testing": false
         }
     }, 
@@ -67,7 +67,7 @@
             "staging": true, 
             "name": "KDE-Unstable", 
             "bugs_project": 1, 
-            "svn_root": "packages", 
+            "git_root": "packages", 
             "testing": false
         }
     }, 
@@ -79,7 +79,7 @@
             "staging": false, 
             "name": "Multilib", 
             "bugs_project": 5, 
-            "svn_root": "community", 
+            "git_root": "community", 
             "testing": false
         }
     }, 
@@ -91,7 +91,7 @@
             "staging": true, 
             "name": "Multilib-Staging", 
             "bugs_project": 5, 
-            "svn_root": "community", 
+            "git_root": "community", 
             "testing": false
         }
     }, 
@@ -103,7 +103,7 @@
             "staging": false, 
             "name": "Multilib-Testing", 
             "bugs_project": 5, 
-            "svn_root": "community", 
+            "git_root": "community", 
             "testing": true
         }
     }, 
@@ -115,7 +115,7 @@
             "staging": true, 
             "name": "Staging", 
             "bugs_project": 1, 
-            "svn_root": "packages", 
+            "git_root": "packages", 
             "testing": false
         }
     }, 
@@ -127,7 +127,7 @@
             "staging": false, 
             "name": "Core-Testing",
             "bugs_project": 1, 
-            "svn_root": "packages", 
+            "git_root": "packages", 
             "testing": true
         }
     },
@@ -139,7 +139,7 @@
             "staging": true, 
             "name": "Core-Staging",
             "bugs_project": 1, 
-            "svn_root": "packages", 
+            "git_root": "packages", 
             "testing": false
         }
     }
diff --git a/main/migrations/0006_rename_svn_root_repo_git_root.py b/main/migrations/0006_rename_svn_root_repo_git_root.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.2.13 on 2026-04-11 11:33
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0005_merge_0004_rebuilderdstatus_build_id_0004_soname'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='repo',
+            old_name='svn_root',
+            new_name='git_root',
+        ),
+    ]
diff --git a/main/models.py b/main/models.py
@@ -74,8 +74,8 @@ class Repo(models.Model):
         default=1, help_text="Flyspray project ID for this repository.")
     bugs_category = models.SmallIntegerField(
         default=2, help_text="Flyspray category ID for this repository.")
-    svn_root = models.CharField(
-        max_length=64, help_text="SVN root (e.g. path) for this repository.")
+    git_root = models.CharField(
+        max_length=64, help_text="Git root (e.g. path) for this repository.")
 
     def __str__(self):
         return self.name
diff --git a/settings.py b/settings.py
@@ -181,10 +181,6 @@
 PGP_SERVER = 'keyserver.ubuntu.com'
 PGP_SERVER_SECURE = True
 
-# URL for SVN access for fetching commit messages (note absence of packages or
-# community bit on the end, repo.svn_root is appended)
-SVN_BASE_URL = 'svn://svn.archlinux.org/'
-
 GITLAB_PACKAGES_REPO = 'https://gitlab.archlinux.org/archlinux/packaging/packages'
 GITLAB_PACKAGE_REPO = 'archlinux/packaging/packages'
 GITLAB_INSTANCE = 'gitlab.archlinux.org'
diff --git a/templates/todolists/view.html b/templates/todolists/view.html
@@ -33,8 +33,8 @@ <h2>{{ list.kind_str | title }} Todo List {{ list.name }}</h2>
 
     <div class="todo-pkgbases">
         <p>Link to lists of pkgbase values:</p>
-        <ul>{% for svn_root in svn_roots %}
-            <li><a href="pkgbases/{{ svn_root }}/">{{ svn_root }}</a></li>
+        <ul>{% for git_root in git_roots %}
+            <li><a href="pkgbases/{{ git_root }}/">{{ git_root }}</a></li>
         {% endfor %}</ul>
     </div>
 
diff --git a/todolists/urls.py b/todolists/urls.py
@@ -25,7 +25,7 @@
             permission_required('todolists.delete_todolist')(DeleteTodolist.as_view())),
     re_path(r'^(?P<slug>[-\w]+)/flag/(?P<pkg_id>\d+)/$',
             permission_required('todolists.change_todolistpackage')(flag)),
-    re_path(r'^(?P<slug>[-\w]+)/pkgbases/(?P<svn_root>[a-z]+)/$',
+    re_path(r'^(?P<slug>[-\w]+)/pkgbases/(?P<git_root>[a-z]+)/$',
             list_pkgbases),
 ]
 
diff --git a/todolists/views.py b/todolists/views.py
@@ -59,8 +59,8 @@ def flag(request, slug, pkg_id):
 
 def view(request, slug):
     todolist = get_object_or_404(Todolist, slug=slug)
-    svn_roots = Repo.objects.values_list(
-        'svn_root', flat=True).order_by().distinct()
+    git_roots = Repo.objects.values_list(
+        'git_root', flat=True).order_by().distinct()
     # we don't hold onto the result, but the objects are the same here,
     # so accessing maintainers in the template is now cheap
     attach_maintainers(todolist.packages())
@@ -69,17 +69,17 @@ def view(request, slug):
     repos = {tp.repo for tp in todolist.packages()}
     context = {
         'list': todolist,
-        'svn_roots': svn_roots,
+        'git_roots': git_roots,
         'arches': sorted(arches),
         'repos': sorted(repos),
     }
     return render(request, 'todolists/view.html', context)
 
 
-def list_pkgbases(request, slug, svn_root):
+def list_pkgbases(request, slug, git_root):
     '''Used to make bulk moves of packages a lot easier.'''
     todolist = get_object_or_404(Todolist, slug=slug)
-    repos = get_list_or_404(Repo, svn_root=svn_root)
+    repos = get_list_or_404(Repo, git_root=git_root)
     pkgbases = TodolistPackage.objects.values_list(
         'pkgbase', flat=True).filter(
         todolist=todolist, repo__in=repos, removed__isnull=True).order_by(

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`permission_required('todolists.delete_todolist')(DeleteTodolist.as_view())),`
`26`	`26`	`re_path(r'^(?P<slug>[-\w]+)/flag/(?P<pkg_id>\d+)/$',`
`27`	`27`	`permission_required('todolists.change_todolistpackage')(flag)),`
`28`		`- re_path(r'^(?P<slug>[-\w]+)/pkgbases/(?P<svn_root>[a-z]+)/$',`
	`28`	`+ re_path(r'^(?P<slug>[-\w]+)/pkgbases/(?P<git_root>[a-z]+)/$',`
`29`	`29`	`list_pkgbases),`
`30`	`30`	`]`
`31`	`31`