Raw revision of cached git repository in search view

[Jun Omae]

If searching changesets in cached git repository, the revisions are displayed with no changes. The issue doesn't occur if mercurial because search system requires revision table and mercurial connector doesn't support cache.

Both 0.12.x with ​th:GitPlugin and 1.0.x have this issue.

We should show shortened revisions in search view.

Patch for 1.0-stable:

trac/versioncontrol/web_ui/changeset.py

@@ -1128 +1128 @@
                     SELECT repos, rev, time, author, message
                     FROM revision WHERE """ + sql,
                     args):
-                try:
-                    rev = int(rev)
-                except ValueError:
-                    pass
                 repos = repositories.get(id)
                 if not repos:
                     continue # revisions for a no longer active repository
                 cset = repos.resource.child('changeset', rev)
                 if 'CHANGESET_VIEW' in req.perm(cset):
+                    try:
+                        drev = repos.display_rev(rev)
+                    except NoSuchChangeset:
+                        continue
                     yield (req.href.changeset(rev, repos.reponame or None),
-                           '[%s]: %s' % (rev, shorten_line(log)),
+                           '[%s]: %s' % (drev, shorten_line(log)),
                            from_utimestamp(ts), author,
                            shorten_result(log, terms))
 

[Jun Omae]

Proposed changes in [00f2202d1/jomae.git] (jomae.git@t11777).

[Ryan J Ollos]

Looks good.

OT: I didn't know until hunting around in the code that Repository.display_rev can raise an NoSuchChangeset exception. Would it be useful to start adding to method documentation the exception types that can be raised?

[Jun Omae]

Indeed. Repository.display_rev(), normalize_rev() and short_rev() can raise a NoSuchChangeset exception because the methods normally checks existence of the given rev. In [fe9dc5d9b/jomae.git], added documentation to these methods.

I noticed that the same changeset are shown more than once if multiple repositories have the changeset. We could check whether the changesets are same using Repository.get_changeset_uid(). The method is used in ChangesetModule.get_timeline_events() as well.

After [54fad5d8/jomae.git], changesets would show only once in search view.

[Ryan J Ollos]

We could use the Sphinx markup since that's what used to generate ApiDocs:

"""
:raises NoSuchChangeset: if the given `rev` isn't found
"""

Removing duplicate changesets from search is probably a good idea.

[Jun Omae]

We could use the Sphinx markup since that's what used to generate ApiDocs:

"""
:raises NoSuchChangeset: if the given `rev` isn't found
"""

Thanks. I couldn't find existing apidoc for exceptions. I just find at tags/trac-1.0.2/trac/db/util.py@:156-157#L151​. I'll push the changes with your suggestions.

[Jun Omae]

Committed in [13482,13484-13485] and merged to trunk in [13483,13486].