# Pull requests
url(r"^pull-requests$", pullrequest_collection,
- {'emitter_format': 'json'} ),
+ {'emitter_format': 'json'}, name="pullrequest_list" ),
url(r"^pull-requests/(?P<prq_id>\d+)$", pullrequest_rsrc,
- {'emitter_format': 'json'}, name="pullrequest_view" ),
-
+ {'emitter_format': 'json'}, name="pullrequest_view" ),
+
# Documents
url(r'^documents$', library_resource,
{'emitter_format': 'json'}, name="document_list_view"),
# document_dc_resource,
# name="docdc_view_withformat"),
- url(urlpath(r'documents', DOC, 'dc', format=False),
- document_dc_resource, {'emitter_format': 'json'},
- name="docdc_view"),
+# url(urlpath(r'documents', DOC, 'dc', format=False),
+# document_dc_resource, {'emitter_format': 'json'},
+# name="docdc_view"),
# MERGE
url(urlpath(r'documents', DOC, 'revision', format=False),
- document_merge, {'emitter_format': 'json'}, name="docmerge_view")
+ document_merge, {'emitter_format': 'json'}, name="docmerge_view"),
+
+ url(r'documents/(?P<docid>[^/]+)/diff$',
+ diff_resource, {'emitter_format': 'raw'}, name="diff_resource"),
+
# url(r'^documents/(?P<docid>[^/]+)/parts$',
# document_resource, {'emitter_format': 'json'},