This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7782

rust-core: extracted a revlog submodule
ClosedPublic

Authored by gracinet on Jan 2 2020, 1:20 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG6b332c1fc7fe: rust-core: extracted a revlog submodule
rHG9aee291b608a: rust-core: extracted a revlog submodule
Summary

This moves fundamental definitions from the top of the crate
to the newly created revlog submodule and reexports them for
easy compatibility.

As we are about to add new features to this crate, we felt it
will improve clarity, and moreso if ancestors and dagops
would become submodules of revlog.

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

gracinet created this revision.Jan 2 2020, 1:20 PM
Alphare added a subscriber: Alphare.Jan 3 2020, 4:43 AM

Since there is no newline at the end of revlog.rs, I can assume rustfmt would be unhappy about this patch. Maybe I'm wrong? Otherwise, the patch looks good, hg-core needs a refactor.

Alphare accepted this revision.Jan 3 2020, 5:41 AM

It appears that the phabricator UI does not show the last line, so everything is fine.

gracinet added a commit: rHG9aee291b608a: rust-core: extracted a revlog submodule.Jan 8 2020, 11:50 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG9aee291b608a: rust-core: extracted a revlog submodule (authored by gracinet). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrust/hg-core/src/lib.rs (34 lines)
AMrust/hg-core/src/revlog.rs (38 lines)

Diff 19068

rust/hg-core/src/lib.rs

dirstate_map::DirstateMap, dirstate_map::DirstateMap,
parsers::{pack_dirstate, parse_dirstate, PARENT_SIZE}, parsers::{pack_dirstate, parse_dirstate, PARENT_SIZE},
status::{status, StatusResult}, status::{status, StatusResult},
CopyMap, CopyMapIter, DirstateEntry, DirstateParents, EntryState, CopyMap, CopyMapIter, DirstateEntry, DirstateParents, EntryState,
StateMap, StateMapIter, StateMap, StateMapIter,
}; };
mod filepatterns; mod filepatterns;
pub mod matchers; pub mod matchers;
pub mod revlog;
pub use revlog::*;
pub mod utils; pub mod utils;
use crate::utils::hg_path::HgPathBuf; use crate::utils::hg_path::HgPathBuf;
pub use filepatterns::{ pub use filepatterns::{
build_single_regex, read_pattern_file, PatternSyntax, PatternTuple, build_single_regex, read_pattern_file, PatternSyntax, PatternTuple,
}; };
use std::collections::HashMap; use std::collections::HashMap;
use twox_hash::RandomXxHashBuilder64; use twox_hash::RandomXxHashBuilder64;
/// Mercurial revision numbers
///
/// As noted in revlog.c, revision numbers are actually encoded in
/// 4 bytes, and are liberally converted to ints, whence the i32
pub type Revision = i32;
/// Marker expressing the absence of a parent
///
/// Independently of the actual representation, `NULL_REVISION` is guaranteed
/// to be smaller that all existing revisions.
pub const NULL_REVISION: Revision = -1;
/// Same as `mercurial.node.wdirrev`
///
/// This is also equal to `i32::max_value()`, but it's better to spell
/// it out explicitely, same as in `mercurial.node`
pub const WORKING_DIRECTORY_REVISION: Revision = 0x7fffffff;
/// The simplest expression of what we need of Mercurial DAGs.
pub trait Graph {
/// Return the two parents of the given `Revision`.
///
/// Each of the parents can be independently `NULL_REVISION`
fn parents(&self, rev: Revision) -> Result<[Revision; 2], GraphError>;
}
pub type LineNumber = usize; pub type LineNumber = usize;
/// Rust's default hasher is too slow because it tries to prevent collision /// Rust's default hasher is too slow because it tries to prevent collision
/// attacks. We are not concerned about those: if an ill-minded person has /// attacks. We are not concerned about those: if an ill-minded person has
/// write access to your repository, you have other issues. /// write access to your repository, you have other issues.
pub type FastHashMap<K, V> = HashMap<K, V, RandomXxHashBuilder64>; pub type FastHashMap<K, V> = HashMap<K, V, RandomXxHashBuilder64>;
#[derive(Clone, Debug, PartialEq)] #[derive(Clone, Debug, PartialEq)]
pub enum GraphError {
ParentOutOfRange(Revision),
WorkingDirectoryUnsupported,
}
#[derive(Clone, Debug, PartialEq)]
pub enum DirstateParseError { pub enum DirstateParseError {
TooLittleData, TooLittleData,
Overflow, Overflow,
CorruptedEntry(String), CorruptedEntry(String),
Damaged, Damaged,
} }
impl From<std::io::Error> for DirstateParseError { impl From<std::io::Error> for DirstateParseError {

rust/hg-core/src/revlog.rs

  • This file was added.
// Copyright 2018-2020 Georges Racinet <georges.racinet@octobus.net>
// and Mercurial contributors
//
// This software may be used and distributed according to the terms of the
// GNU General Public License version 2 or any later version.
//! Mercurial concepts for handling revision history
/// Mercurial revision numbers
///
/// As noted in revlog.c, revision numbers are actually encoded in
/// 4 bytes, and are liberally converted to ints, whence the i32
pub type Revision = i32;
/// Marker expressing the absence of a parent
///
/// Independently of the actual representation, `NULL_REVISION` is guaranteed
/// to be smaller that all existing revisions.
pub const NULL_REVISION: Revision = -1;
/// Same as `mercurial.node.wdirrev`
///
/// This is also equal to `i32::max_value()`, but it's better to spell
/// it out explicitely, same as in `mercurial.node`
pub const WORKING_DIRECTORY_REVISION: Revision = 0x7fffffff;
/// The simplest expression of what we need of Mercurial DAGs.
pub trait Graph {
/// Return the two parents of the given `Revision`.
///
/// Each of the parents can be independently `NULL_REVISION`
fn parents(&self, rev: Revision) -> Result<[Revision; 2], GraphError>;
}
#[derive(Clone, Debug, PartialEq)]
pub enum GraphError {
ParentOutOfRange(Revision),
WorkingDirectoryUnsupported,
}