Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-annotate @ 5378:8a2915f57dfc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 2192001e4bb4
children
line wrap: on
line source

#!/bin/sh

HGMERGE=true; export HGMERGE

echo % init
hg init

echo % commit
echo 'a' > a
hg ci -A -m test -u nobody -d '1 0'

echo % annotate -c
hg annotate -c a

echo % annotate -cl
hg annotate -cl a

echo % annotate -d
hg annotate -d a

echo % annotate -n
hg annotate -n a

echo % annotate -nl
hg annotate -nl a

echo % annotate -u
hg annotate -u a

echo % annotate -cdnu
hg annotate -cdnu a

echo % annotate -cdnul
hg annotate -cdnul a

cat <<EOF >>a
a
a
EOF
hg ci -ma1 -d '1 0'
hg cp a b
hg ci -mb -d '1 0'
cat <<EOF >> b
b4
b5
b6
EOF
hg ci -mb2 -d '2 0'

echo % annotate -n b
hg annotate -n b
echo % annotate -nl b
hg annotate -nl b
echo % annotate -nf b
hg annotate -nf b
echo % annotate -nlf b
hg annotate -nlf b

hg up -C 2
cat <<EOF >> b
b4
c
b5
EOF
hg ci -mb2.1 -d '2 0'
hg merge
hg ci -mmergeb -d '3 0'
echo % annotate after merge
hg annotate -nf b
echo % annotate after merge with -l
hg annotate -nlf b

hg up -C 1
hg cp a b
cat <<EOF > b
a
z
a
EOF
hg ci -mc -d '3 0'
hg merge
cat <<EOF >> b
b4
c
b5
EOF
echo d >> b
hg ci -mmerge2 -d '4 0'
echo % annotate after rename merge
hg annotate -nf b
echo % annotate after rename merge with -l
hg annotate -nlf b

echo % linkrev vs rev
hg annotate -r tip -n a
echo % linkrev vs rev with -l
hg annotate -r tip -nl a

# test issue 589
# annotate was crashing when trying to --follow something
# like A -> B -> A
echo % generate ABA rename configuration
echo foo > foo
hg add foo
hg ci -m addfoo
hg rename foo bar
hg ci -m renamefoo
hg rename bar foo
hg ci -m renamebar

echo % annotate after ABA with follow
hg annotate --follow foo