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

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

Merge with crew-stable....
Merge with crew-stable. HG: changed hgext/mq.py
Patrick Mezard - - Load All Authors

File last commit:

r4405:83696720 default
r4409:28b7d949 merge default
Show More
test-mq-guards.out
184 lines | 3.4 KiB | text/plain | TextLexer
/ tests / test-mq-guards.out
History | Source | Raw |Copy content |Copy permalink
Vadim Gelfer
tests: forgot to add test-mq-guards.out
 r2826 adding x
Patch queue now empty
% should fail
Christian Ebert
mq: abort cleanly when invalid patch name is given to qguard
 r4133 abort: no patch named does-not-exist.patch
% should fail
Vadim Gelfer
tests: forgot to add test-mq-guards.out
 r2826 abort: no patches applied
applying a.patch
Now at: a.patch
% should guard a.patch
% should print +a
a.patch: +a
Patch queue now empty
a.patch: +a
% should push b.patch
applying b.patch
Now at: b.patch
Patch queue now empty
Vadim Gelfer
qselect: add --pop, --reapply options
 r2844 number of unguarded, unapplied patches has changed from 2 to 3
Vadim Gelfer
tests: forgot to add test-mq-guards.out
 r2826 % should push a.patch
applying a.patch
Now at: a.patch
% should print -a
c.patch: -a
% should skip c.patch
applying b.patch
Thomas Arendsen Hein
Fix test output for test-mq-guards (changed by 22d18051f9e5)
 r3873 skipping c.patch - guarded by '-a'
Vadim Gelfer
tests: forgot to add test-mq-guards.out
 r2826 Now at: b.patch
Patrick Mezard
Test qtop breaking when series ends with guarded patches.
 r4405 % should display b.patch
b.patch
Vadim Gelfer
tests: forgot to add test-mq-guards.out
 r2826 % should push c.patch
applying c.patch
Now at: c.patch
Patch queue now empty
guards deactivated
Vadim Gelfer
qselect: add --pop, --reapply options
 r2844 number of unguarded, unapplied patches has changed from 3 to 2
Vadim Gelfer
mq: make guards more strict, add tests
 r2829 % should push all
Vadim Gelfer
tests: forgot to add test-mq-guards.out
 r2826 applying b.patch
applying c.patch
Now at: c.patch
Vadim Gelfer
mq: make guards more strict, add tests
 r2829 Patch queue now empty
Vadim Gelfer
mq: apply patch is any posative guard matches...
 r2850 number of unguarded, unapplied patches has changed from 1 to 2
% should push a.patch, not b.patch
applying a.patch
Now at: a.patch
applying c.patch
Now at: c.patch
Patch queue now empty
Vadim Gelfer
mq: make guards more strict, add tests
 r2829 % should push b.patch
applying b.patch
Now at: b.patch
Patrick Mezard
mq: test qtop with holes in the patch sequence.
 r4340 applying c.patch
Now at: c.patch
c.patch
Vadim Gelfer
mq: make guards more strict, add tests
 r2829 Patch queue now empty
Vadim Gelfer
mq: apply patch is any posative guard matches...
 r2850 number of unguarded, unapplied patches has changed from 2 to 3
% should push a.patch, b.patch
applying a.patch
Now at: a.patch
Vadim Gelfer
mq: make guards more strict, add tests
 r2829 applying b.patch
Now at: b.patch
Patch queue now empty
Vadim Gelfer
qselect: add --pop, --reapply options
 r2844 number of unguarded, unapplied patches has changed from 3 to 2
Vadim Gelfer
mq: apply patch is any posative guard matches...
 r2850 % list patches and guards
a.patch: +1 +2 -3
b.patch: +2
c.patch: unguarded
% list series
0 G a.patch
1 U b.patch
2 U c.patch
% list guards
1
2
3
Vadim Gelfer
mq: make guards more strict, add tests
 r2829 % should push b.patch
applying b.patch
Now at: b.patch
Vadim Gelfer
qselect: add --pop, --reapply options
 r2844 applying c.patch
Now at: c.patch
guards deactivated
popping guarded patches
Patch queue now empty
reapplying unguarded patches
applying c.patch
Now at: c.patch
Vadim Gelfer
mq: apply patch is any posative guard matches...
 r2850 % guards in series file: +1 +2 -3
+1
+2
-3
% should show c.patch
c.patch
Mathieu Clabaut
Issue424: mq patch loses guard when qrenamed
 r3685 % should show :
% new.patch: +1 +2 -3
% b.patch: +2
% c.patch: unguarded
new.patch: +1 +2 -3
b.patch: +2
c.patch: unguarded
Alexis S. L. Carvalho
fix qseries -v and guards interaction...
 r3763 Now at: c.patch
% should show new.patch and b.patch as Guarded, c.patch as Applied
% and d.patch as Unapplied
0 G new.patch
1 G b.patch
2 A c.patch
3 U d.patch
% new.patch, b.patch: Guarded. c.patch: Applied. d.patch: Guarded.
0 G new.patch
1 G b.patch
2 A c.patch
3 G d.patch
Thomas Arendsen Hein
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
 r4240 Patch queue now empty
new.patch: +1 +2 -3
b.patch: +2
c.patch: unguarded
d.patch: +2
% hg qapplied
% hg qapplied -v
% hg qunapplied
c.patch
% hg qunapplied -v
0 G new.patch
1 G b.patch
2 U c.patch
3 G d.patch
number of unguarded, unapplied patches has changed from 1 to 2
% hg qapplied
% hg qapplied -v
% hg qunapplied
new.patch
c.patch
% hg qunapplied -v
0 U new.patch
1 G b.patch
2 U c.patch
3 G d.patch
applying new.patch
skipping b.patch - guarded by ['+2']
applying c.patch
skipping d.patch - guarded by ['+2']
Now at: c.patch
% hg qapplied
new.patch
c.patch
% hg qapplied -v
0 A new.patch
1 G b.patch
2 A c.patch
% hg qunapplied
% hg qunapplied -v
3 G d.patch
number of unguarded, unapplied patches has changed from 0 to 1
number of guarded, applied patches has changed from 1 to 0
% hg qapplied
new.patch
c.patch
% hg qapplied -v
0 A new.patch
1 U b.patch
2 A c.patch
% hg qunapplied
d.patch
% hg qunapplied -v
3 U d.patch
% hg qapplied new.patch
new.patch
% hg qunapplied new.patch
b.patch
d.patch
% hg qapplied b.patch
new.patch
% hg qunapplied b.patch
d.patch
% hg qapplied c.patch
new.patch
c.patch
% hg qunapplied c.patch
d.patch
% hg qapplied d.patch
new.patch
c.patch
% hg qunapplied d.patch
Thomas Arendsen Hein
hg qseries -m: guards file was not ignored
 r4241 % hg qseries -m: only b.patch should be shown
the guards file was not ignored in the past
b.patch