view tests/test-flags @ 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.

#!/bin/sh -e

umask 027
mkdir test1
cd test1

hg init
touch a b
hg add a b
hg ci -m "added a b" -d "1000000 0"

cd ..
hg clone test1 test3
mkdir test2
cd test2

hg init
hg pull ../test1
hg co
chmod +x a
hg ci -m "chmod +x a" -d "1000000 0"
echo % the changelog should mention file a:
hg tip --template '{files}\n'

cd ../test1
echo 123 >>a
hg ci -m "a updated" -d "1000000 0"

hg pull ../test2
hg heads
hg history

hg -v merge

cd ../test3
echo 123 >>b
hg ci -m "b updated" -d "1000000 0"

hg pull ../test2
hg heads
hg history

hg -v merge

ls -l ../test[123]/a > foo
cut -b 1-10 < foo

hg debugindex .hg/store/data/a.i
hg debugindex ../test2/.hg/store/data/a.i
hg debugindex ../test1/.hg/store/data/a.i