##// END OF EJS Templates
patch: support diff data loss detection and upgrade...
patch: support diff data loss detection and upgrade In worst case, generating diff in upgrade mode can be two times more expensive than generating it in git mode directly: we may have to regenerate the whole diff again whenever a git feature is detected. Also, the first diff attempt is completely buffered instead of being streamed. That said, even without having profiled it yet, I am convinced we can fast-path the upgrade mode if necessary were it to be used in regular diff commands, and not only in mq where avoiding data loss is worth the price.

File last commit:

r4857:2192001e default
r10189:e451e599 default
Show More
test-annotate
113 lines | 1.5 KiB | text/plain | TextLexer
Giorgos Keramidas
tests: new test for "hg annotate"
r2923 #!/bin/sh
Alexis S. L. Carvalho
change tests to use simplemerge by default
r4365 HGMERGE=true; export HGMERGE
Giorgos Keramidas
tests: new test for "hg annotate"
r2923 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
Thomas Arendsen Hein
Add --line-number option to hg annotate (issue506)...
r4857 echo % annotate -cl
hg annotate -cl a
Giorgos Keramidas
tests: new test for "hg annotate"
r2923 echo % annotate -d
hg annotate -d a
echo % annotate -n
hg annotate -n a
Thomas Arendsen Hein
Add --line-number option to hg annotate (issue506)...
r4857 echo % annotate -nl
hg annotate -nl a
Giorgos Keramidas
tests: new test for "hg annotate"
r2923 echo % annotate -u
hg annotate -u a
echo % annotate -cdnu
hg annotate -cdnu a
Brendan Cully
Refactor annotate copy support.
r3172
Thomas Arendsen Hein
Add --line-number option to hg annotate (issue506)...
r4857 echo % annotate -cdnul
hg annotate -cdnul a
Brendan Cully
Refactor annotate copy support.
r3172 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
Thomas Arendsen Hein
Add --line-number option to hg annotate (issue506)...
r4857 b4
b5
b6
Brendan Cully
Refactor annotate copy support.
r3172 EOF
hg ci -mb2 -d '2 0'
Thomas Arendsen Hein
Add --line-number option to hg annotate (issue506)...
r4857 echo % annotate -n b
hg annotate -n b
echo % annotate -nl b
hg annotate -nl b
Brendan Cully
Refactor annotate copy support.
r3172 echo % annotate -nf b
hg annotate -nf b
Thomas Arendsen Hein
Add --line-number option to hg annotate (issue506)...
r4857 echo % annotate -nlf b
hg annotate -nlf b
Brendan Cully
Refactor annotate copy support.
r3172
hg up -C 2
cat <<EOF >> b
Thomas Arendsen Hein
Add --line-number option to hg annotate (issue506)...
r4857 b4
Brendan Cully
Refactor annotate copy support.
r3172 c
Thomas Arendsen Hein
Add --line-number option to hg annotate (issue506)...
r4857 b5
Brendan Cully
Refactor annotate copy support.
r3172 EOF
hg ci -mb2.1 -d '2 0'
hg merge
hg ci -mmergeb -d '3 0'
echo % annotate after merge
hg annotate -nf b
Thomas Arendsen Hein
Add --line-number option to hg annotate (issue506)...
r4857 echo % annotate after merge with -l
hg annotate -nlf b
Brendan Cully
Refactor annotate copy support.
r3172
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
Thomas Arendsen Hein
Add --line-number option to hg annotate (issue506)...
r4857 b4
Brendan Cully
Refactor annotate copy support.
r3172 c
Thomas Arendsen Hein
Add --line-number option to hg annotate (issue506)...
r4857 b5
Brendan Cully
Refactor annotate copy support.
r3172 EOF
echo d >> b
hg ci -mmerge2 -d '4 0'
echo % annotate after rename merge
hg annotate -nf b
Thomas Arendsen Hein
Add --line-number option to hg annotate (issue506)...
r4857 echo % annotate after rename merge with -l
hg annotate -nlf b
Brendan Cully
Test annotate using named rev instead of linkrev
r3405
echo % linkrev vs rev
Thomas Arendsen Hein
Add --line-number option to hg annotate (issue506)...
r4857 hg annotate -r tip -n a
echo % linkrev vs rev with -l
hg annotate -r tip -nl a
Patrick Mezard
test-annotate: add a test for issue 589.
r4639
# test issue 589
Thomas Arendsen Hein
Kill trailing spaces
r4659 # annotate was crashing when trying to --follow something
Patrick Mezard
test-annotate: add a test for issue 589.
r4639 # 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