[PATCH 1 of 6] test-mq-guards: exercise some corner cases for guard selection and --reapply

Mads Kiilerich mads at kiilerich.com
Mon Jul 12 16:05:45 CDT 2010


# HG changeset patch
# User Mads Kiilerich <mads at kiilerich.com>
# Date 1278968554 -7200
# Node ID bf495a01244d6f7ce5c8fe3e2cc965e9f4300caf
# Parent  e765f4134cd9712ea5294aaa2043a4db1c7bf437
test-mq-guards: exercise some corner cases for guard selection and --reapply

diff --git a/tests/test-mq-guards b/tests/test-mq-guards
--- a/tests/test-mq-guards
+++ b/tests/test-mq-guards
@@ -166,3 +166,25 @@
 hg qseries -m
 echo % hg qseries -m with color
 hg --config extensions.color= qseries -m --color=always
+
+echo % preparing testing reapply with different difficult indices
+hg qpop -a
+hg qguard -- new.patch -not-new
+hg qguard -- c.patch -not-c
+hg qguard -- d.patch -not-d
+hg qpush -a
+echo % qguard -l
+hg qguard -l
+echo % select not-d
+hg qselect --reapply not-d
+hg qser -v
+echo % select -n
+hg qselect --reapply -n
+hg qpush
+hg qser -v
+echo % select not-c
+hg qselect --reapply not-c
+hg qser -v
+echo % select not-new
+hg qselect --reapply not-new
+hg qser -v
diff --git a/tests/test-mq-guards.out b/tests/test-mq-guards.out
--- a/tests/test-mq-guards.out
+++ b/tests/test-mq-guards.out
@@ -217,3 +217,58 @@
 b.patch
 % hg qseries -m with color
 b.patch
+% preparing testing reapply with different difficult indices
+popping c.patch
+popping new.patch
+patch queue now empty
+applying new.patch
+applying c.patch
+applying d.patch
+patch d.patch is empty
+now at: d.patch
+% qguard -l
+new.patch: -not-new
+c.patch: -not-c
+d.patch: -not-d
+% select not-d
+popping guarded patches
+popping d.patch
+now at: c.patch
+reapplying unguarded patches
+cannot push 'd.patch' - guarded by '-not-d'
+0 A new.patch
+1 A c.patch
+2 G d.patch
+% select -n
+guards deactivated
+applying d.patch
+patch d.patch is empty
+now at: d.patch
+0 A new.patch
+1 A c.patch
+2 A d.patch
+% select not-c
+popping guarded patches
+popping d.patch
+now at: c.patch
+reapplying unguarded patches
+applying d.patch
+patch d.patch is empty
+now at: d.patch
+0 A new.patch
+1 A c.patch
+2 A d.patch
+% select not-new
+popping guarded patches
+popping d.patch
+popping c.patch
+popping new.patch
+patch queue now empty
+reapplying unguarded patches
+applying c.patch
+applying d.patch
+patch d.patch is empty
+now at: d.patch
+0 G new.patch
+1 A c.patch
+2 A d.patch


More information about the Mercurial-devel mailing list