Files
@ 631e8000eae8
Branch filter:
Location: kallithea/rhodecode/templates/search/search_content.html - annotation
631e8000eae8
1.1 KiB
text/html
diff parser: match the header order of hg diff --git patches
The output might look like:
diff --git a/A b/B
old mode 100644
new mode 100755
rename from A
rename to B
--- a/A
+++ b/B
Such files were shown as 'modified binary file chmod 100644 => 100755' without
diff.
Now the chmod and diff will be shown ... but still not the rename.
Correct parsing of headers do require a better parser - one do not just use a
regexp.
The output might look like:
diff --git a/A b/B
old mode 100644
new mode 100755
rename from A
rename to B
--- a/A
+++ b/B
Such files were shown as 'modified binary file chmod 100644 => 100755' without
diff.
Now the chmod and diff will be shown ... but still not the rename.
Correct parsing of headers do require a better parser - one do not just use a
regexp.
65b2f150beb7 65b2f150beb7 65b2f150beb7 65b2f150beb7 65b2f150beb7 65b2f150beb7 65b2f150beb7 b6c902d88472 b6c902d88472 b6c902d88472 65b2f150beb7 b6c902d88472 65b2f150beb7 65b2f150beb7 65b2f150beb7 65b2f150beb7 65b2f150beb7 65b2f150beb7 65b2f150beb7 65b2f150beb7 65b2f150beb7 65b2f150beb7 f91d3f9b7230 65b2f150beb7 f91d3f9b7230 f91d3f9b7230 65b2f150beb7 65b2f150beb7 65b2f150beb7 65b2f150beb7 f91d3f9b7230 f91d3f9b7230 | ##content highligthing
%for cnt,sr in enumerate(c.formated_results):
%if h.HasRepoPermissionAny('repository.write','repository.read','repository.admin')(sr['repository'],'search results check'):
<div class="table">
<div id="body${cnt}" class="codeblock">
<div class="code-header">
<div class="search-path">${h.link_to(h.literal('%s » %s' % (sr['repository'],sr['f_path'])),
h.url('files_home',repo_name=sr['repository'],revision='tip',f_path=sr['f_path']))}
</div>
</div>
<div class="search-code-body">
<pre>${h.literal(sr['content_short_hl'])}</pre>
</div>
</div>
</div>
%else:
%if cnt == 0:
<div class="table">
<div id="body${cnt}" class="codeblock">
<div class="error">${_('Permission denied')}</div>
</div>
</div>
%endif
%endif
%endfor
%if c.cur_query and c.formated_results:
<div class="pagination-wh pagination-left">
${c.formated_results.pager('$link_previous ~2~ $link_next')}
</div>
%endif
|