Ticket #4612: trac-0.10.3-changeset.revision_in_querystring.3.patch

trac/versioncontrol/web_ui/changeset.py

@@ -92 +92 @@
         If this option is disabled, changeset messages will be rendered as
         pre-formatted text.""")
 
-    # INavigationContributor methods
+    revision_in_querystring = BoolOption('changeset', 'revision_in_querystring',
+                                      'false',
+        """Set to true if you want the chagneset URLs to be formatted like
+        /changeset/path?new=revision instead of /cangeset/revision/path
+        That makes sense when your revision ids can contain '/'.
+        
+        Set to false to keep the previous befavior.
+        """)
 
+        # INavigationContributor methods
+
     def get_active_navigation_item(self, req):
         return 'browser'
 
@@ -108 +117 @@
     # IRequestHandler methods
 
     _request_re = re.compile(r"/changeset(?:/([^/]+))?(/.*)?$")
+    _request_re2 = re.compile(r"/changeset/?(.*)$")
 
     def match_request(self, req):
-        match = re.match(self._request_re, req.path_info)
-        if match:
-            new, new_path = match.groups()
-            if new:
-                req.args['new'] = new
-            if new_path:
-                req.args['new_path'] = new_path
-            return True
+        new, new_path = None, None
+        if not self.revision_in_querystring:
+            match = re.match(self._request_re, req.path_info)
+            if match:
+                new, new_path = match.groups()
+        else:
+            match = re.match(self._request_re2, req.path_info)
+            if match:
+                new_path, = match.groups()
+        if new:
+            req.args['new'] = new
+        if new_path:
+            req.args['new_path'] = new_path
+        return match != None
 
     def process_request(self, req):
         """The appropriate mode of operation is inferred from the request
@@ -645 +661 @@
 
                 if format == 'rss':
                     title = Markup('Changeset [%s]: %s', chgset.rev, shortlog)
-                    href = req.abs_href.changeset(chgset.rev)
+                    if self.revision_in_querystring:
+                        href = req.abs_href.changeset(new=chgset.rev)
+                    else:
+                        href = req.abs_href.changeset(chgset.rev)
                     if wiki_format:
                         message = wiki_to_html(message, self.env, req, db,
                                                absurls=True)
@@ -654 +673 @@
                 else:
                     title = Markup('Changeset <em>[%s]</em> by %s', chgset.rev,
                                    chgset.author)
-                    href = req.href.changeset(chgset.rev)
+                    if self.revision_in_querystring:
+                        href = req.abs_href.changeset(new=chgset.rev)
+                    else:
+                        href = req.abs_href.changeset(chgset.rev)
 
                     if wiki_format:
                         if self.timeline_long_messages:
@@ -706 +728 @@
                                                          fullmatch)
         if intertrac:
             return intertrac
-        sep = chgset.find('/')
-        if sep > 0:
-            rev, path = chgset[:sep], chgset[sep:]
+        sep1 = chgset.find('@')
+        sep2 = chgset.find('/')
+        if sep1 >= 0:
+            rev, path = chgset[sep1 + 1:], chgset[:sep1]
+        elif sep2 > 0:
+            rev, path = chgset[:sep2], chgset[sep2:]
         else:
             rev, path = chgset, None
+        if self.revision_in_querystring:
+            href_changeset = formatter.href.changeset(path, new=rev)
+        else:
+            href_changeset = formatter.href.changeset(rev, path)
         try:
             changeset = self.env.get_repository().get_changeset(rev)
             return html.A(label, class_="changeset",
                           title=shorten_line(changeset.message),
-                          href=formatter.href.changeset(rev, path))
+                          href=href_changeset)
         except NoSuchChangeset:
             return html.A(label, class_="missing changeset",
-                          href=formatter.href.changeset(rev, path),
+                          href=href_changeset,
                           rel="nofollow")
 
     def _format_diff_link(self, formatter, ns, params, label):