Mercurial > hg > mercurial-crew-with-dirclash
view templates/filediff.tmpl @ 5378:8a2915f57dfc
convert: add a mode where mercurial_sink skips empty revisions.
The getchanges function of some converter_source classes can return
some false positives. I.e. they sometimes claim that a file "foo"
was changed in some revision, even though its contents are still the
same.
convert_svn is particularly bad, but I think this can also happen with
convert_cvs and, at least in theory, with mercurial_source.
For regular conversions this is not really a problem - as long as
getfile returns the right contents, we'll get a converted revision
with the right contents. But when we use --filemap, this could lead
to superfluous revisions being converted.
Instead of fixing every converter_source, I decided to change
mercurial_sink to work around this problem.
When --filemap is used, we're interested only in revisions that touch
some specific files. If a revision doesn't change any of these files,
then we're not interested in it (at least for revisions with a single
parent; merges are special).
For mercurial_sink, we abuse this property and rollback a commit if
the manifest text hasn't changed. This avoids duplicating the logic
from localrepo.filecommit to detect unchanged files.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Thu, 04 Oct 2007 23:21:37 -0300 |
parents | ce8f31e0b3b8 |
children |
line wrap: on
line source
#header# <title>#repo|escape#: #file|escape# diff</title> </head> <body> <div class="buttons"> <a href="#url#log/#rev#{sessionvars%urlparameter}">changelog</a> <a href="#url#shortlog/#rev#{sessionvars%urlparameter}">shortlog</a> <a href="#url#tags{sessionvars%urlparameter}">tags</a> <a href="#url#rev/#node|short#{sessionvars%urlparameter}">changeset</a> <a href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">file</a> <a href="#url#log/#node|short#/#file|urlescape#{sessionvars%urlparameter}">revisions</a> <a href="#url#annotate/#node|short#/#file|urlescape#{sessionvars%urlparameter}">annotate</a> <a href="#url#raw-diff/#node|short#/#file|urlescape#">raw</a> </div> <h2>#file|escape#</h2> <table id="filediffEntry"> <tr> <th class="revision">revision #rev#:</th> <td class="revision"><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td> </tr> #parent%filediffparent# #child%filediffchild# </table> <div id="fileDiff"> #diff# </div> #footer#