node_format = short and show_rev = yes not honored in post-commit message

[anonymous]

The post-commit message in a ticket's history always shows the full hash for the changeset and no revision number, irrespective of node_format = short and show_rev = yes settings. Same if they are omitted (they are the defaults anyways). The shortened hash and the revision number are correctly displayed in the timeline, source browser, and apparently anywhere else.

To reproduce: create a ticket, commit to hg repo with a commit message like 'closes #1' to trigger a ticket status change. Now the ticket status is 'closed' and its history shows a message with the full hex hash and without revision number.

System: Win7 64 bits, Python 2.7.6 32 bits, Trac 1.0.1, tracmercurial 1.0.0.3dev-r0 (installed globally), mercurial-3.1.1.win32-py2.7.exe from ​https://bitbucket.org/tortoisehg/files/downloads

[Jun Omae]

Indeed. I'll post diff for unit tests later.

diff --git a/tracopt/ticket/commit_updater.py b/tracopt/ticket/commit_updater.py
index aa4a9dc..3b43d6d 100644
--- a/tracopt/ticket/commit_updater.py
+++ b/tracopt/ticket/commit_updater.py
@@ -197,15 +197,18 @@ class CommitTicketUpdater(Component):

     def make_ticket_comment(self, repos, changeset):
         """Create the ticket comment from the changeset data."""
-        revstring = str(changeset.rev)
+        rev = changeset.rev
+        revstring = str(rev)
+        drev = str(repos.display_rev(rev))
         if repos.reponame:
             revstring += '/' + repos.reponame
+            drev += '/' + repos.reponame
         return """\
-In [changeset:"%s"]:
+In [changeset:"%s" %s]:
 {{{
 #!CommitTicketReference repository="%s" revision="%s"
 %s
-}}}""" % (revstring, repos.reponame, changeset.rev, changeset.message.strip())
+}}}""" % (revstring, drev, repos.reponame, rev, changeset.message.strip())
}}}

[Jun Omae]

Proposed changes in log:jomae.git@t11785. All tests pass.

[anonymous]

Works perfect now, thank you.

[Ryan J Ollos]

Change looks good and work well.

[Jun Omae]

Thanks for the reivew. Committed in [13346] and merged to trunk in [13347].