<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[164642] trunk/Websites/bugs.webkit.org</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/164642">164642</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-25 04:44:42 -0800 (Tue, 25 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>PrettyPatch.rb should be more descriptive for "git diff -M" styled patches
https://bugs.webkit.org/show_bug.cgi?id=125514
Patch by Jozsef Berta <jberta.u-szeged@partner.samsung.com> on 2014-02-25
Reviewed by Csaba Osztrogonác.
* PrettyPatch/PrettyPatch.rb: PrettyPatch.rb is modified to show which file was renamed or moved.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebsitesbugswebkitorgChangeLog">trunk/Websites/bugs.webkit.org/ChangeLog</a></li>
<li><a href="#trunkWebsitesbugswebkitorgPrettyPatchPrettyPatchrb">trunk/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebsitesbugswebkitorgChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Websites/bugs.webkit.org/ChangeLog (164641 => 164642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/bugs.webkit.org/ChangeLog        2014-02-25 10:33:26 UTC (rev 164641)
+++ trunk/Websites/bugs.webkit.org/ChangeLog        2014-02-25 12:44:42 UTC (rev 164642)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-02-25 Jozsef Berta <jberta.u-szeged@partner.samsung.com>
+
+ PrettyPatch.rb should be more descriptive for "git diff -M" styled patches
+ https://bugs.webkit.org/show_bug.cgi?id=125514
+
+ Reviewed by Csaba Osztrogonác.
+
+ * PrettyPatch/PrettyPatch.rb: PrettyPatch.rb is modified to show which file was renamed or moved.
+
</ins><span class="cx"> 2013-12-16 Dániel Bátyai <Batyai.Daniel@stud.u-szeged.hu>
</span><span class="cx">
</span><span class="cx"> PrettyPatch.rb doesn't handle diffs where lines matching /^--/ are missing properly
</span></span></pre></div>
<a id="trunkWebsitesbugswebkitorgPrettyPatchPrettyPatchrb"></a>
<div class="modfile"><h4>Modified: trunk/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb (164641 => 164642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb        2014-02-25 10:33:26 UTC (rev 164641)
+++ trunk/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb        2014-02-25 12:44:42 UTC (rev 164642)
</span><span class="lines">@@ -61,6 +61,8 @@
</span><span class="cx"> /^diff/
</span><span class="cx"> ]
</span><span class="cx">
</span><ins>+ RENAME_FROM = /^rename from (.*)/
+
</ins><span class="cx"> BINARY_FILE_MARKER_FORMAT = /^Cannot display: file marked as a binary type.$/
</span><span class="cx">
</span><span class="cx"> IMAGE_FILE_MARKER_FORMAT = /^svn:mime-type = image\/png$/
</span><span class="lines">@@ -150,10 +152,13 @@
</span><span class="cx"> [nil, file_path]
</span><span class="cx"> end
</span><span class="cx">
</span><del>- def self.linkifyFilename(filename)
- url, pathBeneathTrunk = find_url_and_path(filename)
-
- url.nil? ? filename : "<a href='#{url}browser/trunk/#{pathBeneathTrunk}'>#{filename}</a>"
</del><ins>+ def self.linkifyFilename(filename, force)
+ if force
+ "<a href='#{OPENSOURCE_TRAC_URL}browser/trunk/#{filename}'>#{filename}</a>"
+ else
+ url, pathBeneathTrunk = find_url_and_path(filename)
+ url.nil? ? filename : "<a href='#{url}browser/trunk/#{pathBeneathTrunk}'>#{filename}</a>"
+ end
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -184,7 +189,7 @@
</span><span class="cx"> font-family: sans-serif;
</span><span class="cx"> font-size: 1em;
</span><span class="cx"> margin-left: 0.5em;
</span><del>- display: table-cell;
</del><ins>+ display: inline;
</ins><span class="cx"> width: 100%;
</span><span class="cx"> padding: 0.5em;
</span><span class="cx"> }
</span><span class="lines">@@ -560,6 +565,8 @@
</span><span class="cx"> startOfSections = i + 1
</span><span class="cx"> end
</span><span class="cx"> break
</span><ins>+ when RENAME_FROM
+ @renameFrom = RENAME_FROM.match(lines[i])[1]
</ins><span class="cx"> end
</span><span class="cx"> end
</span><span class="cx"> lines_with_contents = lines[startOfSections...lines.length]
</span><span class="lines">@@ -616,7 +623,13 @@
</span><span class="cx">
</span><span class="cx"> def to_html
</span><span class="cx"> str = "<div class='FileDiff'>\n"
</span><del>- str += "<h1>#{PrettyPatch.linkifyFilename(@filename)}</h1>\n"
</del><ins>+ if @renameFrom
+ str += "<h1>#{@filename}</h1>"
+ str += "was renamed from"
+ str += "<h1>#{PrettyPatch.linkifyFilename(@renameFrom.to_s, true)}</h1>"
+ else
+ str += "<h1>#{PrettyPatch.linkifyFilename(@filename, false)}</h1>\n"
+ end
</ins><span class="cx"> if @image then
</span><span class="cx"> str += self.image_to_html
</span><span class="cx"> elsif @git_image then
</span></span></pre>
</div>
</div>
</body>
</html>