Mercurial > hg

changeset 4241:7c59ade0f0d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hg qseries -m: guards file was not ignored
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 18 Mar 2007 20:37:47 +0100
parents 943f40b4da30
children e1cdf5f6386e
files hgext/mq.py tests/test-mq-guards tests/test-mq-guards.out
diffstat 3 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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()
--- 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
--- 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