Mercurial > hg
view tests/test-highlight @ 8849:80cc4b1a62d0
compare grep result between target and its parent
I found that typical case is that grep target is added at (*) revision
in the tree shown below.
+--- 1(*) --- 3
0
+--- 2 ------ 4
Now, I expect 'hg grep --all' to show only rev:1 which is first
appearance of target line.
But 'hg grep --all' will tell:
target line dis-appeared at 3 => 4
target line appeared at 2 => 3
target line dis-appeared at 1 => 2
target line appeared at 0 => 1
because current 'hg grep' implementation compares not between target
revision and its parent, but between neighbor revisions in walkthrough
order.
I checked performance of this patch by "hg grep --follow --all
walkchangerevs" on whole Mercurial repo, and patched version could
complete as fast as un-patched one.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Tue, 19 May 2009 16:49:54 +0900 |
parents | 0b93eff3721d |
children | 799373ff2554 |
line wrap: on
line source
#!/bin/sh "$TESTDIR/hghave" pygments || exit 80 cat <<EOF >> $HGRCPATH [extensions] hgext.highlight = [web] pygments_style = friendly EOF hg init test cd test # create random Python file to exercise Pygments cat <<EOF > primes.py #!/usr/bin/env python """Fun with generators. Corresponding Haskell implementation: primes = 2 : sieve [3, 5..] where sieve (p:ns) = p : sieve [n | n <- ns, mod n p /= 0] """ from itertools import dropwhile, ifilter, islice, count, chain def primes(): """Generate all primes.""" def sieve(ns): p = ns.next() # It is important to yield *here* in order to stop the # infinite recursion. yield p ns = ifilter(lambda n: n % p != 0, ns) for n in sieve(ns): yield n odds = ifilter(lambda i: i % 2 == 1, count()) return chain([2], sieve(dropwhile(lambda n: n < 3, odds))) if __name__ == "__main__": import sys try: n = int(sys.argv[1]) except (ValueError, IndexError): n = 10 p = primes() print "The first %d primes: %s" % (n, list(islice(p, n))) EOF # check for UnicodeDecodeError with iso-8859-1 file contents python -c 'fp = open("isolatin.txt", "w"); fp.write("h\xFCbsch\n"); fp.close();' hg ci -Ama echo % hg serve hg serve -p $HGPORT -d -n test --pid-file=hg.pid -A access.log -E errors.log cat hg.pid >> $DAEMON_PIDS echo % hgweb filerevision, html ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/primes.py') \ | sed "s/class=\"k\"/class=\"kn\"/g" | sed "s/class=\"mf\"/class=\"mi\"/g" echo % hgweb filerevision, html ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/isolatin.txt') \ | sed "s/class=\"k\"/class=\"kn\"/g" echo % hgweb fileannotate, html ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/annotate/tip/primes.py') \ | sed "s/class=\"k\"/class=\"kn\"/g" | sed "s/class=\"mi\"/class=\"mf\"/g" echo % hgweb fileannotate, raw ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/annotate/tip/primes.py?style=raw') \ | sed "s/test@//" > a echo "200 Script output follows" > b echo "" >> b echo "" >> b hg annotate "primes.py" >> b echo "" >> b echo "" >> b echo "" >> b echo "" >> b diff -u b a echo echo % hgweb filerevision, raw ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/primes.py?style=raw') \ > a echo "200 Script output follows" > b echo "" >> b hg cat primes.py >> b diff -u b a echo echo % hgweb highlightcss friendly "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/highlightcss' > out head -n 4 out rm out echo % errors encountered cat errors.log "$TESTDIR/killdaemons.py" # Change the pygments style cat > .hg/hgrc <<EOF [web] pygments_style = fruity EOF echo % hg serve again hg serve -p $HGPORT -d -n test --pid-file=hg.pid -A access.log -E errors.log cat hg.pid >> $DAEMON_PIDS echo % hgweb highlightcss fruity "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/highlightcss' > out head -n 4 out rm out echo % errors encountered cat errors.log