##// END OF EJS Templates
simplemerge: flush stdout before writing to stderr....
simplemerge: flush stdout before writing to stderr. Besides, stderr is not always unbuffered under win32 (when redirections occur for instance), and it should be flushed too.

File last commit:

r4405:83696720 default
r4408:1ef4445c default
Show More
test-mq-guards
154 lines | 2.4 KiB | text/plain | TextLexer
Vadim Gelfer
mq: new commands qselect, qguard...
r2821 #!/bin/sh
Thomas Arendsen Hein
Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc...
r2990 echo "[extensions]" >> $HGRCPATH
echo "mq=" >> $HGRCPATH
Vadim Gelfer
mq: new commands qselect, qguard...
r2821
hg init
hg qinit
echo x > x
hg ci -Ama
hg qnew a.patch
echo a > a
hg add a
hg qrefresh
hg qnew b.patch
echo b > b
hg add b
hg qrefresh
hg qnew c.patch
echo c > c
hg add c
hg qrefresh
hg qpop -a
echo % should fail
Christian Ebert
mq: abort cleanly when invalid patch name is given to qguard
r4133 hg qguard does-not-exist.patch +bleh
echo % should fail
Vadim Gelfer
mq: new commands qselect, qguard...
r2821 hg qguard +fail
hg qpush
echo % should guard a.patch
hg qguard +a
echo % should print +a
hg qguard
hg qpop
hg qguard a.patch
echo % should push b.patch
hg qpush
hg qpop
hg qselect a
echo % should push a.patch
hg qpush
hg qguard c.patch -a
echo % should print -a
hg qguard c.patch
echo % should skip c.patch
hg qpush -a
hg qguard -n c.patch
echo % should push c.patch
hg qpush -a
hg qpop -a
hg qselect -n
Vadim Gelfer
mq: make guards more strict, add tests
r2829 echo % should push all
Vadim Gelfer
mq: new commands qselect, qguard...
r2821 hg qpush -a
Vadim Gelfer
mq: make guards more strict, add tests
r2829
hg qpop -a
Vadim Gelfer
mq: apply patch is any posative guard matches...
r2850 hg qguard a.patch +1
hg qguard b.patch +2
Vadim Gelfer
mq: make guards more strict, add tests
r2829 hg qselect 1
Vadim Gelfer
mq: apply patch is any posative guard matches...
r2850 echo % should push a.patch, not b.patch
hg qpush
hg qpush
hg qpop -a
hg qselect 2
Vadim Gelfer
mq: make guards more strict, add tests
r2829 echo % should push b.patch
hg qpush
Patrick Mezard
mq: test qtop with holes in the patch sequence.
r4340 hg qpush -a
# Used to be an issue with holes in the patch sequence
# So, put one hole on the base and ask for topmost patch.
hg qtop
Vadim Gelfer
mq: make guards more strict, add tests
r2829 hg qpop -a
Vadim Gelfer
mq: apply patch is any posative guard matches...
r2850 hg qselect 1 2
echo % should push a.patch, b.patch
Vadim Gelfer
mq: make guards more strict, add tests
r2829 hg qpush
hg qpush
hg qpop -a
hg qguard a.patch +1 +2 -3
hg qselect 1 2 3
Vadim Gelfer
mq: apply patch is any posative guard matches...
r2850 echo % list patches and guards
hg qguard -l
echo % list series
hg qseries -v
echo % list guards
hg qselect
Vadim Gelfer
mq: make guards more strict, add tests
r2829 echo % should push b.patch
hg qpush
Vadim Gelfer
qselect: add --pop, --reapply options
r2844
hg qpush -a
hg qselect -n --reapply
Vadim Gelfer
mq: apply patch is any posative guard matches...
r2850 echo % guards in series file: +1 +2 -3
hg qselect -s
echo % should show c.patch
hg qapplied
Mathieu Clabaut
Issue424: mq patch loses guard when qrenamed
r3685
hg qrename a.patch new.patch
echo % should show :
echo % new.patch: +1 +2 -3
echo % b.patch: +2
echo % c.patch: unguarded
hg qguard -l
Alexis S. L. Carvalho
fix qseries -v and guards interaction...
r3763 hg qnew d.patch
hg qpop
echo % should show new.patch and b.patch as Guarded, c.patch as Applied
echo % and d.patch as Unapplied
hg qseries -v
Mathieu Clabaut
Issue424: mq patch loses guard when qrenamed
r3685
Alexis S. L. Carvalho
fix qseries -v and guards interaction...
r3763 hg qguard d.patch +2
echo % new.patch, b.patch: Guarded. c.patch: Applied. d.patch: Guarded.
hg qseries -v
Thomas Arendsen Hein
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
r4240
qappunappv()
(
for command in qapplied "qapplied -v" qunapplied "qunapplied -v"; do
echo % hg $command
hg $command
done
)
hg qpop -a
hg qguard -l
qappunappv
hg qselect 1
qappunappv
hg qpush -a
qappunappv
hg qselect 2
qappunappv
for patch in `hg qseries`; do
echo % hg qapplied $patch
hg qapplied $patch
echo % hg qunapplied $patch
hg qunapplied $patch
done
Thomas Arendsen Hein
hg qseries -m: guards file was not ignored
r4241
echo % hg qseries -m: only b.patch should be shown
echo the guards file was not ignored in the past
hg qdelete -k b.patch
hg qseries -m