Merged [5005] from rjsparks@nostrum.com:

Enable diff on the conflict review history tab
Fixes bug ietf-tools#882
 - Legacy-Id: 5019
Note: SVN reference [5005] has been migrated to Git commit f3102cd

Author: levkowetz

ietf/idrfc/views_doc.py

@@ -209,7 +209,7 @@ def document_history(request, name):
     diff_revisions = []
     seen = set()
 
-    diffable = name.startswith("draft") or name.startswith("charter")
+    diffable = name.startswith("draft") or name.startswith("charter") or name.startswith("conflict-review")
 
     if diffable:
         for e in NewRevisionDocEvent.objects.filter(type="new_revision", doc__in=diff_documents).select_related('doc').order_by("-time", "-id"):
@@ -220,6 +220,9 @@ def document_history(request, name):
                 if name.startswith("charter"):
                     h = find_history_active_at(e.doc, e.time)
                     url = settings.CHARTER_TXT_URL + ("%s-%s.txt" % ((h or doc).canonical_name(), e.rev))
+                elif name.startswith("conflict-review"):
+                    h = find_history_active_at(e.doc, e.time)
+                    url = settings.CONFLICT_REVIEW_TXT_URL + ("%s-%s.txt" % ((h or doc).canonical_name(), e.rev))
                 elif name.startswith("draft"):
                     # rfcdiff tool has special support for IDs
                     url = e.doc.name + "-" + e.rev

ietf/settings.py

@@ -204,6 +204,7 @@
 CHARTER_PATH = '/a/www/ietf-ftp/charters/'
 CHARTER_TXT_URL = 'http://www.ietf.org/charter/'
 CONFLICT_REVIEW_PATH = '/a/www/ietf-ftp/conflict-reviews'
+CONFLICT_REVIEW_TXT_URL = 'http://www.ietf.org/cr/'
 AGENDA_PATH = '/a/www/www6s/proceedings/'
 AGENDA_PATH_PATTERN = '/a/www/www6s/proceedings/%(meeting)s/agenda/%(wg)s.%(ext)s'
 MINUTES_PATH_PATTERN = '/a/www/www6s/proceedings/%(meeting)s/minutes/%(wg)s.%(ext)s'