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

annotate rust/rhg/src/commands/status.rs @ 49502:7c93e38a0bbd

rhg-status: add support for narrow clones

author	Rapha?l Gom?s <rgomes@octobus.net>
date	Mon, 25 Jul 2022 15:39:04 +0200
parents	ffd4b1f1c9cb
children	6939d5ed20e0

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

Mercurial > public > mercurial-scm > hg-stable

annotate rust/rhg/src/commands/status.rs @ 49502:7c93e38a0bbd