##// END OF EJS Templates
rhg: Bug fix: with share-safe, always read store requirements...
Simon Sapin -
r47357:f64b6953 default
parent child Browse files
Show More
@@ -116,9 +116,6 b' impl Repo {'
116 let store_path;
116 let store_path;
117 if !shared {
117 if !shared {
118 store_path = dot_hg.join("store");
118 store_path = dot_hg.join("store");
119 if share_safe {
120 reqs.extend(requirements::load(Vfs { base: &store_path })?);
121 }
122 } else {
119 } else {
123 let bytes = hg_vfs.read("sharedpath")?;
120 let bytes = hg_vfs.read("sharedpath")?;
124 let mut shared_path = get_path_from_bytes(&bytes).to_owned();
121 let mut shared_path = get_path_from_bytes(&bytes).to_owned();
@@ -166,6 +163,9 b' impl Repo {'
166 repo_config_files.insert(0, shared_path.join("hgrc"))
163 repo_config_files.insert(0, shared_path.join("hgrc"))
167 }
164 }
168 }
165 }
166 if share_safe {
167 reqs.extend(requirements::load(Vfs { base: &store_path })?);
168 }
169
169
170 let repo_config = config.combine_with_repo(&repo_config_files)?;
170 let repo_config = config.combine_with_repo(&repo_config_files)?;
171
171
General Comments 0
You need to be logged in to leave comments. Login now