# HG changeset patch
# User Simon Sapin <simon.sapin@octobus.net>
# Date 2021-02-25 22:14:35
# Node ID f64b6953db7048c28fa66a7532c1f092c20e3204
# Parent  80f7567ac9bb142ed752439eeb6dd41736e10f10

rhg: Bug fix: with share-safe, always read store requirements

That is, the `store/requires` file,
regardless of whether the repository is a shared.

Differential Revision: https://phab.mercurial-scm.org/D10078

diff --git a/rust/hg-core/src/repo.rs b/rust/hg-core/src/repo.rs
--- a/rust/hg-core/src/repo.rs
+++ b/rust/hg-core/src/repo.rs
@@ -116,9 +116,6 @@ impl Repo {
         let store_path;
         if !shared {
             store_path = dot_hg.join("store");
-            if share_safe {
-                reqs.extend(requirements::load(Vfs { base: &store_path })?);
-            }
         } else {
             let bytes = hg_vfs.read("sharedpath")?;
             let mut shared_path = get_path_from_bytes(&bytes).to_owned();
@@ -166,6 +163,9 @@ impl Repo {
                 repo_config_files.insert(0, shared_path.join("hgrc"))
             }
         }
+        if share_safe {
+            reqs.extend(requirements::load(Vfs { base: &store_path })?);
+        }
 
         let repo_config = config.combine_with_repo(&repo_config_files)?;