This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12462

rhg: use the new `set_clean` API
ClosedPublic

Authored by Alphare on Apr 6 2022, 10:12 AM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHG232fbb68caa1: rhg: use the new `set_clean` API
rHG70726c31ae91: rhg: use the new `set_clean` API

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

Alphare created this revision.Apr 6 2022, 10:12 AM
marmoute accepted this revision.Apr 8 2022, 7:30 AM
Alphare added a commit: rHG70726c31ae91: rhg: use the new `set_clean` API.Apr 8 2022, 11:56 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG70726c31ae91: rhg: use the new `set_clean` API (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.
baymax updated this revision to Diff 32934.Apr 8 2022, 12:29 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 33036.Apr 12 2022, 10:58 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 33118.Apr 12 2022, 12:06 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Revision Contents
Changeset List

PathPackages
Mrust/rhg/src/commands/status.rs (9 lines)

Diff 32898

rust/rhg/src/commands/status.rs

use crate::utils::path_utils::RelativizePaths; use crate::utils::path_utils::RelativizePaths;
use clap::{Arg, SubCommand}; use clap::{Arg, SubCommand};
use format_bytes::format_bytes; use format_bytes::format_bytes;
use hg; use hg;
use hg::config::Config; use hg::config::Config;
use hg::dirstate::has_exec_bit; use hg::dirstate::has_exec_bit;
use hg::dirstate::status::StatusPath; use hg::dirstate::status::StatusPath;
use hg::dirstate::TruncatedTimestamp; use hg::dirstate::TruncatedTimestamp;
use hg::dirstate::RANGE_MASK_31BIT;
use hg::errors::{HgError, IoResultExt}; use hg::errors::{HgError, IoResultExt};
use hg::lock::LockError; use hg::lock::LockError;
use hg::manifest::Manifest; use hg::manifest::Manifest;
use hg::matchers::AlwaysMatcher; use hg::matchers::AlwaysMatcher;
use hg::repo::Repo; use hg::repo::Repo;
use hg::utils::files::get_bytes_from_os_string; use hg::utils::files::get_bytes_from_os_string;
use hg::utils::files::get_bytes_from_path; use hg::utils::files::get_bytes_from_path;
use hg::utils::files::get_path_from_bytes; use hg::utils::files::get_path_from_bytes;
if let Some(mtime) = if let Some(mtime) =
TruncatedTimestamp::for_reliable_mtime_of( TruncatedTimestamp::for_reliable_mtime_of(
&fs_metadata, &fs_metadata,
&mtime_boundary, &mtime_boundary,
) )
.when_reading_file(&fs_path)? .when_reading_file(&fs_path)?
{ {
let mode = fs_metadata.mode(); let mode = fs_metadata.mode();
let size = fs_metadata.len() as u32 & RANGE_MASK_31BIT; let size = fs_metadata.len();
let mut entry = dmap dmap.set_clean(&hg_path, mode, size as u32, mtime)?;
.get(&hg_path)?
.expect("ambiguous file not in dirstate");
entry.set_clean(mode, size, mtime);
dmap.add_file(&hg_path, entry)?;
dirstate_write_needed = true dirstate_write_needed = true
} }
} }
} }
drop(dmap); // Avoid "already mutably borrowed" RefCell panics drop(dmap); // Avoid "already mutably borrowed" RefCell panics
if dirstate_write_needed { if dirstate_write_needed {
repo.write_dirstate()? repo.write_dirstate()?
} }