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