201 lines
No EOL
10 KiB
HTML
201 lines
No EOL
10 KiB
HTML
<?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, couleurs">
|
|
|
|
<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/solarized.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/yannespositocomfr"/>
|
|
|
|
<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]-->
|
|
<title>Un diff plus pratique</title>
|
|
</head>
|
|
<body lang="fr" class="article">
|
|
<script type="text/javascript">// <![CDATA[
|
|
document.write('<div id="blackpage"><img src="/Scratch/img/loading.gif" alt="Chargement en cours..."/></div>');
|
|
// ]]>
|
|
</script>
|
|
|
|
<div id="content">
|
|
|
|
<div id="choix">
|
|
<div class="return"><a href="#entete">↓ Menu ↓</a></div>
|
|
<div id="choixlang">
|
|
<a href="/Scratch/en/blog/A-more-convenient-diff/" onclick="setLanguage('en')">in English</a>
|
|
</div>
|
|
<div class="flush"></div>
|
|
</div>
|
|
<div id="titre">
|
|
<h1>
|
|
Un diff plus pratique
|
|
</h1>
|
|
|
|
</div>
|
|
<div class="flush"></div>
|
|
|
|
|
|
|
|
|
|
|
|
<div class="flush"></div>
|
|
<div id="afterheader">
|
|
<div class="corps">
|
|
<p><code>diff</code> est un utilitaire très pratique, mais il n’est pas facile à lire pour nous, les Hommes.</p>
|
|
|
|
<p>C’est pourquoi, lorsque vous utilisez <code>git</code>, il vous montre un formatage plus agréable avec des couleurs.</p>
|
|
|
|
<p>Voici le script que j’utilise lorsque je veux avoir un <code>diff</code> à la git.</p>
|
|
|
|
<div class="code"><div class="file"><a href="/Scratch/fr/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/yannespositocomfr">
|
|
s'abonner
|
|
</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">Commentaires</div>');
|
|
</script>
|
|
<div class="flush"></div>
|
|
<div class="corps" id="comment">
|
|
<h2 class="first">commentaires</h2>
|
|
<noscript>
|
|
Vous devez activer javascript pour commenter.
|
|
</noscript>
|
|
|
|
<script type="text/javascript">
|
|
var idcomments_acct = 'a307f0044511ff1b5cfca573fc0a52e7';
|
|
var idcomments_post_id = '/Scratch/fr/blog/A-more-convenient-diff/';
|
|
var idcomments_post_url = 'http://yannesposito.com/Scratch/fr/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/fr/">Bienvenue</a></li>
|
|
<li><a href="/Scratch/fr/blog/">Blog</a></li>
|
|
<li><a href="/Scratch/fr/softwares/">Softwares</a></li>
|
|
<li><a href="/Scratch/fr/about/">À propos</a></li></ul>
|
|
</div>
|
|
<div class="flush"></div>
|
|
<hr/>
|
|
<div id="next_before_articles">
|
|
<div id="previous_articles">
|
|
articles précédents
|
|
|
|
<div class="previous_article">
|
|
<a href="/Scratch/fr/blog/Haskell-Mandelbrot/"><span class="nicer">«</span> Mandelbrot avec haskell</a>
|
|
</div>
|
|
|
|
|
|
<div class="previous_article">
|
|
<a href="/Scratch/fr/blog/Password-Management/"><span class="nicer">«</span> Password Management</a>
|
|
</div>
|
|
|
|
|
|
<div class="previous_article">
|
|
<a href="/Scratch/fr/blog/2011-04-20-Now-hosted-on-github/"><span class="nicer">«</span> Hébergement github</a>
|
|
</div>
|
|
|
|
|
|
</div>
|
|
<div id="next_articles">
|
|
articles suivants
|
|
|
|
<div class="next_article">
|
|
<a href="/Scratch/fr/blog/Learn-Vim-Progressively/">Apprenez Vim Progressivement <span class="nicer">»</span></a>
|
|
</div>
|
|
|
|
|
|
<div class="next_article">
|
|
<a href="/Scratch/fr/blog/programming-language-experience/">Mon expérience avec les languages de programmation <span class="nicer">»</span></a>
|
|
</div>
|
|
|
|
|
|
<div class="next_article">
|
|
<a href="/Scratch/fr/blog/Higher-order-function-in-zsh/">Fonctions d'ordre supérieur en zsh <span class="nicer">»</span></a>
|
|
</div>
|
|
|
|
|
|
</div>
|
|
<div class="flush"></div>
|
|
</div>
|
|
</div>
|
|
|
|
|
|
<div id="bottom">
|
|
<div>
|
|
<a href="http://twitter.com/yogsototh">Suivez-moi</a>
|
|
</div>
|
|
<div>
|
|
<a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.fr">Droits de reproduction ©, Yann Esposito</a>
|
|
</div>
|
|
<div id="lastmod">
|
|
Écrit le : 17/08/2011
|
|
modifié le : 17/08/2011
|
|
</div>
|
|
<div>
|
|
Site entièrement réalisé avec
|
|
<a href="http://www.vim.org">Vim</a>
|
|
et
|
|
<a href="http://nanoc.stoneship.org">nanoc</a>
|
|
</div>
|
|
</div>
|
|
<div class="clear"></div>
|
|
</div>
|
|
</body>
|
|
</html> |