# HG changeset patch # User Thomas Arendsen Hein # Date 1174246667 -3600 # Node ID 7c59ade0f0d65958fabf43b1d0e9a59d7ca2abdb # Parent 943f40b4da30ce7b2328c0bf8719192841ad4f8f hg qseries -m: guards file was not ignored diff -r 943f40b4da30 -r 7c59ade0f0d6 hgext/mq.py --- a/hgext/mq.py Sun Mar 18 19:41:28 2007 +0100 +++ b/hgext/mq.py Sun Mar 18 20:37:47 2007 +0100 @@ -1146,7 +1146,8 @@ for f in files: fl = os.path.join(d, f) if (fl not in self.series and - fl not in (self.status_path, self.series_path) + fl not in (self.status_path, self.series_path, + self.guards_path) and not fl.startswith('.')): msng_list.append(fl) msng_list.sort() diff -r 943f40b4da30 -r 7c59ade0f0d6 tests/test-mq-guards --- a/tests/test-mq-guards Sun Mar 18 19:41:28 2007 +0100 +++ b/tests/test-mq-guards Sun Mar 18 20:37:47 2007 +0100 @@ -143,3 +143,8 @@ echo % hg qunapplied $patch hg qunapplied $patch done + +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 diff -r 943f40b4da30 -r 7c59ade0f0d6 tests/test-mq-guards.out --- a/tests/test-mq-guards.out Sun Mar 18 19:41:28 2007 +0100 +++ b/tests/test-mq-guards.out Sun Mar 18 20:37:47 2007 +0100 @@ -174,3 +174,6 @@ new.patch c.patch % hg qunapplied d.patch +% hg qseries -m: only b.patch should be shown +the guards file was not ignored in the past +b.patch