Files
@ 631e8000eae8
Branch filter:
Location: kallithea/rhodecode/templates/bookmarks/bookmarks_data.html - annotation
631e8000eae8
1.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.
eaf09acf6872 f91d3f9b7230 eaf09acf6872 c20adbaf16af b4f401524060 eaf09acf6872 eaf09acf6872 eaf09acf6872 eaf09acf6872 574825da0d4e b4f401524060 c20adbaf16af c20adbaf16af b4f401524060 a3ee2611e6e8 a3ee2611e6e8 93de03499097 184557472f5c a3ee2611e6e8 184557472f5c f467c75544af b4f401524060 b4f401524060 184557472f5c 184557472f5c 184557472f5c f91d3f9b7230 574825da0d4e 574825da0d4e 574825da0d4e 574825da0d4e b4f401524060 c20adbaf16af a3ee2611e6e8 eaf09acf6872 a3ee2611e6e8 b4f401524060 f91d3f9b7230 | %if c.repo_bookmarks:
<div id="table_wrap" class="yui-skin-sam">
<table id="bookmarks_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,book in enumerate(c.repo_bookmarks.items()):
<tr class="parity${cnt%2}">
<td>
<span class="logbooks">
<span class="booktag">${h.link_to(book[0],
h.url('files_home',repo_name=c.repo_name,revision=book[1].raw_id))}</span>
</span>
</td>
<td><span class="tooltip" title="${h.tooltip(h.age(book[1].date))}">${h.fmt_date(book[1].date)}</span></td>
<td title="${book[1].author}">${h.person(book[1].author)}</td>
<td>
<div>
<pre><a href="${h.url('files_home',repo_name=c.repo_name,revision=book[1].raw_id)}">r${book[1].revision}:${h.short_id(book[1].raw_id)}</a></pre>
</div>
</td>
<td>
<input class="branch-compare" type="radio" name="compare_org" value="${book[0]}"/>
<input class="branch-compare" type="radio" name="compare_other" value="${book[0]}"/>
</td>
</tr>
%endfor
</table>
</div>
%else:
${_('There are no bookmarks yet')}
%endif
|