Files
@ 631e8000eae8
Branch filter:
Location: kallithea/rhodecode/templates/errors/error_document.html - annotation
631e8000eae8
2.0 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.
1e757ac98988 7a5eeafb1a9a c9a9e0b3baf8 1e757ac98988 1e757ac98988 1e757ac98988 7a5eeafb1a9a 7a5eeafb1a9a d5e42c00f3c1 7a5eeafb1a9a b4f401524060 b4f401524060 b4f401524060 f91d3f9b7230 1e757ac98988 cabe887a9829 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 b4f401524060 f91d3f9b7230 1e757ac98988 1e757ac98988 03028bf372d7 03028bf372d7 03028bf372d7 03028bf372d7 03028bf372d7 03028bf372d7 03028bf372d7 03028bf372d7 03028bf372d7 03028bf372d7 1e757ac98988 f91d3f9b7230 b4f401524060 b4f401524060 b4f401524060 f91d3f9b7230 b4f401524060 f91d3f9b7230 b4f401524060 b4f401524060 b4f401524060 f91d3f9b7230 b4f401524060 1e757ac98988 1e757ac98988 1e757ac98988 1e757ac98988 f91d3f9b7230 1e757ac98988 | ## -*- coding: utf-8 -*-
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>Error - ${c.error_message}</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name="robots" content="index, nofollow"/>
<link rel="icon" href="${h.url('/images/icons/database_gear.png')}" type="image/png" />
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
%if c.redirect_time:
<meta http-equiv="refresh" content="${c.redirect_time}; url=${c.url_redirect}"/>
%endif
<!-- stylesheets -->
<link rel="stylesheet" type="text/css" href="${h.url('/css/style.css')}" media="screen" />
<style type="text/css">
#main_div{
border: 0px solid #000;
width: 500px;
margin: auto;
text-align: center;
margin-top: 200px;
font-size: 1.6em;
}
.error_message{
text-align: center;
color:#003367;
font-size: 1.6em;
margin:10px;
}
</style>
</head>
<body>
<div class="flash_msg">
<% messages = h.flash.pop_messages() %>
% if messages:
<ul id="flash-messages">
% for message in messages:
<li class="${message.category}_msg">${message}</li>
% endfor
</ul>
% endif
</div>
<div id="login">
<div class="table">
<div id="main_div">
<div style="font-size:2.0em;margin: 10px">${c.rhodecode_name}</div>
<h1 class="error_message">${c.error_message}</h1>
<p>${c.error_explanation}</p>
%if c.redirect_time:
<p>${_('You will be redirected to %s in %s seconds') % (c.redirect_module,c.redirect_time)}</p>
%endif
</div>
</div>
<!-- end login -->
</div>
</body>
</html>
|