##// END OF EJS Templates
merge: store cases when a file is absent post merge in commitinfo...
merge: store cases when a file is absent post merge in commitinfo Some merges can result in file being absent form working directory. This can be one of file was kept deleted or file was removed by merge code. User might revert the file back before committing. In such cases we will like to have better handling and create new filenodes. We store this info in mergestate as commitinfo so that we can use it while committing to create new filenode if required. Differential Revision: https://phab.mercurial-scm.org/D9003

File last commit:

r46110:aebc976f default
r46161:76841247 default
Show More
revlog.rs
67 lines | 2.1 KiB | application/rls-services+xml | RustLexer
Georges Racinet
rust-core: extracted a revlog submodule...
r44457 // 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
Georges Racinet
rust-node: binary Node ID and conversion utilities...
r44601 pub mod node;
Georges Racinet
rust-nodemap: building blocks for nodetree structures...
r44600 pub mod nodemap;
Antoine Cezar
hg-core: add path_encode...
r46110 pub mod path_encode;
Georges Racinet
rust-node: handling binary Node prefix...
r44643 pub use node::{Node, NodeError, NodePrefix, NodePrefixRef};
Antoine Cezar
hg-core: add `Changlog` a specialized `Revlog`...
r46103 pub mod changelog;
Antoine Cezar
hg-core: Add a limited read only `revlog` implementation...
r46097 pub mod index;
Antoine Cezar
hg-core: add `Manifest` a specialized `Revlog`...
r46104 pub mod manifest;
Antoine Cezar
hg-core: Add a limited read only `revlog` implementation...
r46097 pub mod patch;
pub mod revlog;
Georges Racinet
rust-nodemap: building blocks for nodetree structures...
r44600
Georges Racinet
rust-core: extracted a revlog submodule...
r44457 /// 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
Aay Jay Chan
rust-core: fix typo in comment...
r44547 /// to be smaller than all existing revisions.
Georges Racinet
rust-core: extracted a revlog submodule...
r44457 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`
Raphaël Gomès
rust: do a clippy pass...
r45500 #[allow(clippy::unreadable_literal)]
Georges Racinet
rust-core: extracted a revlog submodule...
r44457 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,
}
Georges Racinet
rust-revlog: a trait for the revlog index...
r44642
/// The Mercurial Revlog Index
///
/// This is currently limited to the minimal interface that is needed for
/// the [`nodemap`](nodemap/index.html) module
pub trait RevlogIndex {
/// Total number of Revisions referenced in this index
fn len(&self) -> usize;
Raphaël Gomès
rust: do a clippy pass...
r45500 fn is_empty(&self) -> bool {
self.len() == 0
}
Georges Racinet
rust-revlog: a trait for the revlog index...
r44642 /// Return a reference to the Node or `None` if rev is out of bounds
///
/// `NULL_REVISION` is not considered to be out of bounds.
fn node(&self, rev: Revision) -> Option<&Node>;
}