This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	SimonSapin	D11412 rhg: Don’t compare ambiguous files one byte at a time
Closed	SimonSapin	D11411 rhg: Reuse manifest when checking status of multiple ambiguous files
Closed	SimonSapin	D11410 rust: Return HgError instead of RevlogError in revlog constructors
Closed	SimonSapin	D11409 rhg: Align with Python on some revset parsing corner cases
Closed	SimonSapin	D11408 rust: Add a Filelog struct that wraps Revlog
Closed	SimonSapin	D11407 rust: Add Repo::manifest(revision)
Closed	SimonSapin	D11406 rust: Keep lazily-initialized Changelog and Manifest log on the Repo object
Closed	SimonSapin	D11405 rust: Move lazy initialization of `Repo::dirstate_map` into a generic struct
Closed	SimonSapin	D11404 rust: Rename Manifest to Manifestlog, ManifestEntry to Manifest

Diff 30225

rust/hg-core/src/operations/cat.rs

	/// * `rev`: The revision to cat the files from.			/// * `rev`: The revision to cat the files from.
	/// * `files`: The files to output.			/// * `files`: The files to output.
	pub fn cat<'a>(			pub fn cat<'a>(
	repo: &Repo,			repo: &Repo,
	revset: &str,			revset: &str,
	files: &'a [HgPathBuf],			files: &'a [HgPathBuf],
	) -> Result<CatOutput, RevlogError> {			) -> Result<CatOutput, RevlogError> {
	let rev = crate::revset::resolve_single(revset, repo)?;			let rev = crate::revset::resolve_single(revset, repo)?;
	let changelog = repo.changelog()?;			let manifest = repo.manifest(rev)?;
	let manifest = repo.manifestlog()?;			let node = *repo
	let changelog_entry = changelog.get_rev(rev)?;			.changelog()?
	let node = *changelog
	.node_from_rev(rev)			.node_from_rev(rev)
	.expect("should succeed when changelog.get_rev did");			.expect("should succeed when repo.manifest did");
	let manifest_node =
	Node::from_hex_for_repo(&changelog_entry.manifest_node()?)?;
	let manifest_entry = manifest.get_node(manifest_node.into())?;
	let mut bytes = vec![];			let mut bytes = vec![];
	let mut matched = vec![false; files.len()];			let mut matched = vec![false; files.len()];
	let mut found_any = false;			let mut found_any = false;

	for (manifest_file, node_bytes) in manifest_entry.files_with_nodes() {			for (manifest_file, node_bytes) in manifest.files_with_nodes() {
	for (cat_file, is_matched) in files.iter().zip(&mut matched) {			for (cat_file, is_matched) in files.iter().zip(&mut matched) {
	if cat_file.as_bytes() == manifest_file.as_bytes() {			if cat_file.as_bytes() == manifest_file.as_bytes() {
	*is_matched = true;			*is_matched = true;
	found_any = true;			found_any = true;
	let index_path = store_path(manifest_file, b".i");			let index_path = store_path(manifest_file, b".i");
	let data_path = store_path(manifest_file, b".d");			let data_path = store_path(manifest_file, b".d");

	let file_log =			let file_log =

rust/hg-core/src/operations/list_tracked_files.rs

	// list_tracked_files.rs			// list_tracked_files.rs
	//			//
	// Copyright 2020 Antoine Cezar <antoine.cezar@octobus.net>			// Copyright 2020 Antoine Cezar <antoine.cezar@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::dirstate::parsers::parse_dirstate_entries;			use crate::dirstate::parsers::parse_dirstate_entries;
	use crate::dirstate_tree::on_disk::{for_each_tracked_path, read_docket};			use crate::dirstate_tree::on_disk::{for_each_tracked_path, read_docket};
	use crate::errors::HgError;			use crate::errors::HgError;
	use crate::repo::Repo;			use crate::repo::Repo;
	use crate::revlog::manifest::Manifest;			use crate::revlog::manifest::Manifest;
	use crate::revlog::node::Node;
	use crate::revlog::revlog::RevlogError;			use crate::revlog::revlog::RevlogError;
	use crate::utils::hg_path::HgPath;			use crate::utils::hg_path::HgPath;
	use crate::DirstateError;			use crate::DirstateError;
	use rayon::prelude::*;			use rayon::prelude::*;

	/// List files under Mercurial control in the working directory			/// List files under Mercurial control in the working directory
	/// by reading the dirstate			/// by reading the dirstate
	pub struct Dirstate {			pub struct Dirstate {
	}			}

	/// List files under Mercurial control at a given revision.			/// List files under Mercurial control at a given revision.
	pub fn list_rev_tracked_files(			pub fn list_rev_tracked_files(
	repo: &Repo,			repo: &Repo,
	revset: &str,			revset: &str,
	) -> Result<FilesForRev, RevlogError> {			) -> Result<FilesForRev, RevlogError> {
	let rev = crate::revset::resolve_single(revset, repo)?;			let rev = crate::revset::resolve_single(revset, repo)?;
	let changelog = repo.changelog()?;			Ok(FilesForRev(repo.manifest(rev)?))
	let manifest = repo.manifestlog()?;
	let changelog_entry = changelog.get_rev(rev)?;
	let manifest_node =
	Node::from_hex_for_repo(&changelog_entry.manifest_node()?)?;
	let manifest_entry = manifest.get_node(manifest_node.into())?;
	Ok(FilesForRev(manifest_entry))
	}			}

	pub struct FilesForRev(Manifest);			pub struct FilesForRev(Manifest);

	impl FilesForRev {			impl FilesForRev {
	pub fn iter(&self) -> impl Iterator<Item = &HgPath> {			pub fn iter(&self) -> impl Iterator<Item = &HgPath> {
	self.0.files()			self.0.files()
	}			}
	}			}

rust/hg-core/src/repo.rs

	use crate::changelog::Changelog;			use crate::changelog::Changelog;
	use crate::config::{Config, ConfigError, ConfigParseError};			use crate::config::{Config, ConfigError, ConfigParseError};
	use crate::dirstate::DirstateParents;			use crate::dirstate::DirstateParents;
	use crate::dirstate_tree::dirstate_map::DirstateMap;			use crate::dirstate_tree::dirstate_map::DirstateMap;
	use crate::dirstate_tree::owning::OwningDirstateMap;			use crate::dirstate_tree::owning::OwningDirstateMap;
	use crate::errors::HgError;			use crate::errors::HgError;
	use crate::errors::HgResultExt;			use crate::errors::HgResultExt;
	use crate::exit_codes;			use crate::manifest::{Manifest, Manifestlog};
	use crate::manifest::Manifestlog;
	use crate::requirements;			use crate::requirements;
	use crate::revlog::revlog::RevlogError;			use crate::revlog::revlog::RevlogError;
	use crate::utils::files::get_path_from_bytes;			use crate::utils::files::get_path_from_bytes;
	use crate::utils::SliceExt;			use crate::utils::SliceExt;
	use crate::vfs::{is_dir, is_file, Vfs};			use crate::vfs::{is_dir, is_file, Vfs};
	use crate::DirstateError;			use crate::{exit_codes, Node};
				use crate::{DirstateError, Revision};
	use std::cell::{Cell, Ref, RefCell, RefMut};			use std::cell::{Cell, Ref, RefCell, RefMut};
	use std::collections::HashSet;			use std::collections::HashSet;
	use std::path::{Path, PathBuf};			use std::path::{Path, PathBuf};

	/// A repository on disk			/// A repository on disk
	pub struct Repo {			pub struct Repo {
	working_directory: PathBuf,			working_directory: PathBuf,
	dot_hg: PathBuf,			dot_hg: PathBuf,

	pub fn manifestlog(&self) -> Result<Ref<Manifestlog>, RevlogError> {			pub fn manifestlog(&self) -> Result<Ref<Manifestlog>, RevlogError> {
	self.manifestlog.get_or_init(self)			self.manifestlog.get_or_init(self)
	}			}

	pub fn manifestlog_mut(&self) -> Result<RefMut<Manifestlog>, RevlogError> {			pub fn manifestlog_mut(&self) -> Result<RefMut<Manifestlog>, RevlogError> {
	self.manifestlog.get_mut_or_init(self)			self.manifestlog.get_mut_or_init(self)
	}			}

				/// Returns the manifest of the given revision
				pub fn manifest(
				&self,
				revision: Revision,
				) -> Result<Manifest, RevlogError> {
				let changelog = self.changelog()?;
				let manifest = self.manifestlog()?;
				let changelog_entry = changelog.get_rev(revision)?;
				let manifest_node =
				Node::from_hex_for_repo(&changelog_entry.manifest_node()?)?;
				manifest.get_node(manifest_node.into())
				}
	}			}

	/// Lazily-initialized component of `Repo` with interior mutability			/// Lazily-initialized component of `Repo` with interior mutability
	///			///
	/// This differs from `OnceCell` in that the value can still be "deinitialized"			/// This differs from `OnceCell` in that the value can still be "deinitialized"
	/// later by setting its inner `Option` to `None`.			/// later by setting its inner `Option` to `None`.
	struct LazyCell<T, E> {			struct LazyCell<T, E> {
	value: RefCell<Option<T>>,			value: RefCell<Option<T>>,

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	30225		Sep 13 2021, 2:13 PM	★	★
Diff 2	30235	rHGcfb6e6699b25125c58062802b6a7f2886163ddec	Sep 13 2021, 7:45 AM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

rust: Add Repo::manifest(revision)ClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 30225

rust/hg-core/src/operations/cat.rs

rust/hg-core/src/operations/list_tracked_files.rs

rust/hg-core/src/repo.rs

rust: Add Repo::manifest(revision)
ClosedPublic

Revision Contents
Changeset List