mercurial-scm/hg: rust/rhg/src/commands/status.rs annotate

annotate rust/rhg/src/commands/status.rs @ 52395:136e74c2bf8f

rhg: fix bug with matchers in rhg status --rev --rev The fix was simply to move up the block of code that initializes the matcher from the arguments.

author	Mitchell Kember <mkember@janestreet.com>
date	Tue, 03 Dec 2024 15:27:50 -0500
parents	393ad2685fb4
children	42bd36bbed67

rev	line source
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	1 // status.rs
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	2 //
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	3 // Copyright 2020, Georges Racinet <georges.racinets@octobus.net>
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	4 //
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	5 // This software may be used and distributed according to the terms of the
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	6 // GNU General Public License version 2 or any later version.
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	7
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	8 use crate::error::CommandError;
49981 364e78389653 rust-ui: refactor ui code for printing narrow/sparse warnings Rapha?l Gom?s <rgomes@octobus.net> parents: 49948 diff changeset	9 use crate::ui::{
50760 f8412da86d05 rust-config: add support for default config items Rapha?l Gom?s <rgomes@octobus.net> parents: 50460 diff changeset	10 format_pattern_file_warning, print_narrow_sparse_warnings, relative_paths,
f8412da86d05 rust-config: add support for default config items Rapha?l Gom?s <rgomes@octobus.net> parents: 50460 diff changeset	11 RelativePaths, Ui,
49981 364e78389653 rust-ui: refactor ui code for printing narrow/sparse warnings Rapha?l Gom?s <rgomes@octobus.net> parents: 49948 diff changeset	12 };
48453 9b0e1f64656f rhg: refactor relativize_path into a struct + method Simon Sapin <simon.sapin@octobus.net> parents: 48452 diff changeset	13 use crate::utils::path_utils::RelativizePaths;
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	14 use clap::Arg;
48349 c12ed33558cb rhg: Add support for `rhg status -n` Simon Sapin <simon.sapin@octobus.net> parents: 48345 diff changeset	15 use format_bytes::format_bytes;
48175 707c58880cd0 rhg: add relative paths support in `rhg status` Pulkit Goyal <7895pulkit@gmail.com> parents: 48171 diff changeset	16 use hg::config::Config;
52299 b422acba55f1 rust-dirstate: remove star exports Rapha?l Gom?s <rgomes@octobus.net> parents: 52278 diff changeset	17 use hg::dirstate::entry::{has_exec_bit, TruncatedTimestamp};
52300 04b9a56c2d25 rust-lib: only export very common types to the top of the crate Rapha?l Gom?s <rgomes@octobus.net> parents: 52299 diff changeset	18 use hg::dirstate::status::{
52301 79e8118cd846 rust-lib: move `DirstateError` to the `dirstate` module Rapha?l Gom?s <rgomes@octobus.net>* parents: 52300 diff changeset	19 BadMatch, DirstateStatus, StatusError, StatusOptions, StatusPath,
52300 04b9a56c2d25 rust-lib: only export very common types to the top of the crate Rapha?l Gom?s <rgomes@octobus.net> parents: 52299 diff changeset	20 };
48422 000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	21 use hg::errors::{HgError, IoResultExt};
52303 22d24f6d6411 rust-lib: remove exports for not too common pattern-related types Rapha?l Gom?s <rgomes@octobus.net> parents: 52301 diff changeset	22 use hg::filepatterns::{parse_pattern_args, PatternFileWarning};
48422 000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	23 use hg::lock::LockError;
49489 7c93e38a0bbd rhg-status: add support for narrow clones Rapha?l Gom?s <rgomes@octobus.net> parents: 49485 diff changeset	24 use hg::matchers::{AlwaysMatcher, IntersectionMatcher};
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	25 use hg::repo::Repo;
52178 bd8081e9fd62 rust: don't star export from the `revlog` module Rapha?l Gom?s <rgomes@octobus.net> parents: 52156 diff changeset	26 use hg::revlog::manifest::Manifest;
52156 039b7caeb4d9 rust-revlog: introduce an `options` module Rapha?l Gom?s <rgomes@octobus.net> parents: 52033 diff changeset	27 use hg::revlog::options::{default_revlog_options, RevlogOpenOptions};
52178 bd8081e9fd62 rust: don't star export from the `revlog` module Rapha?l Gom?s <rgomes@octobus.net> parents: 52156 diff changeset	28 use hg::revlog::RevlogType;
50215 ae61851e6fe2 dirstate: add a way to test races happening during status Rapha?l Gom?s <rgomes@octobus.net>, Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50178 diff changeset	29 use hg::utils::debug::debug_wait_for_file;
50863 c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50760 diff changeset	30 use hg::utils::files::{
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50760 diff changeset	31 get_bytes_from_os_str, get_bytes_from_os_string, get_path_from_bytes,
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50760 diff changeset	32 };
48422 000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	33 use hg::utils::hg_path::{hg_path_to_path_buf, HgPath};
51152 ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	34 use hg::Revision;
49489 7c93e38a0bbd rhg-status: add support for narrow clones Rapha?l Gom?s <rgomes@octobus.net> parents: 49485 diff changeset	35 use hg::{self, narrow, sparse};
48511 c9abfb80b4e3 rhg: Properly format warnings related to ignore patterns Simon Sapin <simon.sapin@octobus.net> parents: 48501 diff changeset	36 use log::info;
49517 52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49516 diff changeset	37 use rayon::prelude::*;
51152 ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	38 use std::borrow::Cow;
48422 000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	39 use std::io;
51150 976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	40 use std::mem::take;
48451 4a983b69e519 rhg: Add support for ui.ignore and ui.ignore.* config Simon Sapin <simon.sapin@octobus.net> parents: 48443 diff changeset	41 use std::path::PathBuf;
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	42
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	43 pub const HELP_TEXT: &str = "
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	44 Show changed files in the working directory
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	45
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	46 This is a pure Rust version of `hg status`.
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	47
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	48 Some options might be missing, check the list below.
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	49 ";
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	50
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	51 pub fn args() -> clap::Command {
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	52 clap::command!("status")
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	53 .alias("st")
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	54 .about(HELP_TEXT)
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	55 .arg(
50863 c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50760 diff changeset	56 Arg::new("file")
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50760 diff changeset	57 .value_parser(clap::value_parser!(std::ffi::OsString))
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50760 diff changeset	58 .help("show only these files")
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50760 diff changeset	59 .action(clap::ArgAction::Append),
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50760 diff changeset	60 )
c112cc9effdc rhg: support "status FILE" Spencer Baugh <sbaugh@janestreet.com> parents: 50760 diff changeset	61 .arg(
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	62 Arg::new("all")
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	63 .help("show status of all files")
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	64 .short('A')
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	65 .action(clap::ArgAction::SetTrue)
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	66 .long("all"),
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	67 )
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	68 .arg(
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	69 Arg::new("modified")
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	70 .help("show only modified files")
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	71 .short('m')
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	72 .action(clap::ArgAction::SetTrue)
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	73 .long("modified"),
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	74 )
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	75 .arg(
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	76 Arg::new("added")
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	77 .help("show only added files")
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	78 .short('a')
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	79 .action(clap::ArgAction::SetTrue)
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	80 .long("added"),
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	81 )
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	82 .arg(
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	83 Arg::new("removed")
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	84 .help("show only removed files")
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	85 .short('r')
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	86 .action(clap::ArgAction::SetTrue)
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	87 .long("removed"),
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	88 )
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	89 .arg(
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	90 Arg::new("clean")
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	91 .help("show only clean files")
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	92 .short('c')
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	93 .action(clap::ArgAction::SetTrue)
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	94 .long("clean"),
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	95 )
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	96 .arg(
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	97 Arg::new("deleted")
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	98 .help("show only deleted files")
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	99 .short('d')
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	100 .action(clap::ArgAction::SetTrue)
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	101 .long("deleted"),
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	102 )
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	103 .arg(
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	104 Arg::new("unknown")
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	105 .help("show only unknown (not tracked) files")
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	106 .short('u')
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	107 .action(clap::ArgAction::SetTrue)
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	108 .long("unknown"),
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	109 )
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	110 .arg(
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	111 Arg::new("ignored")
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	112 .help("show only ignored files")
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	113 .short('i')
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	114 .action(clap::ArgAction::SetTrue)
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	115 .long("ignored"),
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	116 )
48349 c12ed33558cb rhg: Add support for `rhg status -n` Simon Sapin <simon.sapin@octobus.net> parents: 48345 diff changeset	117 .arg(
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	118 Arg::new("copies")
48454 473af5cbc209 rhg: Add support for `rhg status --copies` Simon Sapin <simon.sapin@octobus.net> parents: 48453 diff changeset	119 .help("show source of copied files (DEFAULT: ui.statuscopies)")
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	120 .short('C')
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	121 .action(clap::ArgAction::SetTrue)
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	122 .long("copies"),
48454 473af5cbc209 rhg: Add support for `rhg status --copies` Simon Sapin <simon.sapin@octobus.net> parents: 48453 diff changeset	123 )
473af5cbc209 rhg: Add support for `rhg status --copies` Simon Sapin <simon.sapin@octobus.net> parents: 48453 diff changeset	124 .arg(
52341 c2814b698df8 rhg: support rhg status --no-copies Mitchell Kember <mkember@janestreet.com> parents: 52303 diff changeset	125 Arg::new("no-copies")
c2814b698df8 rhg: support rhg status --no-copies Mitchell Kember <mkember@janestreet.com> parents: 52303 diff changeset	126 .action(clap::ArgAction::SetTrue)
c2814b698df8 rhg: support rhg status --no-copies Mitchell Kember <mkember@janestreet.com> parents: 52303 diff changeset	127 .long("no-copies")
c2814b698df8 rhg: support rhg status --no-copies Mitchell Kember <mkember@janestreet.com> parents: 52303 diff changeset	128 .overrides_with("copies"),
c2814b698df8 rhg: support rhg status --no-copies Mitchell Kember <mkember@janestreet.com> parents: 52303 diff changeset	129 )
c2814b698df8 rhg: support rhg status --no-copies Mitchell Kember <mkember@janestreet.com> parents: 52303 diff changeset	130 .arg(
50424 98fc949bec14 rhg: support `status --print0` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50252 diff changeset	131 Arg::new("print0")
98fc949bec14 rhg: support `status --print0` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50252 diff changeset	132 .help("end filenames with NUL, for use with xargs")
98fc949bec14 rhg: support `status --print0` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50252 diff changeset	133 .short('0')
98fc949bec14 rhg: support `status --print0` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50252 diff changeset	134 .action(clap::ArgAction::SetTrue)
98fc949bec14 rhg: support `status --print0` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50252 diff changeset	135 .long("print0"),
98fc949bec14 rhg: support `status --print0` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50252 diff changeset	136 )
98fc949bec14 rhg: support `status --print0` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50252 diff changeset	137 .arg(
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	138 Arg::new("no-status")
48349 c12ed33558cb rhg: Add support for `rhg status -n` Simon Sapin <simon.sapin@octobus.net> parents: 48345 diff changeset	139 .help("hide status prefix")
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	140 .short('n')
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	141 .action(clap::ArgAction::SetTrue)
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	142 .long("no-status"),
48349 c12ed33558cb rhg: Add support for `rhg status -n` Simon Sapin <simon.sapin@octobus.net> parents: 48345 diff changeset	143 )
49439 b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	144 .arg(
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	145 Arg::new("verbose")
49439 b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	146 .help("enable additional output")
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	147 .short('v')
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	148 .action(clap::ArgAction::SetTrue)
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	149 .long("verbose"),
49439 b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	150 )
51152 ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	151 .arg(
ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	152 Arg::new("rev")
ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	153 .help("show difference from/to revision")
ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	154 .long("rev")
ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	155 .num_args(1)
ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	156 .action(clap::ArgAction::Append)
ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	157 .value_name("REV"),
ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	158 )
ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	159 }
ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	160
ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	161 fn parse_revpair(
ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	162 repo: &Repo,
ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	163 revs: Option<Vec<String>>,
ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	164 ) -> Result<Option<(Revision, Revision)>, CommandError> {
ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	165 let revs = match revs {
ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	166 None => return Ok(None),
ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	167 Some(revs) => revs,
ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	168 };
ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	169 if revs.is_empty() {
ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	170 return Ok(None);
ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	171 }
ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	172 if revs.len() != 2 {
ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	173 return Err(CommandError::unsupported("expected 0 or 2 --rev flags"));
ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	174 }
ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	175
ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	176 let rev1 = &revs[0];
ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	177 let rev2 = &revs[1];
52343 393ad2685fb4 rust: make RevlogError AmbiguousPrefix case contain the actual prefix Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52342 diff changeset	178 let rev1 = hg::revset::resolve_single(rev1, repo)?;
393ad2685fb4 rust: make RevlogError AmbiguousPrefix case contain the actual prefix Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52342 diff changeset	179 let rev2 = hg::revset::resolve_single(rev2, repo)?;
51152 ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	180 Ok(Some((rev1, rev2)))
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	181 }
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	182
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	183 /// Pure data type allowing the caller to specify file states to display
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	184 #[derive(Copy, Clone, Debug)]
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	185 pub struct DisplayStates {
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	186 pub modified: bool,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	187 pub added: bool,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	188 pub removed: bool,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	189 pub clean: bool,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	190 pub deleted: bool,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	191 pub unknown: bool,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	192 pub ignored: bool,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	193 }
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	194
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	195 pub const DEFAULT_DISPLAY_STATES: DisplayStates = DisplayStates {
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	196 modified: true,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	197 added: true,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	198 removed: true,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	199 clean: false,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	200 deleted: true,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	201 unknown: true,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	202 ignored: false,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	203 };
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	204
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	205 pub const ALL_DISPLAY_STATES: DisplayStates = DisplayStates {
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	206 modified: true,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	207 added: true,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	208 removed: true,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	209 clean: true,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	210 deleted: true,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	211 unknown: true,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	212 ignored: true,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	213 };
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	214
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	215 impl DisplayStates {
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	216 pub fn is_empty(&self) -> bool {
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	217 !(self.modified
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	218 \|\| self.added
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	219 \|\| self.removed
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	220 \|\| self.clean
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	221 \|\| self.deleted
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	222 \|\| self.unknown
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	223 \|\| self.ignored)
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	224 }
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	225 }
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	226
49439 b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	227 fn has_unfinished_merge(repo: &Repo) -> Result<bool, CommandError> {
49914 58074252db3c rust: run `cargo clippy` Rapha?l Gom?s <rgomes@octobus.net> parents: 49894 diff changeset	228 Ok(repo.dirstate_parents()?.is_merge())
49439 b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	229 }
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	230
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	231 fn has_unfinished_state(repo: &Repo) -> Result<bool, CommandError> {
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	232 // These are all the known values for the [fname] argument of
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	233 // [addunfinished] function in [state.py]
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	234 let known_state_files: &[&str] = &[
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	235 "bisect.state",
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	236 "graftstate",
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	237 "histedit-state",
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	238 "rebasestate",
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	239 "shelvedstate",
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	240 "transplant/journal",
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	241 "updatestate",
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	242 ];
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	243 if has_unfinished_merge(repo)? {
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	244 return Ok(true);
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	245 };
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	246 for f in known_state_files {
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	247 if repo.hg_vfs().join(f).exists() {
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	248 return Ok(true);
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	249 }
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	250 }
49914 58074252db3c rust: run `cargo clippy` Rapha?l Gom?s <rgomes@octobus.net> parents: 49894 diff changeset	251 Ok(false)
49439 b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	252 }
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	253
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	254 pub fn run(invocation: &crate::CliInvocation) -> Result<(), CommandError> {
48171 64b8676f11bb rhg: fallback if tweakdefaults or statuscopies is enabled with status Pulkit Goyal <7895pulkit@gmail.com> parents: 48069 diff changeset	255 // TODO: lift these limitations
48338 f9db8eeb3aec rhg: Config commands.status.terse is not supported Simon Sapin <simon.sapin@octobus.net> parents: 48337 diff changeset	256 if invocation
f9db8eeb3aec rhg: Config commands.status.terse is not supported Simon Sapin <simon.sapin@octobus.net> parents: 48337 diff changeset	257 .config
f9db8eeb3aec rhg: Config commands.status.terse is not supported Simon Sapin <simon.sapin@octobus.net> parents: 48337 diff changeset	258 .get(b"commands", b"status.terse")
f9db8eeb3aec rhg: Config commands.status.terse is not supported Simon Sapin <simon.sapin@octobus.net> parents: 48337 diff changeset	259 .is_some()
f9db8eeb3aec rhg: Config commands.status.terse is not supported Simon Sapin <simon.sapin@octobus.net> parents: 48337 diff changeset	260 {
f9db8eeb3aec rhg: Config commands.status.terse is not supported Simon Sapin <simon.sapin@octobus.net> parents: 48337 diff changeset	261 return Err(CommandError::unsupported(
f9db8eeb3aec rhg: Config commands.status.terse is not supported Simon Sapin <simon.sapin@octobus.net> parents: 48337 diff changeset	262 "status.terse is not yet supported with rhg status",
f9db8eeb3aec rhg: Config commands.status.terse is not supported Simon Sapin <simon.sapin@octobus.net> parents: 48337 diff changeset	263 ));
f9db8eeb3aec rhg: Config commands.status.terse is not supported Simon Sapin <simon.sapin@octobus.net> parents: 48337 diff changeset	264 }
48171 64b8676f11bb rhg: fallback if tweakdefaults or statuscopies is enabled with status Pulkit Goyal <7895pulkit@gmail.com> parents: 48069 diff changeset	265
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	266 let ui = invocation.ui;
48175 707c58880cd0 rhg: add relative paths support in `rhg status` Pulkit Goyal <7895pulkit@gmail.com> parents: 48171 diff changeset	267 let config = invocation.config;
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	268 let args = invocation.subcommand_args;
48513 47f2a82ae3e4 rhg: Fall back to Python if verbose status is requested by config Simon Sapin <simon.sapin@octobus.net> parents: 48511 diff changeset	269
51152 ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	270 let revs = args.get_many::<String>("rev");
50424 98fc949bec14 rhg: support `status --print0` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50252 diff changeset	271 let print0 = args.get_flag("print0");
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	272 let verbose = args.get_flag("verbose")
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	273 \|\| config.get_bool(b"ui", b"verbose")?
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	274 \|\| config.get_bool(b"commands", b"status.verbose")?;
50424 98fc949bec14 rhg: support `status --print0` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50252 diff changeset	275 let verbose = verbose && !print0;
48513 47f2a82ae3e4 rhg: Fall back to Python if verbose status is requested by config Simon Sapin <simon.sapin@octobus.net> parents: 48511 diff changeset	276
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	277 let all = args.get_flag("all");
48454 473af5cbc209 rhg: Add support for `rhg status --copies` Simon Sapin <simon.sapin@octobus.net> parents: 48453 diff changeset	278 let display_states = if all {
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	279 // TODO when implementing `--quiet`: it excludes clean files
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	280 // from `--all`
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	281 ALL_DISPLAY_STATES
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	282 } else {
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	283 let requested = DisplayStates {
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	284 modified: args.get_flag("modified"),
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	285 added: args.get_flag("added"),
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	286 removed: args.get_flag("removed"),
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	287 clean: args.get_flag("clean"),
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	288 deleted: args.get_flag("deleted"),
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	289 unknown: args.get_flag("unknown"),
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	290 ignored: args.get_flag("ignored"),
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	291 };
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	292 if requested.is_empty() {
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	293 DEFAULT_DISPLAY_STATES
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	294 } else {
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	295 requested
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	296 }
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	297 };
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	298 let no_status = args.get_flag("no-status");
52341 c2814b698df8 rhg: support rhg status --no-copies Mitchell Kember <mkember@janestreet.com> parents: 52303 diff changeset	299 let list_copies = if args.get_flag("copies") {
c2814b698df8 rhg: support rhg status --no-copies Mitchell Kember <mkember@janestreet.com> parents: 52303 diff changeset	300 true
c2814b698df8 rhg: support rhg status --no-copies Mitchell Kember <mkember@janestreet.com> parents: 52303 diff changeset	301 } else if args.get_flag("no-copies") {
c2814b698df8 rhg: support rhg status --no-copies Mitchell Kember <mkember@janestreet.com> parents: 52303 diff changeset	302 false
c2814b698df8 rhg: support rhg status --no-copies Mitchell Kember <mkember@janestreet.com> parents: 52303 diff changeset	303 } else {
c2814b698df8 rhg: support rhg status --no-copies Mitchell Kember <mkember@janestreet.com> parents: 52303 diff changeset	304 config.get_bool(b"ui", b"statuscopies")?
c2814b698df8 rhg: support rhg status --no-copies Mitchell Kember <mkember@janestreet.com> parents: 52303 diff changeset	305 };
52342 53dc147bc8b0 rhg: avoid calculating copies for status --no-status Mitchell Kember <mkember@janestreet.com> parents: 52341 diff changeset	306 let list_copies = (list_copies \|\| all) && !no_status;
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	307
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	308 let repo = invocation.repo?;
51152 ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	309 let revpair = parse_revpair(repo, revs.map(\|i\| i.cloned().collect()))?;
48409 005ae1a343f8 rhg: add support for narrow clones and sparse checkouts Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48391 diff changeset	310
49914 58074252db3c rust: run `cargo clippy` Rapha?l Gom?s <rgomes@octobus.net> parents: 49894 diff changeset	311 if verbose && has_unfinished_state(repo)? {
58074252db3c rust: run `cargo clippy` Rapha?l Gom?s <rgomes@octobus.net> parents: 49894 diff changeset	312 return Err(CommandError::unsupported(
58074252db3c rust: run `cargo clippy` Rapha?l Gom?s <rgomes@octobus.net> parents: 49894 diff changeset	313 "verbose status output is not supported by rhg (and is needed because we're in an unfinished operation)",
58074252db3c rust: run `cargo clippy` Rapha?l Gom?s <rgomes@octobus.net> parents: 49894 diff changeset	314 ));
49439 b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	315 }
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	316
47956 81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	317 let mut dmap = repo.dirstate_map_mut()?;
47674 ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47374 diff changeset	318
49894 678588b01af1 rhg: implement checkexec to support weird filesystems Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49640 diff changeset	319 let check_exec = hg::checkexec::check_exec(repo.working_directory_path());
678588b01af1 rhg: implement checkexec to support weird filesystems Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49640 diff changeset	320
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	321 let options = StatusOptions {
49894 678588b01af1 rhg: implement checkexec to support weird filesystems Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49640 diff changeset	322 check_exec,
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	323 list_clean: display_states.clean,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	324 list_unknown: display_states.unknown,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	325 list_ignored: display_states.ignored,
48454 473af5cbc209 rhg: Add support for `rhg status --copies` Simon Sapin <simon.sapin@octobus.net> parents: 48453 diff changeset	326 list_copies,
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	327 collect_traversed_dirs: false,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	328 };
49000 dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	329
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	330 type StatusResult<'a> =
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	331 Result<(DirstateStatus<'a>, Vec<PatternFileWarning>), StatusError>;
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	332
51150 976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	333 let relative_status = config
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	334 .get_option(b"commands", b"status.relative")?
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	335 .expect("commands.status.relative should have a default value");
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	336
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	337 let relativize_paths = relative_status \|\| {
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	338 // See in Python code with `getuipathfn` usage in `commands.py`.
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	339 let legacy_relative_behavior = args.contains_id("file");
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	340 match relative_paths(invocation.config)? {
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	341 RelativePaths::Legacy => legacy_relative_behavior,
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	342 RelativePaths::Bool(v) => v,
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	343 }
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	344 };
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	345
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	346 let mut output = DisplayStatusPaths {
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	347 ui,
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	348 no_status,
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	349 relativize: if relativize_paths {
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	350 Some(RelativizePaths::new(repo)?)
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	351 } else {
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	352 None
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	353 },
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	354 print0,
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	355 };
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	356
49000 dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	357 let after_status = \|res: StatusResult\| -> Result<_, CommandError> {
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	358 let (mut ds_status, pattern_warnings) = res?;
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	359 for warning in pattern_warnings {
49981 364e78389653 rust-ui: refactor ui code for printing narrow/sparse warnings Rapha?l Gom?s <rgomes@octobus.net> parents: 49948 diff changeset	360 ui.write_stderr(&format_pattern_file_warning(&warning, repo))?;
48511 c9abfb80b4e3 rhg: Properly format warnings related to ignore patterns Simon Sapin <simon.sapin@octobus.net> parents: 48501 diff changeset	361 }
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	362
51150 976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	363 for (path, error) in take(&mut ds_status.bad) {
49000 dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	364 let error = match error {
52300 04b9a56c2d25 rust-lib: only export very common types to the top of the crate Rapha?l Gom?s <rgomes@octobus.net> parents: 52299 diff changeset	365 BadMatch::OsError(code) => {
49000 dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	366 std::io::Error::from_raw_os_error(code).to_string()
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	367 }
52300 04b9a56c2d25 rust-lib: only export very common types to the top of the crate Rapha?l Gom?s <rgomes@octobus.net> parents: 52299 diff changeset	368 BadMatch::BadType(ty) => {
49000 dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	369 format!("unsupported file type (type is {})", ty)
47321 62225f9da938 rhg: Sort `rhg status` output correctly Simon Sapin <simon.sapin@octobus.net> parents: 47110 diff changeset	370 }
49000 dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	371 };
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	372 ui.write_stderr(&format_bytes!(
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	373 b"{}: {}\n",
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	374 path.as_bytes(),
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	375 error.as_bytes()
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	376 ))?
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	377 }
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	378 if !ds_status.unsure.is_empty() {
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	379 info!(
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	380 "Files to be rechecked by retrieval from filelog: {:?}",
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	381 ds_status.unsure.iter().map(\|s\| &s.path).collect::<Vec<_>>()
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	382 );
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	383 }
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	384 let mut fixup = Vec::new();
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	385 if !ds_status.unsure.is_empty()
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	386 && (display_states.modified \|\| display_states.clean)
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	387 {
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	388 let p1 = repo.dirstate_parents()?.p1;
52343 393ad2685fb4 rust: make RevlogError AmbiguousPrefix case contain the actual prefix Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 52342 diff changeset	389 let manifest = repo.manifest_for_node(p1)?;
49517 52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49516 diff changeset	390 let working_directory_vfs = repo.working_directory_vfs();
52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49516 diff changeset	391 let store_vfs = repo.store_vfs();
52278 51a350a22d0c branching: merge stable into default Rapha?l Gom?s <rgomes@octobus.net> parents: 52178 52269 diff changeset	392 let filelog_open_options = default_revlog_options(
52156 039b7caeb4d9 rust-revlog: introduce an `options` module Rapha?l Gom?s <rgomes@octobus.net> parents: 52033 diff changeset	393 repo.config(),
039b7caeb4d9 rust-revlog: introduce an `options` module Rapha?l Gom?s <rgomes@octobus.net> parents: 52033 diff changeset	394 repo.requirements(),
52278 51a350a22d0c branching: merge stable into default Rapha?l Gom?s <rgomes@octobus.net> parents: 52178 52269 diff changeset	395 RevlogType::Filelog,
52156 039b7caeb4d9 rust-revlog: introduce an `options` module Rapha?l Gom?s <rgomes@octobus.net> parents: 52033 diff changeset	396 )?;
51150 976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	397 let res: Vec<_> = take(&mut ds_status.unsure)
49517 52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49516 diff changeset	398 .into_par_iter()
52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49516 diff changeset	399 .map(\|to_check\| {
50226 8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	400 // The compiler seems to get a bit confused with complex
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	401 // inference when using a parallel iterator + map
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	402 // + map_err + collect, so let's just inline some of the
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	403 // logic.
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	404 match unsure_is_modified(
51864 db7dbe6f7bb2 rust: add Vfs trait Rapha?l Gom?s <rgomes@octobus.net> parents: 51863 diff changeset	405 &working_directory_vfs,
db7dbe6f7bb2 rust: add Vfs trait Rapha?l Gom?s <rgomes@octobus.net> parents: 51863 diff changeset	406 &store_vfs,
49894 678588b01af1 rhg: implement checkexec to support weird filesystems Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49640 diff changeset	407 check_exec,
49517 52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49516 diff changeset	408 &manifest,
52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49516 diff changeset	409 &to_check.path,
52269 fdecc547a75d rhg-status: rename a variable to be more explicit Rapha?l Gom?s <rgomes@octobus.net> parents: 52268 diff changeset	410 filelog_open_options,
50226 8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	411 ) {
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	412 Err(HgError::IoError { .. }) => {
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	413 // IO errors most likely stem from the file being
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	414 // deleted even though we know it's in the
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	415 // dirstate.
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	416 Ok((to_check, UnsureOutcome::Deleted))
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	417 }
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	418 Ok(outcome) => Ok((to_check, outcome)),
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	419 Err(e) => Err(e),
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	420 }
49517 52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49516 diff changeset	421 })
52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49516 diff changeset	422 .collect::<Result<_, _>>()?;
50226 8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	423 for (status_path, outcome) in res.into_iter() {
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	424 match outcome {
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	425 UnsureOutcome::Clean => {
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	426 if display_states.clean {
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	427 ds_status.clean.push(status_path.clone());
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	428 }
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	429 fixup.push(status_path.path.into_owned())
49000 dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	430 }
50226 8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	431 UnsureOutcome::Modified => {
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	432 if display_states.modified {
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	433 ds_status.modified.push(status_path);
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	434 }
49000 dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	435 }
50226 8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	436 UnsureOutcome::Deleted => {
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	437 if display_states.deleted {
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	438 ds_status.deleted.push(status_path);
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	439 }
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	440 }
47321 62225f9da938 rhg: Sort `rhg status` output correctly Simon Sapin <simon.sapin@octobus.net> parents: 47110 diff changeset	441 }
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	442 }
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	443 }
50760 f8412da86d05 rust-config: add support for default config items Rapha?l Gom?s <rgomes@octobus.net> parents: 50460 diff changeset	444
49000 dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	445 let dirstate_write_needed = ds_status.dirty;
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	446 let filesystem_time_at_status_start =
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	447 ds_status.filesystem_time_at_status_start;
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	448
51150 976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	449 output.output(display_states, ds_status)?;
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	450
49000 dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	451 Ok((
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	452 fixup,
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	453 dirstate_write_needed,
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	454 filesystem_time_at_status_start,
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	455 ))
48452 2afaa0145584 rhg: refactor display_status_paths with a struct for common arguments Simon Sapin <simon.sapin@octobus.net> parents: 48451 diff changeset	456 };
52395 136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	457
49489 7c93e38a0bbd rhg-status: add support for narrow clones Rapha?l Gom?s <rgomes@octobus.net> parents: 49485 diff changeset	458 let (narrow_matcher, narrow_warnings) = narrow::matcher(repo)?;
52395 136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	459 let (sparse_matcher, sparse_warnings) = sparse::matcher(repo)?;
136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	460 let matcher = match (repo.has_narrow(), repo.has_sparse()) {
136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	461 (true, true) => {
136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	462 Box::new(IntersectionMatcher::new(narrow_matcher, sparse_matcher))
136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	463 }
136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	464 (true, false) => narrow_matcher,
136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	465 (false, true) => sparse_matcher,
136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	466 (false, false) => Box::new(AlwaysMatcher),
136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	467 };
136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	468 let matcher = match args.get_many::<std::ffi::OsString>("file") {
136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	469 None => matcher,
136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	470 Some(files) => {
136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	471 let patterns: Vec<Vec<u8>> = files
136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	472 .filter(\|s\| !s.is_empty())
136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	473 .map(get_bytes_from_os_str)
136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	474 .collect();
136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	475 for file in &patterns {
136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	476 if file.starts_with(b"set:") {
136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	477 return Err(CommandError::unsupported("fileset"));
136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	478 }
136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	479 }
136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	480 let cwd = hg::utils::current_dir()?;
136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	481 let root = repo.working_directory_path();
136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	482 let ignore_patterns = parse_pattern_args(patterns, &cwd, root)?;
136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	483 let files_matcher =
136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	484 hg::matchers::PatternMatcher::new(ignore_patterns)?;
136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	485 Box::new(IntersectionMatcher::new(
136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	486 Box::new(files_matcher),
136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	487 matcher,
136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	488 ))
136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	489 }
136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	490 };
136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	491 print_narrow_sparse_warnings(
136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	492 &narrow_warnings,
136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	493 &sparse_warnings,
136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	494 ui,
136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	495 repo,
136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	496 )?;
51152 ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	497
51268 eab5b061cd48 rust-clippy: simplify `match` to `if let` Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	498 if let Some((rev1, rev2)) = revpair {
eab5b061cd48 rust-clippy: simplify `match` to `if let` Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	499 let mut ds_status = DirstateStatus::default();
eab5b061cd48 rust-clippy: simplify `match` to `if let` Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	500 if list_copies {
eab5b061cd48 rust-clippy: simplify `match` to `if let` Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	501 return Err(CommandError::unsupported(
eab5b061cd48 rust-clippy: simplify `match` to `if let` Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	502 "status --rev --rev with copy information is not implemented yet",
eab5b061cd48 rust-clippy: simplify `match` to `if let` Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	503 ));
eab5b061cd48 rust-clippy: simplify `match` to `if let` Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	504 }
51152 ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	505
51268 eab5b061cd48 rust-clippy: simplify `match` to `if let` Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	506 let stat = hg::operations::status_rev_rev_no_copies(
52395 136e74c2bf8f rhg: fix bug with matchers in rhg status --rev --rev Mitchell Kember <mkember@janestreet.com> parents: 52343 diff changeset	507 repo, rev1, rev2, matcher,
51268 eab5b061cd48 rust-clippy: simplify `match` to `if let` Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	508 )?;
eab5b061cd48 rust-clippy: simplify `match` to `if let` Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	509 for entry in stat.iter() {
eab5b061cd48 rust-clippy: simplify `match` to `if let` Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	510 let (path, status) = entry?;
eab5b061cd48 rust-clippy: simplify `match` to `if let` Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	511 let path = StatusPath {
eab5b061cd48 rust-clippy: simplify `match` to `if let` Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	512 path: Cow::Borrowed(path),
eab5b061cd48 rust-clippy: simplify `match` to `if let` Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	513 copy_source: None,
eab5b061cd48 rust-clippy: simplify `match` to `if let` Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	514 };
eab5b061cd48 rust-clippy: simplify `match` to `if let` Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	515 match status {
eab5b061cd48 rust-clippy: simplify `match` to `if let` Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	516 hg::operations::DiffStatus::Removed => {
eab5b061cd48 rust-clippy: simplify `match` to `if let` Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	517 if display_states.removed {
eab5b061cd48 rust-clippy: simplify `match` to `if let` Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	518 ds_status.removed.push(path)
51152 ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	519 }
51268 eab5b061cd48 rust-clippy: simplify `match` to `if let` Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	520 }
eab5b061cd48 rust-clippy: simplify `match` to `if let` Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	521 hg::operations::DiffStatus::Added => {
eab5b061cd48 rust-clippy: simplify `match` to `if let` Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	522 if display_states.added {
eab5b061cd48 rust-clippy: simplify `match` to `if let` Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	523 ds_status.added.push(path)
51152 ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	524 }
51268 eab5b061cd48 rust-clippy: simplify `match` to `if let` Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	525 }
eab5b061cd48 rust-clippy: simplify `match` to `if let` Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	526 hg::operations::DiffStatus::Modified => {
eab5b061cd48 rust-clippy: simplify `match` to `if let` Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	527 if display_states.modified {
eab5b061cd48 rust-clippy: simplify `match` to `if let` Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	528 ds_status.modified.push(path)
51152 ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	529 }
51268 eab5b061cd48 rust-clippy: simplify `match` to `if let` Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	530 }
eab5b061cd48 rust-clippy: simplify `match` to `if let` Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	531 hg::operations::DiffStatus::Matching => {
eab5b061cd48 rust-clippy: simplify `match` to `if let` Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	532 if display_states.clean {
eab5b061cd48 rust-clippy: simplify `match` to `if let` Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	533 ds_status.clean.push(path)
51152 ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	534 }
ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	535 }
ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	536 }
ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	537 }
51268 eab5b061cd48 rust-clippy: simplify `match` to `if let` Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	538 output.output(display_states, ds_status)?;
eab5b061cd48 rust-clippy: simplify `match` to `if let` Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	539 return Ok(());
51152 ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	540 }
ac3859a8b796 rhg: support rhg status --rev --rev Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51150 diff changeset	541
49000 dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	542 let (fixup, mut dirstate_write_needed, filesystem_time_at_status_start) =
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	543 dmap.with_status(
49485 ffd4b1f1c9cb rhg: add sparse support Rapha?l Gom?s <rgomes@octobus.net> parents: 49483 diff changeset	544 matcher.as_ref(),
49000 dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	545 repo.working_directory_path().to_owned(),
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	546 ignore_files(repo, config),
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	547 options,
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	548 after_status,
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	549 )?;
48422 000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	550
50215 ae61851e6fe2 dirstate: add a way to test races happening during status Rapha?l Gom?s <rgomes@octobus.net>, Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50178 diff changeset	551 // Development config option to test write races
ae61851e6fe2 dirstate: add a way to test races happening during status Rapha?l Gom?s <rgomes@octobus.net>, Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50178 diff changeset	552 if let Err(e) =
50252 a6b8b1ab9116 branching: merge stable into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50094 50226 diff changeset	553 debug_wait_for_file(config, "status.pre-dirstate-write-file")
50215 ae61851e6fe2 dirstate: add a way to test races happening during status Rapha?l Gom?s <rgomes@octobus.net>, Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50178 diff changeset	554 {
ae61851e6fe2 dirstate: add a way to test races happening during status Rapha?l Gom?s <rgomes@octobus.net>, Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50178 diff changeset	555 ui.write_stderr(e.as_bytes()).ok();
ae61851e6fe2 dirstate: add a way to test races happening during status Rapha?l Gom?s <rgomes@octobus.net>, Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50178 diff changeset	556 }
ae61851e6fe2 dirstate: add a way to test races happening during status Rapha?l Gom?s <rgomes@octobus.net>, Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50178 diff changeset	557
48422 000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	558 if (fixup.is_empty() \|\| filesystem_time_at_status_start.is_none())
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	559 && !dirstate_write_needed
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	560 {
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	561 // Nothing to update
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	562 return Ok(());
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	563 }
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	564
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	565 // Update the dirstate on disk if we can
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	566 let with_lock_result =
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	567 repo.try_with_wlock_no_wait(\|\| -> Result<(), CommandError> {
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	568 if let Some(mtime_boundary) = filesystem_time_at_status_start {
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	569 for hg_path in fixup {
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	570 use std::os::unix::fs::MetadataExt;
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	571 let fs_path = hg_path_to_path_buf(&hg_path)
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	572 .expect("HgPath conversion");
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	573 // Specifically do not reuse `fs_metadata` from
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	574 // `unsure_is_clean` which was needed before reading
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	575 // contents. Here we access metadata again after reading
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	576 // content, in case it changed in the meantime.
50225 53ca3e3bc013 rhg: fix race when a fixup file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50215 diff changeset	577 let metadata_res = repo
48422 000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	578 .working_directory_vfs()
50225 53ca3e3bc013 rhg: fix race when a fixup file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50215 diff changeset	579 .symlink_metadata(&fs_path);
53ca3e3bc013 rhg: fix race when a fixup file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50215 diff changeset	580 let fs_metadata = match metadata_res {
53ca3e3bc013 rhg: fix race when a fixup file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50215 diff changeset	581 Ok(meta) => meta,
53ca3e3bc013 rhg: fix race when a fixup file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50215 diff changeset	582 Err(err) => match err {
53ca3e3bc013 rhg: fix race when a fixup file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50215 diff changeset	583 HgError::IoError { .. } => {
53ca3e3bc013 rhg: fix race when a fixup file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50215 diff changeset	584 // The file has probably been deleted. In any
53ca3e3bc013 rhg: fix race when a fixup file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50215 diff changeset	585 // case, it was in the dirstate before, so
53ca3e3bc013 rhg: fix race when a fixup file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50215 diff changeset	586 // let's ignore the error.
53ca3e3bc013 rhg: fix race when a fixup file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50215 diff changeset	587 continue;
53ca3e3bc013 rhg: fix race when a fixup file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50215 diff changeset	588 }
53ca3e3bc013 rhg: fix race when a fixup file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50215 diff changeset	589 _ => return Err(err.into()),
53ca3e3bc013 rhg: fix race when a fixup file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50215 diff changeset	590 },
53ca3e3bc013 rhg: fix race when a fixup file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50215 diff changeset	591 };
48443 112184713852 rhg: Set second_ambiguous as needed in post-status fixup Simon Sapin <simon.sapin@octobus.net> parents: 48422 diff changeset	592 if let Some(mtime) =
112184713852 rhg: Set second_ambiguous as needed in post-status fixup Simon Sapin <simon.sapin@octobus.net> parents: 48422 diff changeset	593 TruncatedTimestamp::for_reliable_mtime_of(
112184713852 rhg: Set second_ambiguous as needed in post-status fixup Simon Sapin <simon.sapin@octobus.net> parents: 48422 diff changeset	594 &fs_metadata,
112184713852 rhg: Set second_ambiguous as needed in post-status fixup Simon Sapin <simon.sapin@octobus.net> parents: 48422 diff changeset	595 &mtime_boundary,
112184713852 rhg: Set second_ambiguous as needed in post-status fixup Simon Sapin <simon.sapin@octobus.net> parents: 48422 diff changeset	596 )
112184713852 rhg: Set second_ambiguous as needed in post-status fixup Simon Sapin <simon.sapin@octobus.net> parents: 48422 diff changeset	597 .when_reading_file(&fs_path)?
112184713852 rhg: Set second_ambiguous as needed in post-status fixup Simon Sapin <simon.sapin@octobus.net> parents: 48422 diff changeset	598 {
48422 000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	599 let mode = fs_metadata.mode();
49110 4d3f6767319f rhg: use the new `set_clean` API Rapha?l Gom?s <rgomes@octobus.net> parents: 49000 diff changeset	600 let size = fs_metadata.len();
4d3f6767319f rhg: use the new `set_clean` API Rapha?l Gom?s <rgomes@octobus.net> parents: 49000 diff changeset	601 dmap.set_clean(&hg_path, mode, size as u32, mtime)?;
48422 000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	602 dirstate_write_needed = true
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	603 }
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	604 }
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	605 }
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	606 drop(dmap); // Avoid "already mutably borrowed" RefCell panics
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	607 if dirstate_write_needed {
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	608 repo.write_dirstate()?
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	609 }
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	610 Ok(())
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	611 });
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	612 match with_lock_result {
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	613 Ok(closure_result) => closure_result?,
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	614 Err(LockError::AlreadyHeld) => {
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	615 // Not updating the dirstate is not ideal but not critical:
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	616 // don’t keep our caller waiting until some other Mercurial
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	617 // process releases the lock.
50178 baa4e2c93642 rust: add debug log about skipping dirstate update Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	618 log::info!("not writing dirstate from `status`: lock is held")
48422 000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	619 }
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	620 Err(LockError::Other(HgError::IoError { error, .. }))
51755 955084b4f74f rhg: ignore readonly FS error when saving dirstate Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51747 diff changeset	621 if error.kind() == io::ErrorKind::PermissionDenied
955084b4f74f rhg: ignore readonly FS error when saving dirstate Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51747 diff changeset	622 \|\| match error.raw_os_error() {
955084b4f74f rhg: ignore readonly FS error when saving dirstate Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51747 diff changeset	623 None => false,
955084b4f74f rhg: ignore readonly FS error when saving dirstate Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51747 diff changeset	624 Some(errno) => libc::EROFS == errno,
955084b4f74f rhg: ignore readonly FS error when saving dirstate Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51747 diff changeset	625 } =>
48422 000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	626 {
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	627 // `hg status` on a read-only repository is fine
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	628 }
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	629 Err(LockError::Other(error)) => {
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	630 // Report other I/O errors
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	631 Err(error)?
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	632 }
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	633 }
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	634 Ok(())
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	635 }
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	636
48451 4a983b69e519 rhg: Add support for ui.ignore and ui.ignore.* config Simon Sapin <simon.sapin@octobus.net> parents: 48443 diff changeset	637 fn ignore_files(repo: &Repo, config: &Config) -> Vec<PathBuf> {
4a983b69e519 rhg: Add support for ui.ignore and ui.ignore.* config Simon Sapin <simon.sapin@octobus.net> parents: 48443 diff changeset	638 let mut ignore_files = Vec::new();
4a983b69e519 rhg: Add support for ui.ignore and ui.ignore.* config Simon Sapin <simon.sapin@octobus.net> parents: 48443 diff changeset	639 let repo_ignore = repo.working_directory_vfs().join(".hgignore");
4a983b69e519 rhg: Add support for ui.ignore and ui.ignore.* config Simon Sapin <simon.sapin@octobus.net> parents: 48443 diff changeset	640 if repo_ignore.exists() {
4a983b69e519 rhg: Add support for ui.ignore and ui.ignore.* config Simon Sapin <simon.sapin@octobus.net> parents: 48443 diff changeset	641 ignore_files.push(repo_ignore)
4a983b69e519 rhg: Add support for ui.ignore and ui.ignore.* config Simon Sapin <simon.sapin@octobus.net> parents: 48443 diff changeset	642 }
4a983b69e519 rhg: Add support for ui.ignore and ui.ignore.* config Simon Sapin <simon.sapin@octobus.net> parents: 48443 diff changeset	643 for (key, value) in config.iter_section(b"ui") {
4a983b69e519 rhg: Add support for ui.ignore and ui.ignore.* config Simon Sapin <simon.sapin@octobus.net> parents: 48443 diff changeset	644 if key == b"ignore" \|\| key.starts_with(b"ignore.") {
4a983b69e519 rhg: Add support for ui.ignore and ui.ignore.* config Simon Sapin <simon.sapin@octobus.net> parents: 48443 diff changeset	645 let path = get_path_from_bytes(value);
51747 48fd4d23c867 rhg: expand user and environment variables in ignore includes Rapha?l Gom?s <rgomes@octobus.net> parents: 51268 diff changeset	646 let path = shellexpand::path::full_with_context_no_errors(
48fd4d23c867 rhg: expand user and environment variables in ignore includes Rapha?l Gom?s <rgomes@octobus.net> parents: 51268 diff changeset	647 path,
48fd4d23c867 rhg: expand user and environment variables in ignore includes Rapha?l Gom?s <rgomes@octobus.net> parents: 51268 diff changeset	648 home::home_dir,
48fd4d23c867 rhg: expand user and environment variables in ignore includes Rapha?l Gom?s <rgomes@octobus.net> parents: 51268 diff changeset	649 \|s\| std::env::var(s).ok(),
48fd4d23c867 rhg: expand user and environment variables in ignore includes Rapha?l Gom?s <rgomes@octobus.net> parents: 51268 diff changeset	650 );
48451 4a983b69e519 rhg: Add support for ui.ignore and ui.ignore.* config Simon Sapin <simon.sapin@octobus.net> parents: 48443 diff changeset	651 let joined = repo.working_directory_path().join(path);
4a983b69e519 rhg: Add support for ui.ignore and ui.ignore.* config Simon Sapin <simon.sapin@octobus.net> parents: 48443 diff changeset	652 ignore_files.push(joined);
4a983b69e519 rhg: Add support for ui.ignore and ui.ignore.* config Simon Sapin <simon.sapin@octobus.net> parents: 48443 diff changeset	653 }
4a983b69e519 rhg: Add support for ui.ignore and ui.ignore.* config Simon Sapin <simon.sapin@octobus.net> parents: 48443 diff changeset	654 }
4a983b69e519 rhg: Add support for ui.ignore and ui.ignore.* config Simon Sapin <simon.sapin@octobus.net> parents: 48443 diff changeset	655 ignore_files
4a983b69e519 rhg: Add support for ui.ignore and ui.ignore.* config Simon Sapin <simon.sapin@octobus.net> parents: 48443 diff changeset	656 }
4a983b69e519 rhg: Add support for ui.ignore and ui.ignore.* config Simon Sapin <simon.sapin@octobus.net> parents: 48443 diff changeset	657
48452 2afaa0145584 rhg: refactor display_status_paths with a struct for common arguments Simon Sapin <simon.sapin@octobus.net> parents: 48451 diff changeset	658 struct DisplayStatusPaths<'a> {
2afaa0145584 rhg: refactor display_status_paths with a struct for common arguments Simon Sapin <simon.sapin@octobus.net> parents: 48451 diff changeset	659 ui: &'a Ui,
48349 c12ed33558cb rhg: Add support for `rhg status -n` Simon Sapin <simon.sapin@octobus.net> parents: 48345 diff changeset	660 no_status: bool,
48453 9b0e1f64656f rhg: refactor relativize_path into a struct + method Simon Sapin <simon.sapin@octobus.net> parents: 48452 diff changeset	661 relativize: Option<RelativizePaths>,
50424 98fc949bec14 rhg: support `status --print0` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50252 diff changeset	662 print0: bool,
48452 2afaa0145584 rhg: refactor display_status_paths with a struct for common arguments Simon Sapin <simon.sapin@octobus.net> parents: 48451 diff changeset	663 }
2afaa0145584 rhg: refactor display_status_paths with a struct for common arguments Simon Sapin <simon.sapin@octobus.net> parents: 48451 diff changeset	664
2afaa0145584 rhg: refactor display_status_paths with a struct for common arguments Simon Sapin <simon.sapin@octobus.net> parents: 48451 diff changeset	665 impl DisplayStatusPaths<'_> {
2afaa0145584 rhg: refactor display_status_paths with a struct for common arguments Simon Sapin <simon.sapin@octobus.net> parents: 48451 diff changeset	666 // Probably more elegant to use a Deref or Borrow trait rather than
2afaa0145584 rhg: refactor display_status_paths with a struct for common arguments Simon Sapin <simon.sapin@octobus.net> parents: 48451 diff changeset	667 // harcode HgPathBuf, but probably not really useful at this point
2afaa0145584 rhg: refactor display_status_paths with a struct for common arguments Simon Sapin <simon.sapin@octobus.net> parents: 48451 diff changeset	668 fn display(
2afaa0145584 rhg: refactor display_status_paths with a struct for common arguments Simon Sapin <simon.sapin@octobus.net> parents: 48451 diff changeset	669 &self,
2afaa0145584 rhg: refactor display_status_paths with a struct for common arguments Simon Sapin <simon.sapin@octobus.net> parents: 48451 diff changeset	670 status_prefix: &[u8],
48734 3e2b4bb286e7 rhg: Colorize `rhg status` output when appropriate Simon Sapin <simon.sapin@octobus.net> parents: 48729 diff changeset	671 label: &'static str,
48454 473af5cbc209 rhg: Add support for `rhg status --copies` Simon Sapin <simon.sapin@octobus.net> parents: 48453 diff changeset	672 mut paths: Vec<StatusPath<'_>>,
48452 2afaa0145584 rhg: refactor display_status_paths with a struct for common arguments Simon Sapin <simon.sapin@octobus.net> parents: 48451 diff changeset	673 ) -> Result<(), CommandError> {
2afaa0145584 rhg: refactor display_status_paths with a struct for common arguments Simon Sapin <simon.sapin@octobus.net> parents: 48451 diff changeset	674 paths.sort_unstable();
48738 00efd2d5037d rust: fix code formatting Simon Sapin <simon.sapin@octobus.net> parents: 48735 diff changeset	675 // TODO: get the stdout lock once for the whole loop
00efd2d5037d rust: fix code formatting Simon Sapin <simon.sapin@octobus.net> parents: 48735 diff changeset	676 // instead of in each write
48454 473af5cbc209 rhg: Add support for `rhg status --copies` Simon Sapin <simon.sapin@octobus.net> parents: 48453 diff changeset	677 for StatusPath { path, copy_source } in paths {
50362 51041a1a4c59 rhg: correctly relativize copy source path Arun Kulshreshtha <akulshreshtha@janestreet.com> parents: 50361 diff changeset	678 let relative_path;
51041a1a4c59 rhg: correctly relativize copy source path Arun Kulshreshtha <akulshreshtha@janestreet.com> parents: 50361 diff changeset	679 let relative_source;
51041a1a4c59 rhg: correctly relativize copy source path Arun Kulshreshtha <akulshreshtha@janestreet.com> parents: 50361 diff changeset	680 let (path, copy_source) = if let Some(relativize) =
51041a1a4c59 rhg: correctly relativize copy source path Arun Kulshreshtha <akulshreshtha@janestreet.com> parents: 50361 diff changeset	681 &self.relativize
51041a1a4c59 rhg: correctly relativize copy source path Arun Kulshreshtha <akulshreshtha@janestreet.com> parents: 50361 diff changeset	682 {
51041a1a4c59 rhg: correctly relativize copy source path Arun Kulshreshtha <akulshreshtha@janestreet.com> parents: 50361 diff changeset	683 relative_path = relativize.relativize(&path);
51041a1a4c59 rhg: correctly relativize copy source path Arun Kulshreshtha <akulshreshtha@janestreet.com> parents: 50361 diff changeset	684 relative_source =
51041a1a4c59 rhg: correctly relativize copy source path Arun Kulshreshtha <akulshreshtha@janestreet.com> parents: 50361 diff changeset	685 copy_source.as_ref().map(\|s\| relativize.relativize(s));
51041a1a4c59 rhg: correctly relativize copy source path Arun Kulshreshtha <akulshreshtha@janestreet.com> parents: 50361 diff changeset	686 (&*relative_path, relative_source.as_deref())
48453 9b0e1f64656f rhg: refactor relativize_path into a struct + method Simon Sapin <simon.sapin@octobus.net> parents: 48452 diff changeset	687 } else {
50362 51041a1a4c59 rhg: correctly relativize copy source path Arun Kulshreshtha <akulshreshtha@janestreet.com> parents: 50361 diff changeset	688 (path.as_bytes(), copy_source.as_ref().map(\|s\| s.as_bytes()))
48453 9b0e1f64656f rhg: refactor relativize_path into a struct + method Simon Sapin <simon.sapin@octobus.net> parents: 48452 diff changeset	689 };
48734 3e2b4bb286e7 rhg: Colorize `rhg status` output when appropriate Simon Sapin <simon.sapin@octobus.net> parents: 48729 diff changeset	690 // TODO: Add a way to use `write_bytes!` instead of `format_bytes!`
3e2b4bb286e7 rhg: Colorize `rhg status` output when appropriate Simon Sapin <simon.sapin@octobus.net> parents: 48729 diff changeset	691 // in order to stream to stdout instead of allocating an
3e2b4bb286e7 rhg: Colorize `rhg status` output when appropriate Simon Sapin <simon.sapin@octobus.net> parents: 48729 diff changeset	692 // itermediate `Vec<u8>`.
3e2b4bb286e7 rhg: Colorize `rhg status` output when appropriate Simon Sapin <simon.sapin@octobus.net> parents: 48729 diff changeset	693 if !self.no_status {
3e2b4bb286e7 rhg: Colorize `rhg status` output when appropriate Simon Sapin <simon.sapin@octobus.net> parents: 48729 diff changeset	694 self.ui.write_stdout_labelled(status_prefix, label)?
48452 2afaa0145584 rhg: refactor display_status_paths with a struct for common arguments Simon Sapin <simon.sapin@octobus.net> parents: 48451 diff changeset	695 }
50424 98fc949bec14 rhg: support `status --print0` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50252 diff changeset	696 let linebreak = if self.print0 { b"\x00" } else { b"\n" };
98fc949bec14 rhg: support `status --print0` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50252 diff changeset	697 self.ui.write_stdout_labelled(
98fc949bec14 rhg: support `status --print0` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50252 diff changeset	698 &format_bytes!(b"{}{}", path, linebreak),
98fc949bec14 rhg: support `status --print0` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50252 diff changeset	699 label,
98fc949bec14 rhg: support `status --print0` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50252 diff changeset	700 )?;
52342 53dc147bc8b0 rhg: avoid calculating copies for status --no-status Mitchell Kember <mkember@janestreet.com> parents: 52341 diff changeset	701 if let Some(source) = copy_source {
48734 3e2b4bb286e7 rhg: Colorize `rhg status` output when appropriate Simon Sapin <simon.sapin@octobus.net> parents: 48729 diff changeset	702 let label = "status.copied";
3e2b4bb286e7 rhg: Colorize `rhg status` output when appropriate Simon Sapin <simon.sapin@octobus.net> parents: 48729 diff changeset	703 self.ui.write_stdout_labelled(
50460 f57f5ab0e220 branching: merge stable into default Rapha?l Gom?s <rgomes@octobus.net> parents: 50424 50362 diff changeset	704 &format_bytes!(b" {}{}", source, linebreak),
48734 3e2b4bb286e7 rhg: Colorize `rhg status` output when appropriate Simon Sapin <simon.sapin@octobus.net> parents: 48729 diff changeset	705 label,
3e2b4bb286e7 rhg: Colorize `rhg status` output when appropriate Simon Sapin <simon.sapin@octobus.net> parents: 48729 diff changeset	706 )?
48454 473af5cbc209 rhg: Add support for `rhg status --copies` Simon Sapin <simon.sapin@octobus.net> parents: 48453 diff changeset	707 }
48349 c12ed33558cb rhg: Add support for `rhg status -n` Simon Sapin <simon.sapin@octobus.net> parents: 48345 diff changeset	708 }
48452 2afaa0145584 rhg: refactor display_status_paths with a struct for common arguments Simon Sapin <simon.sapin@octobus.net> parents: 48451 diff changeset	709 Ok(())
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	710 }
51150 976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	711
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	712 fn output(
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	713 &mut self,
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	714 display_states: DisplayStates,
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	715 ds_status: DirstateStatus,
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	716 ) -> Result<(), CommandError> {
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	717 if display_states.modified {
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	718 self.display(b"M ", "status.modified", ds_status.modified)?;
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	719 }
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	720 if display_states.added {
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	721 self.display(b"A ", "status.added", ds_status.added)?;
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	722 }
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	723 if display_states.removed {
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	724 self.display(b"R ", "status.removed", ds_status.removed)?;
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	725 }
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	726 if display_states.deleted {
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	727 self.display(b"! ", "status.deleted", ds_status.deleted)?;
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	728 }
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	729 if display_states.unknown {
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	730 self.display(b"? ", "status.unknown", ds_status.unknown)?;
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	731 }
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	732 if display_states.ignored {
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	733 self.display(b"I ", "status.ignored", ds_status.ignored)?;
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	734 }
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	735 if display_states.clean {
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	736 self.display(b"C ", "status.clean", ds_status.clean)?;
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	737 }
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	738 Ok(())
976403c95ba3 rhg: refactor hg status, make the display code usable for non-dirstate status Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 50863 diff changeset	739 }
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	740 }
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	741
50226 8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	742 /// Outcome of the additional check for an ambiguous tracked file
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	743 enum UnsureOutcome {
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	744 /// The file is actually clean
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	745 Clean,
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	746 /// The file has been modified
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	747 Modified,
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	748 /// The file was deleted on disk (or became another type of fs entry)
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	749 Deleted,
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	750 }
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	751
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	752 /// Check if a file is modified by comparing actual repo store and file system.
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	753 ///
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	754 /// This meant to be used for those that the dirstate cannot resolve, due
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	755 /// to time resolution limits.
48344 b6d8eea9872c rhg: Rename cat_file_is_modified Simon Sapin <simon.sapin@octobus.net> parents: 48343 diff changeset	756 fn unsure_is_modified(
51864 db7dbe6f7bb2 rust: add Vfs trait Rapha?l Gom?s <rgomes@octobus.net> parents: 51863 diff changeset	757 working_directory_vfs: &hg::vfs::VfsImpl,
db7dbe6f7bb2 rust: add Vfs trait Rapha?l Gom?s <rgomes@octobus.net> parents: 51863 diff changeset	758 store_vfs: &hg::vfs::VfsImpl,
49894 678588b01af1 rhg: implement checkexec to support weird filesystems Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49640 diff changeset	759 check_exec: bool,
47964 796206e74b10 rhg: Reuse manifest when checking status of multiple ambiguous files Simon Sapin <simon.sapin@octobus.net> parents: 47956 diff changeset	760 manifest: &Manifest,
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	761 hg_path: &HgPath,
51188 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51152 diff changeset	762 revlog_open_options: RevlogOpenOptions,
50226 8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	763 ) -> Result<UnsureOutcome, HgError> {
49517 52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49516 diff changeset	764 let vfs = working_directory_vfs;
48422 000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	765 let fs_path = hg_path_to_path_buf(hg_path).expect("HgPath conversion");
48345 d5a91701f7dc rhg: Fix status desambiguation of symlinks and executable files Simon Sapin <simon.sapin@octobus.net> parents: 48344 diff changeset	766 let fs_metadata = vfs.symlink_metadata(&fs_path)?;
d5a91701f7dc rhg: Fix status desambiguation of symlinks and executable files Simon Sapin <simon.sapin@octobus.net> parents: 48344 diff changeset	767 let is_symlink = fs_metadata.file_type().is_symlink();
49894 678588b01af1 rhg: implement checkexec to support weird filesystems Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49640 diff changeset	768
678588b01af1 rhg: implement checkexec to support weird filesystems Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49640 diff changeset	769 let entry = manifest
678588b01af1 rhg: implement checkexec to support weird filesystems Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49640 diff changeset	770 .find_by_path(hg_path)?
678588b01af1 rhg: implement checkexec to support weird filesystems Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49640 diff changeset	771 .expect("ambgious file not in p1");
678588b01af1 rhg: implement checkexec to support weird filesystems Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49640 diff changeset	772
48391 b80e5e75d51e dirstate: remove `lastnormaltime` mechanism Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48349 diff changeset	773 // TODO: Also account for `FALLBACK_SYMLINK` and `FALLBACK_EXEC` from the
b80e5e75d51e dirstate: remove `lastnormaltime` mechanism Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48349 diff changeset	774 // dirstate
48345 d5a91701f7dc rhg: Fix status desambiguation of symlinks and executable files Simon Sapin <simon.sapin@octobus.net> parents: 48344 diff changeset	775 let fs_flags = if is_symlink {
d5a91701f7dc rhg: Fix status desambiguation of symlinks and executable files Simon Sapin <simon.sapin@octobus.net> parents: 48344 diff changeset	776 Some(b'l')
49894 678588b01af1 rhg: implement checkexec to support weird filesystems Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49640 diff changeset	777 } else if check_exec && has_exec_bit(&fs_metadata) {
48345 d5a91701f7dc rhg: Fix status desambiguation of symlinks and executable files Simon Sapin <simon.sapin@octobus.net> parents: 48344 diff changeset	778 Some(b'x')
d5a91701f7dc rhg: Fix status desambiguation of symlinks and executable files Simon Sapin <simon.sapin@octobus.net> parents: 48344 diff changeset	779 } else {
d5a91701f7dc rhg: Fix status desambiguation of symlinks and executable files Simon Sapin <simon.sapin@octobus.net> parents: 48344 diff changeset	780 None
d5a91701f7dc rhg: Fix status desambiguation of symlinks and executable files Simon Sapin <simon.sapin@octobus.net> parents: 48344 diff changeset	781 };
d5a91701f7dc rhg: Fix status desambiguation of symlinks and executable files Simon Sapin <simon.sapin@octobus.net> parents: 48344 diff changeset	782
49894 678588b01af1 rhg: implement checkexec to support weird filesystems Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49640 diff changeset	783 let entry_flags = if check_exec {
678588b01af1 rhg: implement checkexec to support weird filesystems Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49640 diff changeset	784 entry.flags
52033 0ea323b7e3b1 rust-manifest: encode flags as `Option<NonZeroU8>` Rapha?l Gom?s <rgomes@octobus.net> parents: 51864 diff changeset	785 } else if entry.flags.map(\|f\| f.into()) == Some(b'x') {
49948 70b4c7af9cdb rust-clippy: fix warning about nested ifs Rapha?l Gom?s <rgomes@octobus.net> parents: 49914 diff changeset	786 None
49894 678588b01af1 rhg: implement checkexec to support weird filesystems Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49640 diff changeset	787 } else {
49948 70b4c7af9cdb rust-clippy: fix warning about nested ifs Rapha?l Gom?s <rgomes@octobus.net> parents: 49914 diff changeset	788 entry.flags
49894 678588b01af1 rhg: implement checkexec to support weird filesystems Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49640 diff changeset	789 };
678588b01af1 rhg: implement checkexec to support weird filesystems Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49640 diff changeset	790
52033 0ea323b7e3b1 rust-manifest: encode flags as `Option<NonZeroU8>` Rapha?l Gom?s <rgomes@octobus.net> parents: 51864 diff changeset	791 if entry_flags.map(\|f\| f.into()) != fs_flags {
50226 8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	792 return Ok(UnsureOutcome::Modified);
48345 d5a91701f7dc rhg: Fix status desambiguation of symlinks and executable files Simon Sapin <simon.sapin@octobus.net> parents: 48344 diff changeset	793 }
52178 bd8081e9fd62 rust: don't star export from the `revlog` module Rapha?l Gom?s <rgomes@octobus.net> parents: 52156 diff changeset	794 let filelog = hg::revlog::filelog::Filelog::open_vfs(
51864 db7dbe6f7bb2 rust: add Vfs trait Rapha?l Gom?s <rgomes@octobus.net> parents: 51863 diff changeset	795 store_vfs,
51188 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51152 diff changeset	796 hg_path,
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51152 diff changeset	797 revlog_open_options,
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51152 diff changeset	798 )?;
48471 b005d07ded7d rhg: Skip reading the contents of ambiguous files in some cases Simon Sapin <simon.sapin@octobus.net> parents: 48467 diff changeset	799 let fs_len = fs_metadata.len();
49374 455fce57e89e rust: don't swallow valuable error information Rapha?l Gom?s <rgomes@octobus.net> parents: 49110 diff changeset	800 let file_node = entry.node_id()?;
455fce57e89e rust: don't swallow valuable error information Rapha?l Gom?s <rgomes@octobus.net> parents: 49110 diff changeset	801 let filelog_entry = filelog.entry_for_node(file_node).map_err(\|_\| {
455fce57e89e rust: don't swallow valuable error information Rapha?l Gom?s <rgomes@octobus.net> parents: 49110 diff changeset	802 HgError::corrupted(format!(
50094 1cffc156f7cd rhg: nicer error message Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49981 diff changeset	803 "filelog {:?} missing node {:?} from manifest",
1cffc156f7cd rhg: nicer error message Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49981 diff changeset	804 hg_path, file_node
49374 455fce57e89e rust: don't swallow valuable error information Rapha?l Gom?s <rgomes@octobus.net> parents: 49110 diff changeset	805 ))
455fce57e89e rust: don't swallow valuable error information Rapha?l Gom?s <rgomes@octobus.net> parents: 49110 diff changeset	806 })?;
48546 e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48542 diff changeset	807 if filelog_entry.file_data_len_not_equal_to(fs_len) {
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48542 diff changeset	808 // No need to read file contents:
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48542 diff changeset	809 // it cannot be equal if it has a different length.
50226 8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	810 return Ok(UnsureOutcome::Modified);
48546 e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48542 diff changeset	811 }
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48542 diff changeset	812
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48542 diff changeset	813 let p1_filelog_data = filelog_entry.data()?;
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48542 diff changeset	814 let p1_contents = p1_filelog_data.file_data()?;
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48542 diff changeset	815 if p1_contents.len() as u64 != fs_len {
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48542 diff changeset	816 // No need to read file contents:
48471 b005d07ded7d rhg: Skip reading the contents of ambiguous files in some cases Simon Sapin <simon.sapin@octobus.net> parents: 48467 diff changeset	817 // it cannot be equal if it has a different length.
50226 8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	818 return Ok(UnsureOutcome::Modified);
48471 b005d07ded7d rhg: Skip reading the contents of ambiguous files in some cases Simon Sapin <simon.sapin@octobus.net> parents: 48467 diff changeset	819 }
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	820
48345 d5a91701f7dc rhg: Fix status desambiguation of symlinks and executable files Simon Sapin <simon.sapin@octobus.net> parents: 48344 diff changeset	821 let fs_contents = if is_symlink {
d5a91701f7dc rhg: Fix status desambiguation of symlinks and executable files Simon Sapin <simon.sapin@octobus.net> parents: 48344 diff changeset	822 get_bytes_from_os_string(vfs.read_link(fs_path)?.into_os_string())
d5a91701f7dc rhg: Fix status desambiguation of symlinks and executable files Simon Sapin <simon.sapin@octobus.net> parents: 48344 diff changeset	823 } else {
d5a91701f7dc rhg: Fix status desambiguation of symlinks and executable files Simon Sapin <simon.sapin@octobus.net> parents: 48344 diff changeset	824 vfs.read(fs_path)?
d5a91701f7dc rhg: Fix status desambiguation of symlinks and executable files Simon Sapin <simon.sapin@octobus.net> parents: 48344 diff changeset	825 };
50226 8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	826
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	827 Ok(if p1_contents != &*fs_contents {
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	828 UnsureOutcome::Modified
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	829 } else {
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	830 UnsureOutcome::Clean
8fcd5302243a rhg: fix race when an ambiguous file is deleted on disk Rapha?l Gom?s <rgomes@octobus.net> parents: 50225 diff changeset	831 })
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	832 }

Mercurial > public > mercurial-scm > hg

annotate rust/rhg/src/commands/status.rs @ 52395:136e74c2bf8f