# HG changeset patch
# User Raphaël Gomès <rgomes@octobus.net>
# Date 1645180628 -3600
# Node ID 834c938227c6dc80cfc3958d7c77d7b2f33c70bd
# Parent  6e559391f96e775685d8eda6b2781a756c7f0044# Parent  dcec16e799ddb6d33fcd11b04af530250a417a58
branching: merge stable into default

diff -r 6e559391f96e -r 834c938227c6 contrib/automation/hgautomation/aws.py
--- a/contrib/automation/hgautomation/aws.py	Thu Feb 17 07:34:49 2022 +0100
+++ b/contrib/automation/hgautomation/aws.py	Fri Feb 18 11:37:08 2022 +0100
@@ -904,7 +904,7 @@
                 'Ebs': {
                     'DeleteOnTermination': True,
                     'VolumeSize': 10,
-                    'VolumeType': 'gp2',
+                    'VolumeType': 'gp3',
                 },
             },
         ],
@@ -1048,7 +1048,7 @@
             'Ebs': {
                 'DeleteOnTermination': True,
                 'VolumeSize': 12,
-                'VolumeType': 'gp2',
+                'VolumeType': 'gp3',
             },
         }
     ]
@@ -1075,7 +1075,7 @@
                 'Ebs': {
                     'DeleteOnTermination': True,
                     'VolumeSize': 8,
-                    'VolumeType': 'gp2',
+                    'VolumeType': 'gp3',
                 },
             }
         )
@@ -1151,13 +1151,13 @@
                 'Ebs': {
                     'DeleteOnTermination': True,
                     'VolumeSize': 32,
-                    'VolumeType': 'gp2',
+                    'VolumeType': 'gp3',
                 },
             }
         ],
         'ImageId': image.id,
         'InstanceInitiatedShutdownBehavior': 'stop',
-        'InstanceType': 't3.medium',
+        'InstanceType': 'm6i.large',
         'KeyName': '%sautomation' % prefix,
         'MaxCount': 1,
         'MinCount': 1,
@@ -1311,7 +1311,7 @@
                 'Ebs': {
                     'DeleteOnTermination': True,
                     'VolumeSize': 32,
-                    'VolumeType': 'gp2',
+                    'VolumeType': 'gp3',
                 },
             }
         ],
diff -r 6e559391f96e -r 834c938227c6 contrib/automation/hgautomation/cli.py
--- a/contrib/automation/hgautomation/cli.py	Thu Feb 17 07:34:49 2022 +0100
+++ b/contrib/automation/hgautomation/cli.py	Fri Feb 18 11:37:08 2022 +0100
@@ -151,7 +151,7 @@
     image = aws.ensure_windows_dev_ami(c, base_image_name=base_image_name)
     DIST_PATH.mkdir(exist_ok=True)
 
-    with aws.temporary_windows_dev_instances(c, image, 't3.medium') as insts:
+    with aws.temporary_windows_dev_instances(c, image, 'm6i.large') as insts:
         instance = insts[0]
 
         winrm_client = instance.winrm_client
@@ -496,7 +496,7 @@
     sp.add_argument(
         '--instance-type',
         help='EC2 instance type to use',
-        default='t3.medium',
+        default='m6i.large',
     )
     sp.add_argument(
         '--python-version',
diff -r 6e559391f96e -r 834c938227c6 rust/hg-core/src/dirstate_tree/status.rs
--- a/rust/hg-core/src/dirstate_tree/status.rs	Thu Feb 17 07:34:49 2022 +0100
+++ b/rust/hg-core/src/dirstate_tree/status.rs	Fri Feb 18 11:37:08 2022 +0100
@@ -778,7 +778,17 @@
         let mut results = Vec::new();
         for entry in read_dir_path.read_dir()? {
             let entry = entry?;
-            let metadata = entry.metadata()?;
+            let metadata = match entry.metadata() {
+                Ok(v) => v,
+                Err(e) => {
+                    // race with file deletion?
+                    if e.kind() == std::io::ErrorKind::NotFound {
+                        continue;
+                    } else {
+                        return Err(e);
+                    }
+                }
+            };
             let file_name = entry.file_name();
             // FIXME don't do this when cached
             if file_name == ".hg" {