Mercurial > hg
view tests/test-convert-cvs-branch.t @ 25867:a74e9806d17d stable
highlight: produce correct markup when there's a blank line just before EOF
Due to how the colorized output from pygments was stripped of <pre> elements,
when there was an empty line at the end of a file, highlight extension produced
an incorrect markup (no closing tags from the fileline/annotateline template).
It wasn't usually noticeable, because browsers were smart enough to see where
the missing tags should've been, but in monoblue style it resulted in the last
line having twice the normal height.
Instead of awkwardly trying to strip outer <pre></pre> tags, let's make the
formatter with nowrap=True, which should do what we need in pygments since at
least 0.5 (2006-10-30).
Example from monoblue style:
Before:
<div class="source">
<div style="font-family:monospace" class="parity0">
<pre><a class="linenr" href="#l1" id="l1"> 1</a> </pre>
</div>
<div style="font-family:monospace" class="parity1">
<pre><a class="linenr" href="#l2" id="l2"> 2</a>
</div>
Now:
<div class="source">
<div style="font-family:monospace" class="parity0">
<pre><a class="linenr" href="#l1" id="l1"> 1</a> </pre>
</div>
<div style="font-family:monospace" class="parity1">
<pre><a class="linenr" href="#l2" id="l2"> 2</a> </pre>
</div>
</div>
(Notice the missing </pre></div> now in place)
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Wed, 22 Jul 2015 10:19:17 +0800 |
parents | 96529f81e2e9 |
children | 2fc86d92c4a9 |
line wrap: on
line source
#require cvs This is http://mercurial.selenic.com/bts/issue1148 and http://mercurial.selenic.com/bts/issue1447 $ cvscall() > { > cvs -f "$@" > /dev/null > } $ cat <<EOF >> $HGRCPATH > [extensions] > convert = > [convert] > cvsps.cache = 0 > EOF create cvs repository $ mkdir cvsrepo $ cd cvsrepo $ CVSROOT=`pwd` $ export CVSROOT $ CVS_OPTIONS=-f $ export CVS_OPTIONS $ cd .. $ rmdir cvsrepo $ cvscall -q -d "$CVSROOT" init Create a new project $ mkdir src $ cd src $ echo "1" > a $ echo "1" > b $ cvscall import -m "init" src v0 r0 | sort $ cd .. $ cvscall co src cvs checkout: Updating src $ cd src Branch the project $ cvscall tag -b BRANCH cvs tag: Tagging . $ cvscall up -r BRANCH > /dev/null cvs update: Updating . Modify file a, then b, then a $ sleep 1 $ echo "2" > a $ cvscall ci -m "mod a" cvs commit: Examining . $ echo "2" > b $ cvscall ci -m "mod b" cvs commit: Examining . $ sleep 1 $ echo "3" > a $ cvscall ci -m "mod a again" cvs commit: Examining . Convert $ cd .. $ hg convert src assuming destination src-hg initializing destination src-hg repository connecting to $TESTTMP/cvsrepo scanning source... collecting CVS rlog 7 log entries creating changesets 5 changeset entries sorting... converting... 4 Initial revision 3 init 2 mod a 1 mod b 0 mod a again updating tags Check the result $ hg -R src-hg log -G --template '{rev} ({branches}) {desc} files: {files}\n' o 5 () update tags files: .hgtags | | o 4 (BRANCH) mod a again files: a | | | o 3 (BRANCH) mod b files: b | | | o 2 (BRANCH) mod a files: a | | | o 1 (v0) init files: |/ o 0 () Initial revision files: a b issue 1447 $ cvscall() > { > cvs -f "$@" > /dev/null > sleep 1 > } $ cvsci() > { > cvs -f ci "$@" >/dev/null > sleep 1 > } $ cvscall -Q -d `pwd`/cvsmaster2 init $ cd cvsmaster2 $ CVSROOT=`pwd` $ export CVSROOT $ mkdir foo $ cd .. $ cvscall -Q co -d cvswork2 foo $ cd cvswork2 $ echo foo > a.txt $ echo bar > b.txt $ cvscall -Q add a.txt b.txt $ cvsci -m "Initial commit" cvs commit: Examining . $ echo foo > b.txt $ cvsci -m "Fix b on HEAD" cvs commit: Examining . $ echo bar > a.txt $ cvsci -m "Small fix in a on HEAD" cvs commit: Examining . $ cvscall -Q tag -b BRANCH $ cvscall -Q up -P -rBRANCH $ echo baz > b.txt $ cvsci -m "Change on BRANCH in b" cvs commit: Examining . $ hg debugcvsps -x --parents foo collecting CVS rlog 5 log entries creating changesets 4 changeset entries --------------------- PatchSet 1 Date: * (glob) Author: * (glob) Branch: HEAD Tag: (none) Log: Initial commit Members: a.txt:INITIAL->1.1 b.txt:INITIAL->1.1 --------------------- PatchSet 2 Date: * (glob) Author: * (glob) Branch: HEAD Tag: (none) Branchpoints: BRANCH Parent: 1 Log: Fix b on HEAD Members: b.txt:1.1->1.2 --------------------- PatchSet 3 Date: * (glob) Author: * (glob) Branch: HEAD Tag: (none) Branchpoints: BRANCH Parent: 2 Log: Small fix in a on HEAD Members: a.txt:1.1->1.2 --------------------- PatchSet 4 Date: * (glob) Author: * (glob) Branch: BRANCH Tag: (none) Parent: 3 Log: Change on BRANCH in b Members: b.txt:1.2->1.2.2.1 $ cd ..