2011-08-17 12:26:41 +00:00
|
|
|
<?xml version="1.0" encoding="utf-8"?>
|
|
|
|
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
|
|
|
|
|
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
|
|
|
|
<html xmlns="http://www.w3.org/1999/xhtml" lang="fr" xml:lang="fr">
|
|
|
|
|
<head>
|
|
|
|
|
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<meta name="keywords" content="diff, git, colors">
|
|
|
|
|
|
|
|
|
|
<link rel="shortcut icon" type="image/x-icon" href="/Scratch/img/favicon.ico" />
|
|
|
|
|
<link rel="stylesheet" type="text/css" href="/Scratch/assets/css/main.css" />
|
|
|
|
|
<link rel="stylesheet" type="text/css" href="/Scratch/css/twilight.css" />
|
|
|
|
|
<link rel="stylesheet" type="text/css" href="/Scratch/css/idc.css" />
|
|
|
|
|
<link rel="alternate" type="application/rss+xml" title="RSS" href="http://feeds.feedburner.com/yannespositocomen"/>
|
|
|
|
|
|
|
|
|
|
<link rel="alternate" lang="fr" xml:lang="fr" title="Un diff plus pratique" type="text/html" hreflang="fr" href="/Scratch/fr/blog/A-more-convenient-diff/" />
|
|
|
|
|
<link rel="alternate" lang="en" xml:lang="en" title="A more convenient diff" type="text/html" hreflang="en" href="/Scratch/en/blog/A-more-convenient-diff/" />
|
|
|
|
|
<script type="text/javascript" src="/Scratch/js/jquery-1.3.1.min.js"></script>
|
|
|
|
|
<script type="text/javascript" src="/Scratch/js/jquery.cookie.js"></script>
|
|
|
|
|
<script type="text/javascript" src="/Scratch/js/index.js"></script>
|
|
|
|
|
<!--[if lt IE 9]>
|
|
|
|
|
<script src="http://ie7-js.googlecode.com/svn/version/2.1(beta4)/IE9.js"></script>
|
|
|
|
|
<![endif]-->
|
|
|
|
|
<!-- < % if containMaths %>
|
|
|
|
|
<script type="text/javascript" src="/Scratch/js/MathJax/MathJax.js"></script>
|
|
|
|
|
< % end %>
|
|
|
|
|
-->
|
|
|
|
|
<title>A more convenient diff</title>
|
|
|
|
|
</head>
|
|
|
|
|
<body lang="en">
|
|
|
|
|
<script type="text/javascript">// <![CDATA[
|
|
|
|
|
document.write('<div id="blackpage"><img src="/Scratch/img/loading.gif" alt="loading..."/></div>');
|
|
|
|
|
// ]]>
|
|
|
|
|
</script>
|
|
|
|
|
|
|
|
|
|
<div id="content">
|
|
|
|
|
|
|
|
|
|
<div id="choix">
|
|
|
|
|
<div class="return"><a href="#entete">↓ Menu ↓</a></div>
|
|
|
|
|
<div id="choixlang">
|
|
|
|
|
<a href="/Scratch/fr/blog/A-more-convenient-diff/" onclick="setLanguage('fr')">en Français</a>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
<div id="titre">
|
|
|
|
|
<h1>
|
|
|
|
|
A more convenient diff
|
|
|
|
|
</h1>
|
|
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
<div class="flush"></div>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<div class="flush"></div>
|
|
|
|
|
<div id="afterheader">
|
|
|
|
|
<div class="corps">
|
|
|
|
|
<p>Diff is a very useful tool. But it is not so easy to read for us, simple mortal.</p>
|
|
|
|
|
|
|
|
|
|
<p>This is why, when you use <code>git</code> it will use a better formatting and colorize it.</p>
|
|
|
|
|
|
|
|
|
|
<p>Here is the script I use when I want to use human readable <code>diff</code> à la git. </p>
|
|
|
|
|
|
|
|
|
|
<div class="code"><div class="file"><a href="/Scratch/en/blog/A-more-convenient-diff/code/ydiff"> ➥ ydiff </a></div><div class="withfile">
|
|
|
|
|
<pre class="twilight">
|
|
|
|
|
<span class="Comment"><span class="Comment">#</span>!/usr/bin/env zsh</span>
|
|
|
|
|
|
|
|
|
|
<span class="Comment"><span class="Comment">#</span> Load colors helpers</span>
|
|
|
|
|
autoload -U colors <span class="Keyword">&&</span> colors
|
|
|
|
|
|
|
|
|
|
function colorize_diff {
|
|
|
|
|
<span class="Keyword">while</span> read line<span class="Keyword">;</span> <span class="Keyword">do</span>
|
|
|
|
|
<span class="Keyword">case</span> <span class="Variable"><span class="Variable">${</span>line[0]<span class="Variable">}</span></span> <span class="Keyword">in</span>
|
|
|
|
|
+) print -n <span class="Variable"><span class="Variable">$</span>fg</span>[green]<span class="Keyword">;</span><span class="Keyword">;</span>
|
|
|
|
|
-) print -n <span class="Variable"><span class="Variable">$</span>fg</span>[red]<span class="Keyword">;</span><span class="Keyword">;</span>
|
|
|
|
|
@) <span class="Comment"><span class="Comment">#</span> Display in cyan the @@ positions @@</span>
|
|
|
|
|
<span class="Keyword">if</span> [[ <span class="Variable"><span class="Variable">${</span>line[1]<span class="Variable">}</span></span> = <span class="String"><span class="String">'</span>@<span class="String">'</span></span> ]]<span class="Keyword">;</span> <span class="Keyword">then</span>
|
|
|
|
|
line=<span class="String"><span class="String">$(</span>print <span class="StringVariable"><span class="StringVariable">$</span>line</span> <span class="Keyword">|</span> perl -pe <span class="String"><span class="String">'</span>s#(\@\@[^\@]*\@\@)(.*)$#<span class="String">'</span></span><span class="StringVariable"><span class="StringVariable">$</span>fg</span>[cyan]<span class="String"><span class="String">'</span>$1<span class="String">'</span></span><span class="StringVariable"><span class="StringVariable">$</span>reset_color</span><span class="String"><span class="String">'</span>$2#<span class="String">'</span></span><span class="String">)</span></span>
|
|
|
|
|
<span class="Keyword">fi</span><span class="Keyword">;</span><span class="Keyword">;</span>
|
|
|
|
|
|
|
|
|
|
<span class="Keyword">esac</span>
|
|
|
|
|
print -- <span class="Variable"><span class="Variable">$</span>line</span>
|
|
|
|
|
print -n <span class="Variable"><span class="Variable">$</span>reset_color</span>
|
|
|
|
|
<span class="Keyword">done</span>
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
diff -u <span class="Variable"><span class="Variable">$</span>*</span> <span class="Keyword">|</span> colorize_diff
|
|
|
|
|
</pre>
|
|
|
|
|
</div></div>
|
|
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<div id="choixrss">
|
|
|
|
|
<a id="rss" href="http://feeds.feedburner.com/yannespositocomen">
|
|
|
|
|
Subscribe
|
|
|
|
|
</a>
|
|
|
|
|
</div>
|
|
|
|
|
<script type="text/javascript">
|
|
|
|
|
$(document).ready(function(){
|
|
|
|
|
$('#comment').hide();
|
|
|
|
|
$('#clickcomment').click(showComments);
|
|
|
|
|
});
|
|
|
|
|
function showComments() {
|
|
|
|
|
$('#comment').show();
|
|
|
|
|
$('#clickcomment').fadeOut();
|
|
|
|
|
}
|
|
|
|
|
document.write('<div id="clickcomment">Comments</div>');
|
|
|
|
|
</script>
|
|
|
|
|
<div class="flush"></div>
|
|
|
|
|
<div class="corps" id="comment">
|
|
|
|
|
<h2 class="first">comments</h2>
|
|
|
|
|
<noscript>
|
|
|
|
|
You must enable javascript to comment.
|
|
|
|
|
</noscript>
|
|
|
|
|
|
|
|
|
|
<script type="text/javascript">
|
|
|
|
|
var idcomments_acct = 'a307f0044511ff1b5cfca573fc0a52e7';
|
|
|
|
|
var idcomments_post_id = '/Scratch/en/blog/A-more-convenient-diff/';
|
|
|
|
|
var idcomments_post_url = 'http://yannesposito.com/Scratch/en/blog/A-more-convenient-diff/';
|
|
|
|
|
</script>
|
|
|
|
|
<span id="IDCommentsPostTitle" style="display:none"></span>
|
|
|
|
|
<script type='text/javascript' src='/Scratch/js/genericCommentWrapperV2.js'></script>
|
|
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
<div id="entete" class="corps_spaced">
|
|
|
|
|
<div id="liens">
|
|
|
|
|
<ul><li><a href="/Scratch/en/">Home</a></li>
|
|
|
|
|
<li><a href="/Scratch/en/blog/">Blog</a></li>
|
|
|
|
|
<li><a href="/Scratch/en/softwares/">Softwares</a></li>
|
|
|
|
|
<li><a href="/Scratch/en/about/">About</a></li></ul>
|
|
|
|
|
</div>
|
|
|
|
|
<div class="flush"></div>
|
|
|
|
|
<hr/>
|
|
|
|
|
<div id="next_before_articles">
|
|
|
|
|
<div id="previous_articles">
|
|
|
|
|
previous entries
|
|
|
|
|
|
|
|
|
|
<div class="previous_article">
|
|
|
|
|
<a href="/Scratch/en/blog/Haskell-Mandelbrot/"><span class="nicer">«</span> ASCII Haskell Mandelbrot</a>
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<div class="previous_article">
|
|
|
|
|
<a href="/Scratch/en/blog/Password-Management/"><span class="nicer">«</span> 40 character's passwords</a>
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<div class="previous_article">
|
|
|
|
|
<a href="/Scratch/en/blog/2011-04-20-Now-hosted-on-github/"><span class="nicer">«</span> Now hosted on github</a>
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
<div id="next_articles">
|
|
|
|
|
next entries
|
|
|
|
|
|
2011-08-24 22:33:06 +00:00
|
|
|
<div class="next_article">
|
|
|
|
|
<a href="/Scratch/en/blog/Efficient-Vim-knowledge/">Efficient Vim knowledge <span class="nicer">»</span></a>
|
|
|
|
|
</div>
|
|
|
|
|
|
2011-08-17 12:26:41 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
<div class="flush"></div>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<div id="bottom">
|
|
|
|
|
<div>
|
|
|
|
|
<a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Copyright ©, Yann Esposito</a>
|
|
|
|
|
</div>
|
|
|
|
|
<div id="lastmod">
|
|
|
|
|
Created: 08/17/2011
|
|
|
|
|
Modified: 08/17/2011
|
|
|
|
|
</div>
|
|
|
|
|
<div>
|
|
|
|
|
Entirely done with
|
|
|
|
|
<a href="http://www.vim.org">Vim</a>
|
|
|
|
|
and
|
|
|
|
|
<a href="http://nanoc.stoneship.org">nanoc</a>
|
|
|
|
|
</div>
|
|
|
|
|
<div>
|
|
|
|
|
<a href="/Scratch/en/validation/">Validation</a>
|
|
|
|
|
<a href="http://validator.w3.org/check?uri=referer"> [xhtml] </a>
|
|
|
|
|
.
|
|
|
|
|
<a href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3"> [css] </a>
|
|
|
|
|
.
|
|
|
|
|
<a href="http://validator.w3.org/feed/check.cgi?url=http%3A//yannesposito.com/Scratch/en/blog/feed/feed.xml">[rss]</a>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
<div class="clear"></div>
|
|
|
|
|
</div>
|
|
|
|
|
<script type="text/javascript">
|
|
|
|
|
var clicky = { log: function(){ return; }, goal: function(){ return; }};
|
|
|
|
|
var clicky_site_id = 66374971;
|
|
|
|
|
(function() {
|
|
|
|
|
var s = document.createElement('script');
|
|
|
|
|
s.type = 'text/javascript';
|
|
|
|
|
s.async = true;
|
|
|
|
|
s.src = ( document.location.protocol == 'https:' ? 'https://static.getclicky.com/js' : 'http://static.getclicky.com/js' );
|
|
|
|
|
( document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0] ).appendChild( s );
|
|
|
|
|
})();
|
|
|
|
|
</script>
|
|
|
|
|
<noscript><p><img alt="Clicky" width="1" height="1" src="http://in.getclicky.com/66374971ns.gif" /></p></noscript>
|
|
|
|
|
|
|
|
|
|
</body>
|
|
|
|
|
</html>
|
