This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10766

rhg: A missing .hg/dirstate file is not an error
ClosedPublic

Authored by SimonSapin on May 22 2021, 1:39 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG1760de72a992: rhg: A missing .hg/dirstate file is not an error
rHG8969e4c33342: rhg: A missing .hg/dirstate file is not an error
Summary

Instead treat it as like an empty file

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

SimonSapin created this revision.May 22 2021, 1:39 PM
pulkit accepted this revision.May 23 2021, 3:33 PM
This revision is now accepted and ready to land.May 23 2021, 3:33 PM
baymax updated this revision to Diff 28195.May 24 2021, 5:52 PM

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

SimonSapin added a commit: rHG8969e4c33342: rhg: A missing .hg/dirstate file is not an error.May 27 2021, 2:59 PM
Closed by commit rHG8969e4c33342: rhg: A missing .hg/dirstate file is not an error (authored by SimonSapin). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 28218

rust/rhg/src/commands/status.rs

// status.rs // status.rs
// //
// Copyright 2020, Georges Racinet <georges.racinets@octobus.net> // Copyright 2020, Georges Racinet <georges.racinets@octobus.net>
// //
// This software may be used and distributed according to the terms of the // This software may be used and distributed according to the terms of the
// GNU General Public License version 2 or any later version. // GNU General Public License version 2 or any later version.
use crate::error::CommandError; use crate::error::CommandError;
use crate::ui::Ui; use crate::ui::Ui;
use clap::{Arg, SubCommand}; use clap::{Arg, SubCommand};
use hg; use hg;
use hg::errors::HgResultExt;
use hg::errors::IoResultExt; use hg::errors::IoResultExt;
use hg::matchers::AlwaysMatcher; use hg::matchers::AlwaysMatcher;
use hg::operations::cat; use hg::operations::cat;
use hg::repo::Repo; use hg::repo::Repo;
use hg::revlog::node::Node; use hg::revlog::node::Node;
use hg::utils::hg_path::{hg_path_to_os_string, HgPath}; use hg::utils::hg_path::{hg_path_to_os_string, HgPath};
use hg::{DirstateMap, StatusError}; use hg::{DirstateMap, StatusError};
use hg::{HgPathCow, StatusOptions}; use hg::{HgPathCow, StatusOptions};
DEFAULT_DISPLAY_STATES DEFAULT_DISPLAY_STATES
} else { } else {
requested requested
} }
}; };
let repo = invocation.repo?; let repo = invocation.repo?;
let mut dmap = DirstateMap::new(); let mut dmap = DirstateMap::new();
let dirstate_data = repo.hg_vfs().mmap_open("dirstate")?; let dirstate_data =
let parents = dmap.read(&dirstate_data)?; repo.hg_vfs().mmap_open("dirstate").io_not_found_as_none()?;
let dirstate_data = match &dirstate_data {
Some(mmap) => &**mmap,
None => b"",
};
let parents = dmap.read(dirstate_data)?;
let options = StatusOptions { let options = StatusOptions {
// TODO should be provided by the dirstate parsing and // TODO should be provided by the dirstate parsing and
// hence be stored on dmap. Using a value that assumes we aren't // hence be stored on dmap. Using a value that assumes we aren't
// below the time resolution granularity of the FS and the // below the time resolution granularity of the FS and the
// dirstate. // dirstate.
last_normal_time: 0, last_normal_time: 0,
// we're currently supporting file systems with exec flags only // we're currently supporting file systems with exec flags only
// anyway // anyway