Files
@ 631e8000eae8
Branch filter:
Location: kallithea/rhodecode/templates/branches/branches_data.html - annotation
631e8000eae8
2.5 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.
184557472f5c f91d3f9b7230 eaf09acf6872 eaf09acf6872 1e757ac98988 bf96fd1920c1 bf96fd1920c1 bf96fd1920c1 bf96fd1920c1 bf96fd1920c1 1e757ac98988 eaf09acf6872 b4f401524060 b4f401524060 ffd07396d315 ffd07396d315 ffd07396d315 184557472f5c f91d3f9b7230 184557472f5c f467c75544af ffd07396d315 184557472f5c 184557472f5c 184557472f5c f91d3f9b7230 833f9dec0a06 f6cdfc730831 f6cdfc730831 f6cdfc730831 f6cdfc730831 b4f401524060 b4f401524060 b074dfa51292 b074dfa51292 b074dfa51292 b074dfa51292 b074dfa51292 b074dfa51292 b074dfa51292 f91d3f9b7230 184557472f5c f467c75544af b074dfa51292 184557472f5c 184557472f5c 184557472f5c 184557472f5c b074dfa51292 f6cdfc730831 184557472f5c b074dfa51292 184557472f5c 1e757ac98988 eaf09acf6872 1e757ac98988 b074dfa51292 f91d3f9b7230 | %if c.repo_branches:
<div id="table_wrap" class="yui-skin-sam">
<table id="branches_data">
<thead>
<tr>
<th class="left">${_('Name')}</th>
<th class="left">${_('Date')}</th>
<th class="left">${_('Author')}</th>
<th class="left">${_('Revision')}</th>
<th class="left">${_('Compare')}</th>
</tr>
</thead>
%for cnt,branch in enumerate(c.repo_branches.items()):
<tr class="parity${cnt%2}">
<td>
<span class="logtags">
<span class="branchtag">${h.link_to(branch[0],
h.url('files_home',repo_name=c.repo_name,revision=branch[1].raw_id))}</span>
</span>
</td>
<td><span class="tooltip" title="${h.tooltip(h.age(branch[1].date))}">${h.fmt_date(branch[1].date)}</span></td>
<td title="${branch[1].author}">${h.person(branch[1].author)}</td>
<td>
<div>
<pre><a href="${h.url('files_home',repo_name=c.repo_name,revision=branch[1].raw_id)}">r${branch[1].revision}:${h.short_id(branch[1].raw_id)}</a></pre>
</div>
</td>
<td>
<input class="branch-compare" type="radio" name="compare_org" value="${branch[0]}"/>
<input class="branch-compare" type="radio" name="compare_other" value="${branch[0]}"/>
</td>
</tr>
%endfor
% if hasattr(c,'repo_closed_branches') and c.repo_closed_branches:
%for cnt,branch in enumerate(c.repo_closed_branches.items()):
<tr class="parity${cnt%2}">
<td>
<span class="logtags">
<span class="branchtag">${h.link_to(branch[0]+' [closed]',
h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id))}</span>
</span>
</td>
<td><span class="tooltip" title="${h.tooltip(h.age(branch[1].date))}">${h.fmt_date(branch[1].date)}</span></td>
<td title="${branch[1].author}">${h.person(branch[1].author)}</td>
<td>
<div>
<pre><a href="${h.url('files_home',repo_name=c.repo_name,revision=branch[1].raw_id)}">r${branch[1].revision}:${h.short_id(branch[1].raw_id)}</a></pre>
</div>
</td>
<td></td>
</tr>
%endfor
%endif
</table>
</div>
%else:
${_('There are no branches yet')}
%endif
|