Mercurial > public > mercurial-scm > hg-stable

diff rust/rhg/src/error.rs @ 47674:ff97e793ed36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate-v2: Introduce a docket file .hg/dirstate now only contains some metadata to point to a separate data file named .hg/dirstate.{}.d with a random hexadecimal identifier. For now every update creates a new data file and removes the old one, but later we?ll (usually) append to an existing file. Separating into two files allows doing the "write to a temporary file then atomically rename into destination" dance with only a small docket file, without always rewriting a lot of data. Differential Revision: https://phab.mercurial-scm.org/D11088
author Simon Sapin <simon.sapin@octobus.net>
date Thu, 08 Jul 2021 12:18:21 +0200
parents 7954ee2d7cf7
children 006688e36e12
line wrap: on
line diff
--- a/rust/rhg/src/error.rs	Thu Jul 15 17:24:09 2021 +0200
+++ b/rust/rhg/src/error.rs	Thu Jul 08 12:18:21 2021 +0200
@@ -3,6 +3,7 @@
 use crate::NoRepoInCwdError;
 use format_bytes::format_bytes;
 use hg::config::{ConfigError, ConfigParseError, ConfigValueParseError};
+use hg::dirstate_tree::on_disk::DirstateV2ParseError;
 use hg::errors::HgError;
 use hg::exit_codes;
 use hg::repo::RepoError;
@@ -199,3 +200,9 @@
         }
     }
 }
+
+impl From<DirstateV2ParseError> for CommandError {
+    fn from(error: DirstateV2ParseError) -> Self {
+        HgError::from(error).into()
+    }
+}