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

annotate rust/rhg/src/commands/status.rs @ 49640:37bc3edef76f

rhg: upgrade `clap` dependency This one is the worst one to upgrade since v2 -> v4 broke a ton of API, which thankfully seems saner now. Contrary to what was done in the `hg-core/src/examples/nodemap` rewrite, we're not switching from the "builder" pattern to the "derive" pattern, since that would imply a much larger diff. It can be done incrementally.

author	Rapha?l Gom?s <rgomes@octobus.net>
date	Tue, 15 Nov 2022 00:02:43 +0100
parents	52464a20add0
children	678588b01af1

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;
48349 c12ed33558cb rhg: Add support for `rhg status -n` Simon Sapin <simon.sapin@octobus.net> parents: 48345 diff changeset	9 use crate::ui::Ui;
48453 9b0e1f64656f rhg: refactor relativize_path into a struct + method Simon Sapin <simon.sapin@octobus.net> parents: 48452 diff changeset	10 use crate::utils::path_utils::RelativizePaths;
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	11 use clap::Arg;
48349 c12ed33558cb rhg: Add support for `rhg status -n` Simon Sapin <simon.sapin@octobus.net> parents: 48345 diff changeset	12 use format_bytes::format_bytes;
48175 707c58880cd0 rhg: add relative paths support in `rhg status` Pulkit Goyal <7895pulkit@gmail.com> parents: 48171 diff changeset	13 use hg::config::Config;
48391 b80e5e75d51e dirstate: remove `lastnormaltime` mechanism Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48349 diff changeset	14 use hg::dirstate::has_exec_bit;
48454 473af5cbc209 rhg: Add support for `rhg status --copies` Simon Sapin <simon.sapin@octobus.net> parents: 48453 diff changeset	15 use hg::dirstate::status::StatusPath;
48422 000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	16 use hg::dirstate::TruncatedTimestamp;
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	17 use hg::errors::{HgError, IoResultExt};
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	18 use hg::lock::LockError;
47964 796206e74b10 rhg: Reuse manifest when checking status of multiple ambiguous files Simon Sapin <simon.sapin@octobus.net> parents: 47956 diff changeset	19 use hg::manifest::Manifest;
49489 7c93e38a0bbd rhg-status: add support for narrow clones Rapha?l Gom?s <rgomes@octobus.net> parents: 49485 diff changeset	20 use hg::matchers::{AlwaysMatcher, IntersectionMatcher};
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	21 use hg::repo::Repo;
48345 d5a91701f7dc rhg: Fix status desambiguation of symlinks and executable files Simon Sapin <simon.sapin@octobus.net> parents: 48344 diff changeset	22 use hg::utils::files::get_bytes_from_os_string;
48511 c9abfb80b4e3 rhg: Properly format warnings related to ignore patterns Simon Sapin <simon.sapin@octobus.net> parents: 48501 diff changeset	23 use hg::utils::files::get_bytes_from_path;
48451 4a983b69e519 rhg: Add support for ui.ignore and ui.ignore.* config Simon Sapin <simon.sapin@octobus.net> parents: 48443 diff changeset	24 use hg::utils::files::get_path_from_bytes;
48422 000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	25 use hg::utils::hg_path::{hg_path_to_path_buf, HgPath};
49000 dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	26 use hg::DirstateStatus;
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	27 use hg::PatternFileWarning;
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	28 use hg::StatusError;
48454 473af5cbc209 rhg: Add support for `rhg status --copies` Simon Sapin <simon.sapin@octobus.net> parents: 48453 diff changeset	29 use hg::StatusOptions;
49489 7c93e38a0bbd rhg-status: add support for narrow clones Rapha?l Gom?s <rgomes@octobus.net> parents: 49485 diff changeset	30 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	31 use log::info;
49517 52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49516 diff changeset	32 use rayon::prelude::*;
48422 000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	33 use std::io;
48451 4a983b69e519 rhg: Add support for ui.ignore and ui.ignore.* config Simon Sapin <simon.sapin@octobus.net> parents: 48443 diff changeset	34 use std::path::PathBuf;
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	35
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	36 pub const HELP_TEXT: &str = "
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	37 Show changed files in the working directory
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	38
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	39 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	40
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	41 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	42 ";
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	43
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	44 pub fn args() -> clap::Command {
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	45 clap::command!("status")
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	46 .alias("st")
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	47 .about(HELP_TEXT)
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	48 .arg(
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	49 Arg::new("all")
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	50 .help("show status of all files")
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	51 .short('A')
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	52 .action(clap::ArgAction::SetTrue)
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	53 .long("all"),
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	54 )
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	55 .arg(
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	56 Arg::new("modified")
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	57 .help("show only modified files")
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	58 .short('m')
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	59 .action(clap::ArgAction::SetTrue)
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	60 .long("modified"),
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	61 )
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	62 .arg(
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	63 Arg::new("added")
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	64 .help("show only added files")
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	65 .short('a')
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	66 .action(clap::ArgAction::SetTrue)
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	67 .long("added"),
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	68 )
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	69 .arg(
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	70 Arg::new("removed")
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	71 .help("show only removed files")
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	72 .short('r')
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	73 .action(clap::ArgAction::SetTrue)
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	74 .long("removed"),
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	75 )
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	76 .arg(
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	77 Arg::new("clean")
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	78 .help("show only clean files")
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	79 .short('c')
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	80 .action(clap::ArgAction::SetTrue)
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	81 .long("clean"),
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	82 )
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	83 .arg(
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	84 Arg::new("deleted")
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	85 .help("show only deleted files")
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	86 .short('d')
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	87 .action(clap::ArgAction::SetTrue)
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	88 .long("deleted"),
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	89 )
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	90 .arg(
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	91 Arg::new("unknown")
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	92 .help("show only unknown (not tracked) files")
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	93 .short('u')
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	94 .action(clap::ArgAction::SetTrue)
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	95 .long("unknown"),
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	96 )
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	97 .arg(
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	98 Arg::new("ignored")
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	99 .help("show only ignored files")
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	100 .short('i')
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	101 .action(clap::ArgAction::SetTrue)
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	102 .long("ignored"),
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	103 )
48349 c12ed33558cb rhg: Add support for `rhg status -n` Simon Sapin <simon.sapin@octobus.net> parents: 48345 diff changeset	104 .arg(
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	105 Arg::new("copies")
48454 473af5cbc209 rhg: Add support for `rhg status --copies` Simon Sapin <simon.sapin@octobus.net> parents: 48453 diff changeset	106 .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	107 .short('C')
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	108 .action(clap::ArgAction::SetTrue)
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	109 .long("copies"),
48454 473af5cbc209 rhg: Add support for `rhg status --copies` Simon Sapin <simon.sapin@octobus.net> parents: 48453 diff changeset	110 )
473af5cbc209 rhg: Add support for `rhg status --copies` Simon Sapin <simon.sapin@octobus.net> parents: 48453 diff changeset	111 .arg(
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	112 Arg::new("no-status")
48349 c12ed33558cb rhg: Add support for `rhg status -n` Simon Sapin <simon.sapin@octobus.net> parents: 48345 diff changeset	113 .help("hide status prefix")
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	114 .short('n')
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	115 .action(clap::ArgAction::SetTrue)
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	116 .long("no-status"),
48349 c12ed33558cb rhg: Add support for `rhg status -n` Simon Sapin <simon.sapin@octobus.net> parents: 48345 diff changeset	117 )
49439 b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	118 .arg(
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	119 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	120 .help("enable additional output")
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	121 .short('v')
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	122 .action(clap::ArgAction::SetTrue)
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	123 .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	124 )
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	125 }
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	126
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	127 /// 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	128 #[derive(Copy, Clone, Debug)]
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	129 pub struct DisplayStates {
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	130 pub modified: bool,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	131 pub added: bool,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	132 pub removed: bool,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	133 pub clean: bool,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	134 pub deleted: bool,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	135 pub unknown: bool,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	136 pub ignored: bool,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	137 }
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	138
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	139 pub const DEFAULT_DISPLAY_STATES: DisplayStates = DisplayStates {
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	140 modified: true,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	141 added: true,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	142 removed: true,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	143 clean: false,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	144 deleted: true,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	145 unknown: true,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	146 ignored: false,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	147 };
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	148
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	149 pub const ALL_DISPLAY_STATES: DisplayStates = DisplayStates {
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	150 modified: true,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	151 added: true,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	152 removed: true,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	153 clean: true,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	154 deleted: true,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	155 unknown: true,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	156 ignored: true,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	157 };
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	158
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	159 impl DisplayStates {
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	160 pub fn is_empty(&self) -> bool {
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	161 !(self.modified
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	162 \|\| self.added
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	163 \|\| self.removed
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	164 \|\| self.clean
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	165 \|\| self.deleted
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	166 \|\| self.unknown
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	167 \|\| self.ignored)
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	168 }
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	169 }
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	170
49439 b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	171 fn has_unfinished_merge(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	172 return Ok(repo.dirstate_parents()?.is_merge());
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	173 }
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	174
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	175 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	176 // 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	177 // [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	178 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	179 "bisect.state",
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	180 "graftstate",
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	181 "histedit-state",
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	182 "rebasestate",
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	183 "shelvedstate",
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	184 "transplant/journal",
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	185 "updatestate",
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	186 ];
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	187 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	188 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	189 };
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	190 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	191 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	192 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	193 }
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	194 }
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	195 return Ok(false);
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	196 }
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	197
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	198 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	199 // TODO: lift these limitations
48338 f9db8eeb3aec rhg: Config commands.status.terse is not supported Simon Sapin <simon.sapin@octobus.net> parents: 48337 diff changeset	200 if invocation
f9db8eeb3aec rhg: Config commands.status.terse is not supported Simon Sapin <simon.sapin@octobus.net> parents: 48337 diff changeset	201 .config
f9db8eeb3aec rhg: Config commands.status.terse is not supported Simon Sapin <simon.sapin@octobus.net> parents: 48337 diff changeset	202 .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	203 .is_some()
f9db8eeb3aec rhg: Config commands.status.terse is not supported Simon Sapin <simon.sapin@octobus.net> parents: 48337 diff changeset	204 {
f9db8eeb3aec rhg: Config commands.status.terse is not supported Simon Sapin <simon.sapin@octobus.net> parents: 48337 diff changeset	205 return Err(CommandError::unsupported(
f9db8eeb3aec rhg: Config commands.status.terse is not supported Simon Sapin <simon.sapin@octobus.net> parents: 48337 diff changeset	206 "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	207 ));
f9db8eeb3aec rhg: Config commands.status.terse is not supported Simon Sapin <simon.sapin@octobus.net> parents: 48337 diff changeset	208 }
48171 64b8676f11bb rhg: fallback if tweakdefaults or statuscopies is enabled with status Pulkit Goyal <7895pulkit@gmail.com> parents: 48069 diff changeset	209
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	210 let ui = invocation.ui;
48175 707c58880cd0 rhg: add relative paths support in `rhg status` Pulkit Goyal <7895pulkit@gmail.com> parents: 48171 diff changeset	211 let config = invocation.config;
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	212 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	213
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	214 // TODO add `!args.get_flag("print0") &&` when we support `print0`
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	215 let verbose = args.get_flag("verbose")
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	216 \|\| config.get_bool(b"ui", b"verbose")?
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	217 \|\| config.get_bool(b"commands", b"status.verbose")?;
48513 47f2a82ae3e4 rhg: Fall back to Python if verbose status is requested by config Simon Sapin <simon.sapin@octobus.net> parents: 48511 diff changeset	218
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	219 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	220 let display_states = if all {
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	221 // 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	222 // from `--all`
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	223 ALL_DISPLAY_STATES
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	224 } else {
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	225 let requested = DisplayStates {
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	226 modified: args.get_flag("modified"),
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	227 added: args.get_flag("added"),
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	228 removed: args.get_flag("removed"),
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	229 clean: args.get_flag("clean"),
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	230 deleted: args.get_flag("deleted"),
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	231 unknown: args.get_flag("unknown"),
37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	232 ignored: args.get_flag("ignored"),
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	233 };
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	234 if requested.is_empty() {
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	235 DEFAULT_DISPLAY_STATES
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	236 } else {
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	237 requested
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	238 }
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	239 };
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	240 let no_status = args.get_flag("no-status");
48454 473af5cbc209 rhg: Add support for `rhg status --copies` Simon Sapin <simon.sapin@octobus.net> parents: 48453 diff changeset	241 let list_copies = all
49640 37bc3edef76f rhg: upgrade `clap` dependency Rapha?l Gom?s <rgomes@octobus.net> parents: 49517 diff changeset	242 \|\| args.get_flag("copies")
48454 473af5cbc209 rhg: Add support for `rhg status --copies` Simon Sapin <simon.sapin@octobus.net> parents: 48453 diff changeset	243 \|\| config.get_bool(b"ui", b"statuscopies")?;
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	244
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	245 let repo = invocation.repo?;
48409 005ae1a343f8 rhg: add support for narrow clones and sparse checkouts Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 48391 diff changeset	246
49439 b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	247 if verbose {
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	248 if has_unfinished_state(repo)? {
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	249 return Err(CommandError::unsupported(
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	250 "verbose status output is not supported by rhg (and is needed because we're in an unfinished operation)",
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	251 ));
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 }
b07465adbcc8 rhg: make [rhg status -v] work when it needs no extra output Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49374 diff changeset	254
47956 81aedf1fc897 rust: Add Repo::dirstate_map and use it in `rhg status` Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	255 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	256
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	257 let options = StatusOptions {
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	258 // we're currently supporting file systems with exec flags only
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	259 // anyway
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	260 check_exec: true,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	261 list_clean: display_states.clean,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	262 list_unknown: display_states.unknown,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	263 list_ignored: display_states.ignored,
48454 473af5cbc209 rhg: Add support for `rhg status --copies` Simon Sapin <simon.sapin@octobus.net> parents: 48453 diff changeset	264 list_copies,
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	265 collect_traversed_dirs: false,
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	266 };
49000 dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	267
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	268 type StatusResult<'a> =
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	269 Result<(DirstateStatus<'a>, Vec<PatternFileWarning>), StatusError>;
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	270
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	271 let after_status = \|res: StatusResult\| -> Result<_, CommandError> {
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	272 let (mut ds_status, pattern_warnings) = res?;
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	273 for warning in pattern_warnings {
49483 b18e877ea304 rhg-status: extract a function for printing pattern file warnings Rapha?l Gom?s <rgomes@octobus.net> parents: 49439 diff changeset	274 ui.write_stderr(&print_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	275 }
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	276
49000 dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	277 for (path, error) in ds_status.bad {
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	278 let error = match error {
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	279 hg::BadMatch::OsError(code) => {
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	280 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	281 }
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	282 hg::BadMatch::BadType(ty) => {
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	283 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	284 }
49000 dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	285 };
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	286 ui.write_stderr(&format_bytes!(
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	287 b"{}: {}\n",
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	288 path.as_bytes(),
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	289 error.as_bytes()
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	290 ))?
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	291 }
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	292 if !ds_status.unsure.is_empty() {
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	293 info!(
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	294 "Files to be rechecked by retrieval from filelog: {:?}",
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	295 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	296 );
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	297 }
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	298 let mut fixup = Vec::new();
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	299 if !ds_status.unsure.is_empty()
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	300 && (display_states.modified \|\| display_states.clean)
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	301 {
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	302 let p1 = repo.dirstate_parents()?.p1;
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	303 let manifest = repo.manifest_for_node(p1).map_err(\|e\| {
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	304 CommandError::from((e, &*format!("{:x}", p1.short())))
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	305 })?;
49517 52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49516 diff changeset	306 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	307 let store_vfs = repo.store_vfs();
52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49516 diff changeset	308 let res: Vec<_> = ds_status
52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49516 diff changeset	309 .unsure
52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49516 diff changeset	310 .into_par_iter()
52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49516 diff changeset	311 .map(\|to_check\| {
52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49516 diff changeset	312 unsure_is_modified(
52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49516 diff changeset	313 working_directory_vfs,
52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49516 diff changeset	314 store_vfs,
52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49516 diff changeset	315 &manifest,
52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49516 diff changeset	316 &to_check.path,
52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49516 diff changeset	317 )
52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49516 diff changeset	318 .map(\|modified\| (to_check, modified))
52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49516 diff changeset	319 })
52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49516 diff changeset	320 .collect::<Result<_, _>>()?;
52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49516 diff changeset	321 for (status_path, is_modified) in res.into_iter() {
52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49516 diff changeset	322 if is_modified {
49000 dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	323 if display_states.modified {
49517 52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49516 diff changeset	324 ds_status.modified.push(status_path);
49000 dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	325 }
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	326 } else {
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	327 if display_states.clean {
49517 52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49516 diff changeset	328 ds_status.clean.push(status_path.clone());
49000 dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	329 }
49517 52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49516 diff changeset	330 fixup.push(status_path.path.into_owned())
47321 62225f9da938 rhg: Sort `rhg status` output correctly Simon Sapin <simon.sapin@octobus.net> parents: 47110 diff changeset	331 }
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	332 }
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	333 }
49512 6939d5ed20e0 rhg: central treatment of PLAIN and PLAINEXCEPT Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49489 diff changeset	334 let relative_paths = config
6939d5ed20e0 rhg: central treatment of PLAIN and PLAINEXCEPT Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49489 diff changeset	335 .get_option(b"commands", b"status.relative")?
6939d5ed20e0 rhg: central treatment of PLAIN and PLAINEXCEPT Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49489 diff changeset	336 .unwrap_or(config.get_bool(b"ui", b"relative-paths")?);
49000 dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	337 let output = DisplayStatusPaths {
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	338 ui,
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	339 no_status,
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	340 relativize: if relative_paths {
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	341 Some(RelativizePaths::new(repo)?)
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	342 } else {
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	343 None
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	344 },
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	345 };
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	346 if display_states.modified {
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	347 output.display(b"M ", "status.modified", ds_status.modified)?;
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	348 }
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	349 if display_states.added {
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	350 output.display(b"A ", "status.added", ds_status.added)?;
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	351 }
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	352 if display_states.removed {
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	353 output.display(b"R ", "status.removed", ds_status.removed)?;
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	354 }
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	355 if display_states.deleted {
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	356 output.display(b"! ", "status.deleted", ds_status.deleted)?;
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	357 }
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	358 if display_states.unknown {
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	359 output.display(b"? ", "status.unknown", ds_status.unknown)?;
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	360 }
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	361 if display_states.ignored {
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	362 output.display(b"I ", "status.ignored", ds_status.ignored)?;
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	363 }
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	364 if display_states.clean {
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	365 output.display(b"C ", "status.clean", ds_status.clean)?;
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	366 }
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	367
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	368 let dirstate_write_needed = ds_status.dirty;
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	369 let filesystem_time_at_status_start =
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	370 ds_status.filesystem_time_at_status_start;
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 Ok((
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	373 fixup,
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	374 dirstate_write_needed,
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	375 filesystem_time_at_status_start,
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	376 ))
48452 2afaa0145584 rhg: refactor display_status_paths with a struct for common arguments Simon Sapin <simon.sapin@octobus.net> parents: 48451 diff changeset	377 };
49489 7c93e38a0bbd rhg-status: add support for narrow clones Rapha?l Gom?s <rgomes@octobus.net> parents: 49485 diff changeset	378 let (narrow_matcher, narrow_warnings) = narrow::matcher(repo)?;
7c93e38a0bbd rhg-status: add support for narrow clones Rapha?l Gom?s <rgomes@octobus.net> parents: 49485 diff changeset	379 let (sparse_matcher, sparse_warnings) = sparse::matcher(repo)?;
7c93e38a0bbd rhg-status: add support for narrow clones Rapha?l Gom?s <rgomes@octobus.net> parents: 49485 diff changeset	380 let matcher = match (repo.has_narrow(), repo.has_sparse()) {
7c93e38a0bbd rhg-status: add support for narrow clones Rapha?l Gom?s <rgomes@octobus.net> parents: 49485 diff changeset	381 (true, true) => {
7c93e38a0bbd rhg-status: add support for narrow clones Rapha?l Gom?s <rgomes@octobus.net> parents: 49485 diff changeset	382 Box::new(IntersectionMatcher::new(narrow_matcher, sparse_matcher))
7c93e38a0bbd rhg-status: add support for narrow clones Rapha?l Gom?s <rgomes@octobus.net> parents: 49485 diff changeset	383 }
7c93e38a0bbd rhg-status: add support for narrow clones Rapha?l Gom?s <rgomes@octobus.net> parents: 49485 diff changeset	384 (true, false) => narrow_matcher,
7c93e38a0bbd rhg-status: add support for narrow clones Rapha?l Gom?s <rgomes@octobus.net> parents: 49485 diff changeset	385 (false, true) => sparse_matcher,
7c93e38a0bbd rhg-status: add support for narrow clones Rapha?l Gom?s <rgomes@octobus.net> parents: 49485 diff changeset	386 (false, false) => Box::new(AlwaysMatcher),
7c93e38a0bbd rhg-status: add support for narrow clones Rapha?l Gom?s <rgomes@octobus.net> parents: 49485 diff changeset	387 };
49485 ffd4b1f1c9cb rhg: add sparse support Rapha?l Gom?s <rgomes@octobus.net> parents: 49483 diff changeset	388
49489 7c93e38a0bbd rhg-status: add support for narrow clones Rapha?l Gom?s <rgomes@octobus.net> parents: 49485 diff changeset	389 for warning in narrow_warnings.into_iter().chain(sparse_warnings) {
49485 ffd4b1f1c9cb rhg: add sparse support Rapha?l Gom?s <rgomes@octobus.net> parents: 49483 diff changeset	390 match &warning {
49489 7c93e38a0bbd rhg-status: add support for narrow clones Rapha?l Gom?s <rgomes@octobus.net> parents: 49485 diff changeset	391 sparse::SparseWarning::RootWarning { context, line } => {
49485 ffd4b1f1c9cb rhg: add sparse support Rapha?l Gom?s <rgomes@octobus.net> parents: 49483 diff changeset	392 let msg = format_bytes!(
ffd4b1f1c9cb rhg: add sparse support Rapha?l Gom?s <rgomes@octobus.net> parents: 49483 diff changeset	393 b"warning: {} profile cannot use paths \"
ffd4b1f1c9cb rhg: add sparse support Rapha?l Gom?s <rgomes@octobus.net> parents: 49483 diff changeset	394 starting with /, ignoring {}\n",
ffd4b1f1c9cb rhg: add sparse support Rapha?l Gom?s <rgomes@octobus.net> parents: 49483 diff changeset	395 context,
ffd4b1f1c9cb rhg: add sparse support Rapha?l Gom?s <rgomes@octobus.net> parents: 49483 diff changeset	396 line
ffd4b1f1c9cb rhg: add sparse support Rapha?l Gom?s <rgomes@octobus.net> parents: 49483 diff changeset	397 );
ffd4b1f1c9cb rhg: add sparse support Rapha?l Gom?s <rgomes@octobus.net> parents: 49483 diff changeset	398 ui.write_stderr(&msg)?;
ffd4b1f1c9cb rhg: add sparse support Rapha?l Gom?s <rgomes@octobus.net> parents: 49483 diff changeset	399 }
49489 7c93e38a0bbd rhg-status: add support for narrow clones Rapha?l Gom?s <rgomes@octobus.net> parents: 49485 diff changeset	400 sparse::SparseWarning::ProfileNotFound { profile, rev } => {
49485 ffd4b1f1c9cb rhg: add sparse support Rapha?l Gom?s <rgomes@octobus.net> parents: 49483 diff changeset	401 let msg = format_bytes!(
ffd4b1f1c9cb rhg: add sparse support Rapha?l Gom?s <rgomes@octobus.net> parents: 49483 diff changeset	402 b"warning: sparse profile '{}' not found \"
ffd4b1f1c9cb rhg: add sparse support Rapha?l Gom?s <rgomes@octobus.net> parents: 49483 diff changeset	403 in rev {} - ignoring it\n",
ffd4b1f1c9cb rhg: add sparse support Rapha?l Gom?s <rgomes@octobus.net> parents: 49483 diff changeset	404 profile,
ffd4b1f1c9cb rhg: add sparse support Rapha?l Gom?s <rgomes@octobus.net> parents: 49483 diff changeset	405 rev
ffd4b1f1c9cb rhg: add sparse support Rapha?l Gom?s <rgomes@octobus.net> parents: 49483 diff changeset	406 );
ffd4b1f1c9cb rhg: add sparse support Rapha?l Gom?s <rgomes@octobus.net> parents: 49483 diff changeset	407 ui.write_stderr(&msg)?;
ffd4b1f1c9cb rhg: add sparse support Rapha?l Gom?s <rgomes@octobus.net> parents: 49483 diff changeset	408 }
49489 7c93e38a0bbd rhg-status: add support for narrow clones Rapha?l Gom?s <rgomes@octobus.net> parents: 49485 diff changeset	409 sparse::SparseWarning::Pattern(e) => {
49485 ffd4b1f1c9cb rhg: add sparse support Rapha?l Gom?s <rgomes@octobus.net> parents: 49483 diff changeset	410 ui.write_stderr(&print_pattern_file_warning(e, &repo))?;
ffd4b1f1c9cb rhg: add sparse support Rapha?l Gom?s <rgomes@octobus.net> parents: 49483 diff changeset	411 }
ffd4b1f1c9cb rhg: add sparse support Rapha?l Gom?s <rgomes@octobus.net> parents: 49483 diff changeset	412 }
ffd4b1f1c9cb rhg: add sparse support Rapha?l Gom?s <rgomes@octobus.net> parents: 49483 diff changeset	413 }
49000 dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	414 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	415 dmap.with_status(
49485 ffd4b1f1c9cb rhg: add sparse support Rapha?l Gom?s <rgomes@octobus.net> parents: 49483 diff changeset	416 matcher.as_ref(),
49000 dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	417 repo.working_directory_path().to_owned(),
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	418 ignore_files(repo, config),
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	419 options,
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	420 after_status,
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48738 diff changeset	421 )?;
48422 000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	422
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	423 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	424 && !dirstate_write_needed
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	425 {
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	426 // Nothing to update
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	427 return Ok(());
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	428 }
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	429
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	430 // 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	431 let with_lock_result =
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	432 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	433 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	434 for hg_path in fixup {
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	435 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	436 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	437 .expect("HgPath conversion");
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	438 // 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	439 // `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	440 // 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	441 // content, in case it changed in the meantime.
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	442 let fs_metadata = repo
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	443 .working_directory_vfs()
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	444 .symlink_metadata(&fs_path)?;
48443 112184713852 rhg: Set second_ambiguous as needed in post-status fixup Simon Sapin <simon.sapin@octobus.net> parents: 48422 diff changeset	445 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	446 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	447 &fs_metadata,
112184713852 rhg: Set second_ambiguous as needed in post-status fixup Simon Sapin <simon.sapin@octobus.net> parents: 48422 diff changeset	448 &mtime_boundary,
112184713852 rhg: Set second_ambiguous as needed in post-status fixup Simon Sapin <simon.sapin@octobus.net> parents: 48422 diff changeset	449 )
112184713852 rhg: Set second_ambiguous as needed in post-status fixup Simon Sapin <simon.sapin@octobus.net> parents: 48422 diff changeset	450 .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	451 {
48422 000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	452 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	453 let size = fs_metadata.len();
4d3f6767319f rhg: use the new `set_clean` API Rapha?l Gom?s <rgomes@octobus.net> parents: 49000 diff changeset	454 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	455 dirstate_write_needed = true
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	456 }
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	457 }
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	458 }
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	459 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	460 if dirstate_write_needed {
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	461 repo.write_dirstate()?
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	462 }
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	463 Ok(())
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	464 });
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	465 match with_lock_result {
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	466 Ok(closure_result) => closure_result?,
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	467 Err(LockError::AlreadyHeld) => {
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	468 // 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	469 // 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	470 // process releases the lock.
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	471 }
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	472 Err(LockError::Other(HgError::IoError { error, .. }))
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	473 if error.kind() == io::ErrorKind::PermissionDenied =>
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	474 {
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	475 // `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	476 }
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	477 Err(LockError::Other(error)) => {
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	478 // Report other I/O errors
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	479 Err(error)?
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	480 }
000130cfafb6 rhg: Update the dirstate on disk after status Simon Sapin <simon.sapin@octobus.net> parents: 48409 diff changeset	481 }
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	482 Ok(())
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	483 }
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	484
48451 4a983b69e519 rhg: Add support for ui.ignore and ui.ignore.* config Simon Sapin <simon.sapin@octobus.net> parents: 48443 diff changeset	485 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	486 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	487 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	488 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	489 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	490 }
4a983b69e519 rhg: Add support for ui.ignore and ui.ignore.* config Simon Sapin <simon.sapin@octobus.net> parents: 48443 diff changeset	491 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	492 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	493 let path = get_path_from_bytes(value);
4a983b69e519 rhg: Add support for ui.ignore and ui.ignore.* config Simon Sapin <simon.sapin@octobus.net> parents: 48443 diff changeset	494 // TODO: expand "~/" and environment variable here, like Python
4a983b69e519 rhg: Add support for ui.ignore and ui.ignore.* config Simon Sapin <simon.sapin@octobus.net> parents: 48443 diff changeset	495 // does with `os.path.expanduser` and `os.path.expandvars`
4a983b69e519 rhg: Add support for ui.ignore and ui.ignore.* config Simon Sapin <simon.sapin@octobus.net> parents: 48443 diff changeset	496
4a983b69e519 rhg: Add support for ui.ignore and ui.ignore.* config Simon Sapin <simon.sapin@octobus.net> parents: 48443 diff changeset	497 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	498 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	499 }
4a983b69e519 rhg: Add support for ui.ignore and ui.ignore.* config Simon Sapin <simon.sapin@octobus.net> parents: 48443 diff changeset	500 }
4a983b69e519 rhg: Add support for ui.ignore and ui.ignore.* config Simon Sapin <simon.sapin@octobus.net> parents: 48443 diff changeset	501 ignore_files
4a983b69e519 rhg: Add support for ui.ignore and ui.ignore.* config Simon Sapin <simon.sapin@octobus.net> parents: 48443 diff changeset	502 }
4a983b69e519 rhg: Add support for ui.ignore and ui.ignore.* config Simon Sapin <simon.sapin@octobus.net> parents: 48443 diff changeset	503
48452 2afaa0145584 rhg: refactor display_status_paths with a struct for common arguments Simon Sapin <simon.sapin@octobus.net> parents: 48451 diff changeset	504 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	505 ui: &'a Ui,
48349 c12ed33558cb rhg: Add support for `rhg status -n` Simon Sapin <simon.sapin@octobus.net> parents: 48345 diff changeset	506 no_status: bool,
48453 9b0e1f64656f rhg: refactor relativize_path into a struct + method Simon Sapin <simon.sapin@octobus.net> parents: 48452 diff changeset	507 relativize: Option<RelativizePaths>,
48452 2afaa0145584 rhg: refactor display_status_paths with a struct for common arguments Simon Sapin <simon.sapin@octobus.net> parents: 48451 diff changeset	508 }
2afaa0145584 rhg: refactor display_status_paths with a struct for common arguments Simon Sapin <simon.sapin@octobus.net> parents: 48451 diff changeset	509
2afaa0145584 rhg: refactor display_status_paths with a struct for common arguments Simon Sapin <simon.sapin@octobus.net> parents: 48451 diff changeset	510 impl DisplayStatusPaths<'_> {
2afaa0145584 rhg: refactor display_status_paths with a struct for common arguments Simon Sapin <simon.sapin@octobus.net> parents: 48451 diff changeset	511 // 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	512 // 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	513 fn display(
2afaa0145584 rhg: refactor display_status_paths with a struct for common arguments Simon Sapin <simon.sapin@octobus.net> parents: 48451 diff changeset	514 &self,
2afaa0145584 rhg: refactor display_status_paths with a struct for common arguments Simon Sapin <simon.sapin@octobus.net> parents: 48451 diff changeset	515 status_prefix: &[u8],
48734 3e2b4bb286e7 rhg: Colorize `rhg status` output when appropriate Simon Sapin <simon.sapin@octobus.net> parents: 48729 diff changeset	516 label: &'static str,
48454 473af5cbc209 rhg: Add support for `rhg status --copies` Simon Sapin <simon.sapin@octobus.net> parents: 48453 diff changeset	517 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	518 ) -> Result<(), CommandError> {
2afaa0145584 rhg: refactor display_status_paths with a struct for common arguments Simon Sapin <simon.sapin@octobus.net> parents: 48451 diff changeset	519 paths.sort_unstable();
48738 00efd2d5037d rust: fix code formatting Simon Sapin <simon.sapin@octobus.net> parents: 48735 diff changeset	520 // 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	521 // instead of in each write
48454 473af5cbc209 rhg: Add support for `rhg status --copies` Simon Sapin <simon.sapin@octobus.net> parents: 48453 diff changeset	522 for StatusPath { path, copy_source } in paths {
48453 9b0e1f64656f rhg: refactor relativize_path into a struct + method Simon Sapin <simon.sapin@octobus.net> parents: 48452 diff changeset	523 let relative;
9b0e1f64656f rhg: refactor relativize_path into a struct + method Simon Sapin <simon.sapin@octobus.net> parents: 48452 diff changeset	524 let path = if let Some(relativize) = &self.relativize {
9b0e1f64656f rhg: refactor relativize_path into a struct + method Simon Sapin <simon.sapin@octobus.net> parents: 48452 diff changeset	525 relative = relativize.relativize(&path);
9b0e1f64656f rhg: refactor relativize_path into a struct + method Simon Sapin <simon.sapin@octobus.net> parents: 48452 diff changeset	526 &*relative
9b0e1f64656f rhg: refactor relativize_path into a struct + method Simon Sapin <simon.sapin@octobus.net> parents: 48452 diff changeset	527 } else {
9b0e1f64656f rhg: refactor relativize_path into a struct + method Simon Sapin <simon.sapin@octobus.net> parents: 48452 diff changeset	528 path.as_bytes()
9b0e1f64656f rhg: refactor relativize_path into a struct + method Simon Sapin <simon.sapin@octobus.net> parents: 48452 diff changeset	529 };
48734 3e2b4bb286e7 rhg: Colorize `rhg status` output when appropriate Simon Sapin <simon.sapin@octobus.net> parents: 48729 diff changeset	530 // 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	531 // 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	532 // itermediate `Vec<u8>`.
3e2b4bb286e7 rhg: Colorize `rhg status` output when appropriate Simon Sapin <simon.sapin@octobus.net> parents: 48729 diff changeset	533 if !self.no_status {
3e2b4bb286e7 rhg: Colorize `rhg status` output when appropriate Simon Sapin <simon.sapin@octobus.net> parents: 48729 diff changeset	534 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	535 }
48734 3e2b4bb286e7 rhg: Colorize `rhg status` output when appropriate Simon Sapin <simon.sapin@octobus.net> parents: 48729 diff changeset	536 self.ui
3e2b4bb286e7 rhg: Colorize `rhg status` output when appropriate Simon Sapin <simon.sapin@octobus.net> parents: 48729 diff changeset	537 .write_stdout_labelled(&format_bytes!(b"{}\n", path), label)?;
48454 473af5cbc209 rhg: Add support for `rhg status --copies` Simon Sapin <simon.sapin@octobus.net> parents: 48453 diff changeset	538 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	539 let label = "status.copied";
3e2b4bb286e7 rhg: Colorize `rhg status` output when appropriate Simon Sapin <simon.sapin@octobus.net> parents: 48729 diff changeset	540 self.ui.write_stdout_labelled(
3e2b4bb286e7 rhg: Colorize `rhg status` output when appropriate Simon Sapin <simon.sapin@octobus.net> parents: 48729 diff changeset	541 &format_bytes!(b" {}\n", source.as_bytes()),
3e2b4bb286e7 rhg: Colorize `rhg status` output when appropriate Simon Sapin <simon.sapin@octobus.net> parents: 48729 diff changeset	542 label,
3e2b4bb286e7 rhg: Colorize `rhg status` output when appropriate Simon Sapin <simon.sapin@octobus.net> parents: 48729 diff changeset	543 )?
48454 473af5cbc209 rhg: Add support for `rhg status --copies` Simon Sapin <simon.sapin@octobus.net> parents: 48453 diff changeset	544 }
48349 c12ed33558cb rhg: Add support for `rhg status -n` Simon Sapin <simon.sapin@octobus.net> parents: 48345 diff changeset	545 }
48452 2afaa0145584 rhg: refactor display_status_paths with a struct for common arguments Simon Sapin <simon.sapin@octobus.net> parents: 48451 diff changeset	546 Ok(())
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	547 }
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	548 }
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	549
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	550 /// 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	551 ///
c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	552 /// 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	553 /// to time resolution limits.
48344 b6d8eea9872c rhg: Rename cat_file_is_modified Simon Sapin <simon.sapin@octobus.net> parents: 48343 diff changeset	554 fn unsure_is_modified(
49517 52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49516 diff changeset	555 working_directory_vfs: hg::vfs::Vfs,
52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49516 diff changeset	556 store_vfs: hg::vfs::Vfs,
47964 796206e74b10 rhg: Reuse manifest when checking status of multiple ambiguous files Simon Sapin <simon.sapin@octobus.net> parents: 47956 diff changeset	557 manifest: &Manifest,
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	558 hg_path: &HgPath,
47964 796206e74b10 rhg: Reuse manifest when checking status of multiple ambiguous files Simon Sapin <simon.sapin@octobus.net> parents: 47956 diff changeset	559 ) -> Result<bool, HgError> {
49517 52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49516 diff changeset	560 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	561 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	562 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	563 let is_symlink = fs_metadata.file_type().is_symlink();
48391 b80e5e75d51e dirstate: remove `lastnormaltime` mechanism Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48349 diff changeset	564 // 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	565 // dirstate
48345 d5a91701f7dc rhg: Fix status desambiguation of symlinks and executable files Simon Sapin <simon.sapin@octobus.net> parents: 48344 diff changeset	566 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	567 Some(b'l')
d5a91701f7dc rhg: Fix status desambiguation of symlinks and executable files Simon Sapin <simon.sapin@octobus.net> parents: 48344 diff changeset	568 } else if has_exec_bit(&fs_metadata) {
d5a91701f7dc rhg: Fix status desambiguation of symlinks and executable files Simon Sapin <simon.sapin@octobus.net> parents: 48344 diff changeset	569 Some(b'x')
d5a91701f7dc rhg: Fix status desambiguation of symlinks and executable files Simon Sapin <simon.sapin@octobus.net> parents: 48344 diff changeset	570 } else {
d5a91701f7dc rhg: Fix status desambiguation of symlinks and executable files Simon Sapin <simon.sapin@octobus.net> parents: 48344 diff changeset	571 None
d5a91701f7dc rhg: Fix status desambiguation of symlinks and executable files Simon Sapin <simon.sapin@octobus.net> parents: 48344 diff changeset	572 };
d5a91701f7dc rhg: Fix status desambiguation of symlinks and executable files Simon Sapin <simon.sapin@octobus.net> parents: 48344 diff changeset	573
48343 eb428010aad2 rhg: Also parse flags in the manifest parser Simon Sapin <simon.sapin@octobus.net> parents: 48342 diff changeset	574 let entry = manifest
48495 e293ff808a05 rhg: Use binary search in manifest lookup Simon Sapin <simon.sapin@octobus.net> parents: 48471 diff changeset	575 .find_by_path(hg_path)?
47964 796206e74b10 rhg: Reuse manifest when checking status of multiple ambiguous files Simon Sapin <simon.sapin@octobus.net> parents: 47956 diff changeset	576 .expect("ambgious file not in p1");
48345 d5a91701f7dc rhg: Fix status desambiguation of symlinks and executable files Simon Sapin <simon.sapin@octobus.net> parents: 48344 diff changeset	577 if entry.flags != fs_flags {
d5a91701f7dc rhg: Fix status desambiguation of symlinks and executable files Simon Sapin <simon.sapin@octobus.net> parents: 48344 diff changeset	578 return Ok(true);
d5a91701f7dc rhg: Fix status desambiguation of symlinks and executable files Simon Sapin <simon.sapin@octobus.net> parents: 48344 diff changeset	579 }
49517 52464a20add0 rhg: parallellize computation of [unsure_is_modified] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49516 diff changeset	580 let filelog = hg::filelog::Filelog::open_vfs(&store_vfs, hg_path)?;
48471 b005d07ded7d rhg: Skip reading the contents of ambiguous files in some cases Simon Sapin <simon.sapin@octobus.net> parents: 48467 diff changeset	581 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	582 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	583 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	584 HgError::corrupted(format!(
455fce57e89e rust: don't swallow valuable error information Rapha?l Gom?s <rgomes@octobus.net> parents: 49110 diff changeset	585 "filelog missing node {:?} from manifest",
455fce57e89e rust: don't swallow valuable error information Rapha?l Gom?s <rgomes@octobus.net> parents: 49110 diff changeset	586 file_node
455fce57e89e rust: don't swallow valuable error information Rapha?l Gom?s <rgomes@octobus.net> parents: 49110 diff changeset	587 ))
455fce57e89e rust: don't swallow valuable error information Rapha?l Gom?s <rgomes@octobus.net> parents: 49110 diff changeset	588 })?;
48546 e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48542 diff changeset	589 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	590 // 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	591 // it cannot be equal if it has a different length.
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48542 diff changeset	592 return Ok(true);
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48542 diff changeset	593 }
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48542 diff changeset	594
e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48542 diff changeset	595 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	596 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	597 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	598 // 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	599 // it cannot be equal if it has a different length.
b005d07ded7d rhg: Skip reading the contents of ambiguous files in some cases Simon Sapin <simon.sapin@octobus.net> parents: 48467 diff changeset	600 return Ok(true);
b005d07ded7d rhg: Skip reading the contents of ambiguous files in some cases Simon Sapin <simon.sapin@octobus.net> parents: 48467 diff changeset	601 }
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	602
48345 d5a91701f7dc rhg: Fix status desambiguation of symlinks and executable files Simon Sapin <simon.sapin@octobus.net> parents: 48344 diff changeset	603 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	604 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	605 } else {
d5a91701f7dc rhg: Fix status desambiguation of symlinks and executable files Simon Sapin <simon.sapin@octobus.net> parents: 48344 diff changeset	606 vfs.read(fs_path)?
d5a91701f7dc rhg: Fix status desambiguation of symlinks and executable files Simon Sapin <simon.sapin@octobus.net> parents: 48344 diff changeset	607 };
48546 e91aa800ae5b rhg: desambiguate status without decompressing filelog if possible Simon Sapin <simon.sapin@octobus.net> parents: 48542 diff changeset	608 Ok(p1_contents != &*fs_contents)
46822 c71e8d9e7f2a rhg: Initial support for the 'status' command Georges Racinet <georges.racinet@octobus.net> parents: diff changeset	609 }
49483 b18e877ea304 rhg-status: extract a function for printing pattern file warnings Rapha?l Gom?s <rgomes@octobus.net> parents: 49439 diff changeset	610
b18e877ea304 rhg-status: extract a function for printing pattern file warnings Rapha?l Gom?s <rgomes@octobus.net> parents: 49439 diff changeset	611 fn print_pattern_file_warning(
b18e877ea304 rhg-status: extract a function for printing pattern file warnings Rapha?l Gom?s <rgomes@octobus.net> parents: 49439 diff changeset	612 warning: &PatternFileWarning,
b18e877ea304 rhg-status: extract a function for printing pattern file warnings Rapha?l Gom?s <rgomes@octobus.net> parents: 49439 diff changeset	613 repo: &Repo,
b18e877ea304 rhg-status: extract a function for printing pattern file warnings Rapha?l Gom?s <rgomes@octobus.net> parents: 49439 diff changeset	614 ) -> Vec<u8> {
b18e877ea304 rhg-status: extract a function for printing pattern file warnings Rapha?l Gom?s <rgomes@octobus.net> parents: 49439 diff changeset	615 match warning {
b18e877ea304 rhg-status: extract a function for printing pattern file warnings Rapha?l Gom?s <rgomes@octobus.net> parents: 49439 diff changeset	616 PatternFileWarning::InvalidSyntax(path, syntax) => format_bytes!(
b18e877ea304 rhg-status: extract a function for printing pattern file warnings Rapha?l Gom?s <rgomes@octobus.net> parents: 49439 diff changeset	617 b"{}: ignoring invalid syntax '{}'\n",
b18e877ea304 rhg-status: extract a function for printing pattern file warnings Rapha?l Gom?s <rgomes@octobus.net> parents: 49439 diff changeset	618 get_bytes_from_path(path),
b18e877ea304 rhg-status: extract a function for printing pattern file warnings Rapha?l Gom?s <rgomes@octobus.net> parents: 49439 diff changeset	619 &*syntax
b18e877ea304 rhg-status: extract a function for printing pattern file warnings Rapha?l Gom?s <rgomes@octobus.net> parents: 49439 diff changeset	620 ),
b18e877ea304 rhg-status: extract a function for printing pattern file warnings Rapha?l Gom?s <rgomes@octobus.net> parents: 49439 diff changeset	621 PatternFileWarning::NoSuchFile(path) => {
b18e877ea304 rhg-status: extract a function for printing pattern file warnings Rapha?l Gom?s <rgomes@octobus.net> parents: 49439 diff changeset	622 let path = if let Ok(relative) =
b18e877ea304 rhg-status: extract a function for printing pattern file warnings Rapha?l Gom?s <rgomes@octobus.net> parents: 49439 diff changeset	623 path.strip_prefix(repo.working_directory_path())
b18e877ea304 rhg-status: extract a function for printing pattern file warnings Rapha?l Gom?s <rgomes@octobus.net> parents: 49439 diff changeset	624 {
b18e877ea304 rhg-status: extract a function for printing pattern file warnings Rapha?l Gom?s <rgomes@octobus.net> parents: 49439 diff changeset	625 relative
b18e877ea304 rhg-status: extract a function for printing pattern file warnings Rapha?l Gom?s <rgomes@octobus.net> parents: 49439 diff changeset	626 } else {
b18e877ea304 rhg-status: extract a function for printing pattern file warnings Rapha?l Gom?s <rgomes@octobus.net> parents: 49439 diff changeset	627 &*path
b18e877ea304 rhg-status: extract a function for printing pattern file warnings Rapha?l Gom?s <rgomes@octobus.net> parents: 49439 diff changeset	628 };
b18e877ea304 rhg-status: extract a function for printing pattern file warnings Rapha?l Gom?s <rgomes@octobus.net> parents: 49439 diff changeset	629 format_bytes!(
b18e877ea304 rhg-status: extract a function for printing pattern file warnings Rapha?l Gom?s <rgomes@octobus.net> parents: 49439 diff changeset	630 b"skipping unreadable pattern file '{}': \
b18e877ea304 rhg-status: extract a function for printing pattern file warnings Rapha?l Gom?s <rgomes@octobus.net> parents: 49439 diff changeset	631 No such file or directory\n",
b18e877ea304 rhg-status: extract a function for printing pattern file warnings Rapha?l Gom?s <rgomes@octobus.net> parents: 49439 diff changeset	632 get_bytes_from_path(path),
b18e877ea304 rhg-status: extract a function for printing pattern file warnings Rapha?l Gom?s <rgomes@octobus.net> parents: 49439 diff changeset	633 )
b18e877ea304 rhg-status: extract a function for printing pattern file warnings Rapha?l Gom?s <rgomes@octobus.net> parents: 49439 diff changeset	634 }
b18e877ea304 rhg-status: extract a function for printing pattern file warnings Rapha?l Gom?s <rgomes@octobus.net> parents: 49439 diff changeset	635 }
b18e877ea304 rhg-status: extract a function for printing pattern file warnings Rapha?l Gom?s <rgomes@octobus.net> parents: 49439 diff changeset	636 }

Mercurial > public > mercurial-scm > hg

annotate rust/rhg/src/commands/status.rs @ 49640:37bc3edef76f