Resource description of default repository is not good

[Jun Omae]

I noticed that get_resource_description with default repository returns u'Repository ' while working #10961. That result is not good….

>>> from trac.resource import Resource, get_resource_description
>>> from trac.test import EnvironmentStub
>>> resource = Resource('repository', id='')
>>> env = EnvironmentStub()
>>> get_resource_description(env, resource)
u'Repository '
>>> from trac.perm import PermissionError
>>> e = PermissionError('BROWSER_VIEW', resource, env)
>>> unicode(e)
u"BROWSER_VIEW privileges are required to perform this operation on Repository . You don't have the required permissions."

I think it should be u'Default repository' or u'Repository (default)'.

trac/versioncontrol/api.py

@@ -424 +424 @@
             return _('%(kind)s %(id)s%(at_version)s%(in_repo)s',
                      kind=kind, id=id, at_version=version, in_repo=in_repo)
         elif resource.realm == 'repository':
+            if not resource.id:
+                return _("Default repository")
             return _("Repository %(repo)s", repo=resource.id)
 
     def get_resource_url(self, resource, href, **kwargs):

Or

trac/versioncontrol/api.py

@@ -424 +424 @@
             return _('%(kind)s %(id)s%(at_version)s%(in_repo)s',
                      kind=kind, id=id, at_version=version, in_repo=in_repo)
         elif resource.realm == 'repository':
-            return _("Repository %(repo)s", repo=resource.id)
+            return _("Repository %(repo)s", repo=resource.id or _("(default)"))
 
     def get_resource_url(self, resource, href, **kwargs):
         if resource.realm == 'changeset':

I like the former.

[Ryan J Ollos]

Replying to jomae:

I like the former.

I like the former as well.

[Jun Omae]

Thanks. Committed in [12821] and merged to trunk in [12822].