mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
5a9970a155
Line numbers are separated from the last annotation element with a colon, like with many other commands, e.g. (hg) grep or compiler errors. Idea and tests by FUJIWARA Katsunori.
114 lines
1.5 KiB
Bash
Executable File
114 lines
1.5 KiB
Bash
Executable File
#!/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
|
|
|