This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12213

rhg: simplify the handling of share-safe config mismatch
ClosedPublic

Authored by aalekseyev on Feb 21 2022, 2:55 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG1d5fd9def5ac: rhg: simplify the handling of share-safe config mismatch

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

aalekseyev created this revision.Feb 21 2022, 2:55 PM
aalekseyev added a comment.Feb 21 2022, 3:47 PM

There is no benefit to fast-pathing the mismatch case, so it's better to keep the code simple.
In particular the code being removed is hard-coding the fact that the default value is abort, which is something we want to change in the hg deployment we use.
Removing this fast-path make configitems.py the only place where the default value is specified.

Unknown Object (User) added a subscriber: Unknown Object (User).Feb 21 2022, 9:56 PM

I adore this article for its well-researched content and great wording 1v1 battle

Alphare added a subscriber: Alphare.EditedFeb 22 2022, 4:27 AM

FYI, we are in a code freeze until ~March 1st, so this will get some attention after this.

aalekseyev added a comment.Feb 22 2022, 5:56 AM

That's cool. Thanks.

Alphare accepted this revision.Mar 2 2022, 4:41 AM
This revision is now accepted and ready to land.Mar 2 2022, 4:41 AM

Revision Contents
Changeset List

PathPackages
Mrust/hg-core/src/repo.rs (28 lines)

Diff 32336

rust/hg-core/src/repo.rs

use crate::changelog::Changelog; use crate::changelog::Changelog;
use crate::config::{Config, ConfigError, ConfigParseError}; use crate::config::{Config, ConfigError, ConfigParseError};
use crate::dirstate::DirstateParents; use crate::dirstate::DirstateParents;
use crate::dirstate_tree::dirstate_map::DirstateMap; use crate::dirstate_tree::dirstate_map::DirstateMap;
use crate::dirstate_tree::on_disk::Docket as DirstateDocket; use crate::dirstate_tree::on_disk::Docket as DirstateDocket;
use crate::dirstate_tree::owning::OwningDirstateMap; use crate::dirstate_tree::owning::OwningDirstateMap;
use crate::errors::HgResultExt; use crate::errors::HgResultExt;
use crate::errors::{HgError, IoResultExt}; use crate::errors::{HgError, IoResultExt};
use crate::exit_codes;
use crate::lock::{try_with_lock_no_wait, LockError}; use crate::lock::{try_with_lock_no_wait, LockError};
use crate::manifest::{Manifest, Manifestlog}; use crate::manifest::{Manifest, Manifestlog};
use crate::revlog::filelog::Filelog; use crate::revlog::filelog::Filelog;
use crate::revlog::revlog::RevlogError; use crate::revlog::revlog::RevlogError;
use crate::utils::files::get_path_from_bytes; use crate::utils::files::get_path_from_bytes;
use crate::utils::hg_path::HgPath; use crate::utils::hg_path::HgPath;
use crate::utils::SliceExt; use crate::utils::SliceExt;
use crate::vfs::{is_dir, is_file, Vfs}; use crate::vfs::{is_dir, is_file, Vfs};
} }
store_path = shared_path.join("store"); store_path = shared_path.join("store");
let source_is_share_safe = let source_is_share_safe =
requirements::load(Vfs { base: &shared_path })? requirements::load(Vfs { base: &shared_path })?
.contains(requirements::SHARESAFE_REQUIREMENT); .contains(requirements::SHARESAFE_REQUIREMENT);
if share_safe && !source_is_share_safe { if share_safe != source_is_share_safe {
return Err(match config return Err(HgError::unsupported("share-safe mismatch").into());
.get(b"share", b"safe-mismatch.source-not-safe")
{
Some(b"abort") | None => HgError::abort(
"abort: share source does not support share-safe requirement\n\
(see `hg help config.format.use-share-safe` for more information)",
exit_codes::ABORT,
),
_ => HgError::unsupported("share-safe downgrade"),
}
.into());
} else if source_is_share_safe && !share_safe {
return Err(
match config.get(b"share", b"safe-mismatch.source-safe") {
Some(b"abort") | None => HgError::abort(
"abort: version mismatch: source uses share-safe \
functionality while the current share does not\n\
(see `hg help config.format.use-share-safe` for more information)",
exit_codes::ABORT,
),
_ => HgError::unsupported("share-safe upgrade"),
}
.into(),
);
} }
if share_safe { if share_safe {
repo_config_files.insert(0, shared_path.join("hgrc")) repo_config_files.insert(0, shared_path.join("hgrc"))
} }
} }
if share_safe { if share_safe {
reqs.extend(requirements::load(Vfs { base: &store_path })?); reqs.extend(requirements::load(Vfs { base: &store_path })?);