changeset 47337:717a94b423b9

merge with stable

--- a/rust/hg-core/src/dirstate/status.rs	Wed May 26 21:46:45 2021 +0200
+++ b/rust/hg-core/src/dirstate/status.rs	Fri May 28 17:33:20 2021 -0400
@@ -583,9 +583,11 @@
                         .unwrap();
                 }
             } else if self.is_ignored(&filename) && self.options.list_ignored {
-                files_sender
-                    .send((filename.to_owned(), Dispatch::Ignored))
-                    .unwrap();
+                if self.matcher.matches(&filename) {
+                    files_sender
+                        .send((filename.to_owned(), Dispatch::Ignored))
+                        .unwrap();
+                }
             }
         } else if let Some(entry) = entry_option {
             // Used to be a file or a folder, now something else.

--- a/tests/test-http-bundle1.t	Wed May 26 21:46:45 2021 +0200
+++ b/tests/test-http-bundle1.t	Fri May 28 17:33:20 2021 -0400
@@ -192,10 +192,10 @@
   $ cat pid >> $DAEMON_PIDS
 
   $ cat << EOF > get_pass.py
-  > import getpass
-  > def newgetpass(arg):
+  > from mercurial import util
+  > def newgetpass():
   >   return "pass"
-  > getpass.getpass = newgetpass
+  > util.get_password = newgetpass
   > EOF
 
   $ hg id http://localhost:$HGPORT2/

--- a/tests/test-http.t	Wed May 26 21:46:45 2021 +0200
+++ b/tests/test-http.t	Fri May 28 17:33:20 2021 -0400
@@ -181,10 +181,10 @@
   $ cat pid >> $DAEMON_PIDS
 
   $ cat << EOF > get_pass.py
-  > import getpass
-  > def newgetpass(arg):
+  > from mercurial import util
+  > def newgetpass():
   >   return "pass"
-  > getpass.getpass = newgetpass
+  > util.get_password = newgetpass
   > EOF
 
   $ hg id http://localhost:$HGPORT2/

--- a/tests/test-largefiles-wireproto.t	Wed May 26 21:46:45 2021 +0200
+++ b/tests/test-largefiles-wireproto.t	Fri May 28 17:33:20 2021 -0400
@@ -425,10 +425,10 @@
   >          -d -p $HGPORT --pid-file hg.pid -A access.log
   $ cat hg.pid >> $DAEMON_PIDS
   $ cat << EOF > get_pass.py
-  > import getpass
-  > def newgetpass(arg):
+  > from mercurial import util
+  > def newgetpass():
   >   return "pass"
-  > getpass.getpass = newgetpass
+  > util.get_password = newgetpass
   > EOF
   $ hg clone --config ui.interactive=true --config extensions.getpass=get_pass.py \
   >          http://user@localhost:$HGPORT credentialclone

--- a/tests/test-status.t	Wed May 26 21:46:45 2021 +0200
+++ b/tests/test-status.t	Fri May 28 17:33:20 2021 -0400
@@ -881,3 +881,20 @@
   $ hg status --ignored
   I ignored
   I ignored-dir/subdir/1
+
+Check using include flag while listing ignored composes correctly (issue6514)
+
+  $ cd ..
+  $ hg init issue6514
+  $ cd issue6514
+  $ mkdir ignored-folder
+  $ touch A.hs B.hs C.hs ignored-folder/other.txt ignored-folder/ctest.hs
+  $ cat >.hgignore <<EOF
+  > A.hs
+  > B.hs
+  > ignored-folder/
+  > EOF
+  $ hg st -i -I 're:.*\.hs$'
+  I A.hs
+  I B.hs
+  I ignored-folder/ctest.hs