##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

mq: Fix --qrefresh --short to work with --exclude and --include...
mq: Fix --qrefresh --short to work with --exclude and --include pmezard expects hg qref -s -X b to apply the -X to the list of files in the patch, and thus remove b from the patch. That's how it worked before f7fc5f5ecd62. That change seemed sensible, but it wasn't... mpm says (17:22:30) pmezard_: kiilerix1: do you mean that -X should be forbidden with -s ? (17:22:54) pmezard_: kiilerix1: and --include too (17:23:03) mpm: No because you should be able to say hg qref -s foo* -X foo-bar so mpm expects hg qref -s -X b * to apply the -X to the list of files in the working directory, and thus don't include b in the patch This patch tries to make both usecases work by creating a matchfn which uses the include/excludes but not the filelist.
Thomas Arendsen Hein - - Load All Authors

File last commit:

r4857:2192001e default
r7177:09ed32b7 default
Show More
test-annotate
113 lines | 1.5 KiB | text/plain | TextLexer
/ tests / test-annotate
History | Annotation | Raw |Copy content |Copy permalink
#!/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