Changeset 120 in tracdarcs

Timestamp:

06/17/08 18:59:59 (4 years ago)

Author:

lele@…

Hash name:

20080617165959-97f81-01b798f29e7c925e146c0876e73dc6879e4d9156

Message:

Added the IWikiSyntaxProvider to the DarcsConnector
This allows the use of the native darcs hashname in place of the
artificial incremental number to reference any particular
changeset, either using the usual wiki syntax (that is,
[20080617091638-97f81-63d.....420.gz]) or as an argument to the
/changeset/ URL.

Location:

tracdarcs

Files:

• components.py (modified) (3 diffs)
• repository.py (modified) (1 diff)

tracdarcs/components.py

@@ -14 +14 @@
 # Author: Lele Gaifax <lele@metapensiero.it>
 
+from genshi.builder import tag
+
 from trac.config import BoolOption, Option
 from trac.core import Component, implements
 from trac.db import Column, DatabaseManager, Index, Table
 from trac.env import IEnvironmentSetupParticipant
-from trac.versioncontrol import IRepositoryConnector
+from trac.util.text import shorten_line
+from trac.versioncontrol import IRepositoryConnector, NoSuchChangeset
+from trac.wiki import IWikiSyntaxProvider
 
 from tracdarcs.repository import DarcsRepository
@@ -24 +28 @@
 class DarcsConnector(Component):
 
-    implements(IRepositoryConnector)
+    implements(IRepositoryConnector, IWikiSyntaxProvider)
 
     dont_escape_8bit = BoolOption('darcs', 'dont_escape_8bit', 'false',
@@ -45 +49 @@
             darcs = "DARCS_DONT_ESCAPE_8BIT=1 " + darcs
         return DarcsRepository(db, dir, self.env.log, darcs)
+
+    # IWikiSyntaxProvider methods
+
+    def get_wiki_syntax(self):
+        yield (r'[0-9]{14}-[0-9a-f]{5}-[0-9a-f]{40}.gz',
+               lambda formatter, label, match: self._format_link(formatter, 'cset', label, label))
+
+    def get_link_resolvers(self):
+        yield ('cset', self._format_link)
+
+    def _format_link(self, formatter, ns, rev, label):
+
+        repos = self.env.get_repository()
+        try:
+            chgset = repos.get_changeset(rev)
+            return tag.a(chgset.rev, class_="changeset",
+                         title=shorten_line(chgset.message),
+                         href=formatter.href.changeset(chgset.rev))
+        except NoSuchChangeset, e:
+            return tag.a(label, class_="missing changeset",
+                         title="No changeset for %s" % rev, rel="nofollow")
 
 class DarcsSetup(Component):

tracdarcs/repository.py

@@ -151 +151 @@
 
     def normalize_rev(self, rev):
-        youngest = self.get_youngest_rev()
-        if rev is None or rev == "":
-            return youngest
-        try:
-            rev = int(rev)
-        except ValueError, le:
-            raise TracError('Ill-formed revision: %s, error: %s' % (rev, le))
-        if rev > youngest:
-            rev = youngest
+        if isinstance(rev, basestring) and rev.endswith('.gz'):
+            c = self.db.cursor()
+            c.execute('SELECT rev FROM darcs_changesets '
+                      'WHERE hash = %s', (rev,))
+            row = c.fetchone()
+            if row is None:
+                raise NoSuchChangeset(rev)
+            rev = row[0]
+        else:
+            youngest = self.get_youngest_rev()
+            if rev is None or rev == "":
+                return youngest
+            try:
+                rev = int(rev)
+            except ValueError, le:
+                raise TracError('Ill-formed revision: %s, error: %s' % (rev, le))
+            if rev > youngest:
+                rev = youngest
         return rev