Files
@ 631e8000eae8
Branch filter:
Location: kallithea/rhodecode/templates/changelog/changelog_summary_data.html - annotation
631e8000eae8
4.3 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.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 | c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 5a8918aba869 5a8918aba869 5a8918aba869 5a8918aba869 5a8918aba869 5a8918aba869 5a8918aba869 5a8918aba869 5a8918aba869 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 c7970889c5c0 | ## -*- coding: utf-8 -*-
%if c.repo_changesets:
<table class="table_disp">
<tr>
<th class="left">${_('Revision')}</th>
<th class="left">${_('Commit message')}</th>
<th class="left">${_('Age')}</th>
<th class="left">${_('Author')}</th>
<th class="left">${_('Refs')}</th>
</tr>
%for cnt,cs in enumerate(c.repo_changesets):
<tr class="parity${cnt%2}">
<td>
<div>
<div class="changeset-status-container">
%if c.comments.get(cs.raw_id,[]):
<div class="comments-container">
<div class="comments-cnt" title="${('comments')}">
<a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">
${len(c.comments[cs.raw_id])}
</a>
</div>
</div>
%endif
%if c.statuses.get(cs.raw_id):
<div class="changeset-status-ico">
%if c.statuses.get(cs.raw_id)[2]:
<a class="tooltip" title="${_('Click to open associated pull request #%s' % c.statuses.get(cs.raw_id)[2])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}">
<img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" />
</a>
%else:
<img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" />
%endif
</div>
%endif
</div>
<pre><a href="${h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id)}">${h.show_id(cs)}</a></pre>
</div>
</td>
<td>
${h.urlify_commit(h.truncate(cs.message,50),c.repo_name, h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
</td>
<td><span class="tooltip" title="${h.tooltip(h.fmt_date(cs.date))}">
${h.age(cs.date)}</span>
</td>
<td title="${cs.author}">${h.person(cs.author)}</td>
<td>
%if h.is_hg(c.rhodecode_repo):
%for book in cs.bookmarks:
<div class="booktag" title="${_('Bookmark %s') % book}">
${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
</div>
%endfor
%endif
%for tag in cs.tags:
<div class="tagtag" title="${_('Tag %s') % tag}">
${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
</div>
%endfor
%if cs.branch:
<div class="branchtag" title="${_('Branch %s' % cs.branch)}">
${h.link_to(h.shorter(cs.branch),h.url('changelog_home',repo_name=c.repo_name,branch=cs.branch))}
</div>
%endif
</td>
</tr>
%endfor
</table>
<script type="text/javascript">
YUE.onDOMReady(function(){
YUE.delegate("shortlog_data","click",function(e, matchedEl, container){
ypjax(e.target.href,"shortlog_data",function(){tooltip_activate();});
YUE.preventDefault(e);
},'.pager_link');
});
</script>
<div class="pagination-wh pagination-left">
${c.repo_changesets.pager('$link_previous ~2~ $link_next')}
</div>
%else:
%if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
<h4>${_('Add or upload files directly via RhodeCode')}</h4>
<div style="margin: 20px 30px;">
<div id="add_node_id" class="add_node">
<a class="ui-btn" href="${h.url('files_add_home',repo_name=c.repo_name,revision=0,f_path='')}">${_('Add new file')}</a>
</div>
</div>
%endif
<h4>${_('Push new repo')}</h4>
<pre>
${c.rhodecode_repo.alias} clone ${c.clone_repo_url}
${c.rhodecode_repo.alias} add README # add first file
${c.rhodecode_repo.alias} commit -m "Initial" # commit with message
${c.rhodecode_repo.alias} push ${'origin master' if h.is_git(c.rhodecode_repo) else ''} # push changes back
</pre>
<h4>${_('Existing repository?')}</h4>
<pre>
%if h.is_git(c.rhodecode_repo):
git remote add origin ${c.clone_repo_url}
git push -u origin master
%else:
hg push ${c.clone_repo_url}
%endif
</pre>
%endif
|