rust/rhg/src/commands/files.rs
author Arseniy Alekseyev <aalekseyev@janestreet.com>
Mon, 29 May 2023 16:53:18 +0100
changeset 50539 74e4dbb0fcd5
parent 49985 e57f76c28f7b
child 50540 9db197c73138
permissions -rw-r--r--
rhg: make `rhg files` work if `ui.relative-files=true` is specified
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
46434
3e2d539d0d1a rust: remove `FooError` structs with only `kind: FooErrorKind` enum field
Simon Sapin <simon.sapin@octobus.net>
parents: 46167
diff changeset
     1
use crate::error::CommandError;
50539
74e4dbb0fcd5 rhg: make `rhg files` work if `ui.relative-files=true` is specified
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents: 49985
diff changeset
     2
use crate::ui::{print_narrow_sparse_warnings, Ui, RelativePaths, relative_paths};
48453
9b0e1f64656f rhg: refactor relativize_path into a struct + method
Simon Sapin <simon.sapin@octobus.net>
parents: 48409
diff changeset
     3
use crate::utils::path_utils::RelativizePaths;
46501
1ecaf09d9964 rhg: Move subcommand CLI arguments definitions to respective modules
Simon Sapin <simon.sapin@octobus.net>
parents: 46500
diff changeset
     4
use clap::Arg;
49984
df9eabc9837b rust-narrow: enable narrow support for plain `rhg files`
Raphaël Gomès <rgomes@octobus.net>
parents: 49983
diff changeset
     5
use hg::narrow;
46436
252d1bdba33d rhg: replace `map_*_error` functions with `From` impls
Simon Sapin <simon.sapin@octobus.net>
parents: 46434
diff changeset
     6
use hg::operations::list_rev_tracked_files;
46167
8a4914397d02 rust: introduce Repo and Vfs types for filesystem abstraction
Simon Sapin <simon.sapin@octobus.net>
parents: 46135
diff changeset
     7
use hg::repo::Repo;
49980
95ffa065204e rhg-files: reuse centralized dirstate logic
Raphaël Gomès <rgomes@octobus.net>
parents: 49978
diff changeset
     8
use hg::utils::filter_map_results;
48174
9ecf802b06e0 rhg: refactor function to relativize paths in utils
Pulkit Goyal <7895pulkit@gmail.com>
parents: 46925
diff changeset
     9
use hg::utils::hg_path::HgPath;
49980
95ffa065204e rhg-files: reuse centralized dirstate logic
Raphaël Gomès <rgomes@octobus.net>
parents: 49978
diff changeset
    10
use rayon::prelude::*;
45364
5fe25f8ef5d9 rhg: add a `Files` `Command` to prepare the `rhg files` subcommand
Antoine Cezar <antoine.cezar@octobus.net>
parents:
diff changeset
    11
5fe25f8ef5d9 rhg: add a `Files` `Command` to prepare the `rhg files` subcommand
Antoine Cezar <antoine.cezar@octobus.net>
parents:
diff changeset
    12
pub const HELP_TEXT: &str = "
5fe25f8ef5d9 rhg: add a `Files` `Command` to prepare the `rhg files` subcommand
Antoine Cezar <antoine.cezar@octobus.net>
parents:
diff changeset
    13
List tracked files.
5fe25f8ef5d9 rhg: add a `Files` `Command` to prepare the `rhg files` subcommand
Antoine Cezar <antoine.cezar@octobus.net>
parents:
diff changeset
    14
5fe25f8ef5d9 rhg: add a `Files` `Command` to prepare the `rhg files` subcommand
Antoine Cezar <antoine.cezar@octobus.net>
parents:
diff changeset
    15
Returns 0 on success.
5fe25f8ef5d9 rhg: add a `Files` `Command` to prepare the `rhg files` subcommand
Antoine Cezar <antoine.cezar@octobus.net>
parents:
diff changeset
    16
";
5fe25f8ef5d9 rhg: add a `Files` `Command` to prepare the `rhg files` subcommand
Antoine Cezar <antoine.cezar@octobus.net>
parents:
diff changeset
    17
49640
37bc3edef76f rhg: upgrade `clap` dependency
Raphaël Gomès <rgomes@octobus.net>
parents: 48453
diff changeset
    18
pub fn args() -> clap::Command {
37bc3edef76f rhg: upgrade `clap` dependency
Raphaël Gomès <rgomes@octobus.net>
parents: 48453
diff changeset
    19
    clap::command!("files")
46501
1ecaf09d9964 rhg: Move subcommand CLI arguments definitions to respective modules
Simon Sapin <simon.sapin@octobus.net>
parents: 46500
diff changeset
    20
        .arg(
49640
37bc3edef76f rhg: upgrade `clap` dependency
Raphaël Gomès <rgomes@octobus.net>
parents: 48453
diff changeset
    21
            Arg::new("rev")
46501
1ecaf09d9964 rhg: Move subcommand CLI arguments definitions to respective modules
Simon Sapin <simon.sapin@octobus.net>
parents: 46500
diff changeset
    22
                .help("search the repository as it is in REV")
49640
37bc3edef76f rhg: upgrade `clap` dependency
Raphaël Gomès <rgomes@octobus.net>
parents: 48453
diff changeset
    23
                .short('r')
37bc3edef76f rhg: upgrade `clap` dependency
Raphaël Gomès <rgomes@octobus.net>
parents: 48453
diff changeset
    24
                .long("revision")
37bc3edef76f rhg: upgrade `clap` dependency
Raphaël Gomès <rgomes@octobus.net>
parents: 48453
diff changeset
    25
                .value_name("REV"),
46501
1ecaf09d9964 rhg: Move subcommand CLI arguments definitions to respective modules
Simon Sapin <simon.sapin@octobus.net>
parents: 46500
diff changeset
    26
        )
1ecaf09d9964 rhg: Move subcommand CLI arguments definitions to respective modules
Simon Sapin <simon.sapin@octobus.net>
parents: 46500
diff changeset
    27
        .about(HELP_TEXT)
1ecaf09d9964 rhg: Move subcommand CLI arguments definitions to respective modules
Simon Sapin <simon.sapin@octobus.net>
parents: 46500
diff changeset
    28
}
1ecaf09d9964 rhg: Move subcommand CLI arguments definitions to respective modules
Simon Sapin <simon.sapin@octobus.net>
parents: 46500
diff changeset
    29
46592
80840b651721 rhg: Group values passed to every sub-command into a struct
Simon Sapin <simon.sapin@octobus.net>
parents: 46503
diff changeset
    30
pub fn run(invocation: &crate::CliInvocation) -> Result<(), CommandError> {
50539
74e4dbb0fcd5 rhg: make `rhg files` work if `ui.relative-files=true` is specified
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents: 49985
diff changeset
    31
    match relative_paths(invocation.config)? {
74e4dbb0fcd5 rhg: make `rhg files` work if `ui.relative-files=true` is specified
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents: 49985
diff changeset
    32
      RelativePaths::Legacy | RelativePaths::Bool(true) => (),
74e4dbb0fcd5 rhg: make `rhg files` work if `ui.relative-files=true` is specified
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents: 49985
diff changeset
    33
      RelativePaths::Bool(false) => {
46739
c184b490da37 rhg: Fall back to Python if ui.relative-paths is configured
Simon Sapin <simon.sapin@octobus.net>
parents: 46593
diff changeset
    34
        return Err(CommandError::unsupported(
c184b490da37 rhg: Fall back to Python if ui.relative-paths is configured
Simon Sapin <simon.sapin@octobus.net>
parents: 46593
diff changeset
    35
            "non-default ui.relative-paths",
c184b490da37 rhg: Fall back to Python if ui.relative-paths is configured
Simon Sapin <simon.sapin@octobus.net>
parents: 46593
diff changeset
    36
        ));
50539
74e4dbb0fcd5 rhg: make `rhg files` work if `ui.relative-files=true` is specified
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents: 49985
diff changeset
    37
      }
46739
c184b490da37 rhg: Fall back to Python if ui.relative-paths is configured
Simon Sapin <simon.sapin@octobus.net>
parents: 46593
diff changeset
    38
    }
c184b490da37 rhg: Fall back to Python if ui.relative-paths is configured
Simon Sapin <simon.sapin@octobus.net>
parents: 46593
diff changeset
    39
49640
37bc3edef76f rhg: upgrade `clap` dependency
Raphaël Gomès <rgomes@octobus.net>
parents: 48453
diff changeset
    40
    let rev = invocation.subcommand_args.get_one::<String>("rev");
45364
5fe25f8ef5d9 rhg: add a `Files` `Command` to prepare the `rhg files` subcommand
Antoine Cezar <antoine.cezar@octobus.net>
parents:
diff changeset
    41
46593
5ce2aa7c2ad5 rhg: Move `Repo` object creation into `main()`
Simon Sapin <simon.sapin@octobus.net>
parents: 46592
diff changeset
    42
    let repo = invocation.repo?;
48409
005ae1a343f8 rhg: add support for narrow clones and sparse checkouts
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents: 48342
diff changeset
    43
005ae1a343f8 rhg: add support for narrow clones and sparse checkouts
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents: 48342
diff changeset
    44
    // It seems better if this check is removed: this would correspond to
005ae1a343f8 rhg: add support for narrow clones and sparse checkouts
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents: 48342
diff changeset
    45
    // automatically enabling the extension if the repo requires it.
005ae1a343f8 rhg: add support for narrow clones and sparse checkouts
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents: 48342
diff changeset
    46
    // However we need this check to be in sync with vanilla hg so hg tests
005ae1a343f8 rhg: add support for narrow clones and sparse checkouts
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents: 48342
diff changeset
    47
    // pass.
005ae1a343f8 rhg: add support for narrow clones and sparse checkouts
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents: 48342
diff changeset
    48
    if repo.has_sparse()
005ae1a343f8 rhg: add support for narrow clones and sparse checkouts
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents: 48342
diff changeset
    49
        && invocation.config.get(b"extensions", b"sparse").is_none()
005ae1a343f8 rhg: add support for narrow clones and sparse checkouts
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents: 48342
diff changeset
    50
    {
005ae1a343f8 rhg: add support for narrow clones and sparse checkouts
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents: 48342
diff changeset
    51
        return Err(CommandError::unsupported(
005ae1a343f8 rhg: add support for narrow clones and sparse checkouts
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents: 48342
diff changeset
    52
            "repo is using sparse, but sparse extension is not enabled",
005ae1a343f8 rhg: add support for narrow clones and sparse checkouts
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents: 48342
diff changeset
    53
        ));
005ae1a343f8 rhg: add support for narrow clones and sparse checkouts
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents: 48342
diff changeset
    54
    }
005ae1a343f8 rhg: add support for narrow clones and sparse checkouts
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents: 48342
diff changeset
    55
49985
e57f76c28f7b rhg-files: add support for narrow when specifying a revision
Raphaël Gomès <rgomes@octobus.net>
parents: 49984
diff changeset
    56
    let (narrow_matcher, narrow_warnings) = narrow::matcher(repo)?;
e57f76c28f7b rhg-files: add support for narrow when specifying a revision
Raphaël Gomès <rgomes@octobus.net>
parents: 49984
diff changeset
    57
    print_narrow_sparse_warnings(&narrow_warnings, &[], invocation.ui, repo)?;
e57f76c28f7b rhg-files: add support for narrow when specifying a revision
Raphaël Gomès <rgomes@octobus.net>
parents: 49984
diff changeset
    58
46500
184e46550dc8 rhg: replace command structs with functions
Simon Sapin <simon.sapin@octobus.net>
parents: 46484
diff changeset
    59
    if let Some(rev) = rev {
49985
e57f76c28f7b rhg-files: add support for narrow when specifying a revision
Raphaël Gomès <rgomes@octobus.net>
parents: 49984
diff changeset
    60
        let files = list_rev_tracked_files(repo, rev, narrow_matcher)
49640
37bc3edef76f rhg: upgrade `clap` dependency
Raphaël Gomès <rgomes@octobus.net>
parents: 48453
diff changeset
    61
            .map_err(|e| (e, rev.as_ref()))?;
46593
5ce2aa7c2ad5 rhg: Move `Repo` object creation into `main()`
Simon Sapin <simon.sapin@octobus.net>
parents: 46592
diff changeset
    62
        display_files(invocation.ui, repo, files.iter())
46500
184e46550dc8 rhg: replace command structs with functions
Simon Sapin <simon.sapin@octobus.net>
parents: 46484
diff changeset
    63
    } else {
49984
df9eabc9837b rust-narrow: enable narrow support for plain `rhg files`
Raphaël Gomès <rgomes@octobus.net>
parents: 49983
diff changeset
    64
        // The dirstate always reflects the sparse narrowspec.
49980
95ffa065204e rhg-files: reuse centralized dirstate logic
Raphaël Gomès <rgomes@octobus.net>
parents: 49978
diff changeset
    65
        let dirstate = repo.dirstate_map()?;
95ffa065204e rhg-files: reuse centralized dirstate logic
Raphaël Gomès <rgomes@octobus.net>
parents: 49978
diff changeset
    66
        let files_res: Result<Vec<_>, _> =
95ffa065204e rhg-files: reuse centralized dirstate logic
Raphaël Gomès <rgomes@octobus.net>
parents: 49978
diff changeset
    67
            filter_map_results(dirstate.iter(), |(path, entry)| {
49984
df9eabc9837b rust-narrow: enable narrow support for plain `rhg files`
Raphaël Gomès <rgomes@octobus.net>
parents: 49983
diff changeset
    68
                Ok(if entry.tracked() && narrow_matcher.matches(path) {
df9eabc9837b rust-narrow: enable narrow support for plain `rhg files`
Raphaël Gomès <rgomes@octobus.net>
parents: 49983
diff changeset
    69
                    Some(path)
df9eabc9837b rust-narrow: enable narrow support for plain `rhg files`
Raphaël Gomès <rgomes@octobus.net>
parents: 49983
diff changeset
    70
                } else {
df9eabc9837b rust-narrow: enable narrow support for plain `rhg files`
Raphaël Gomès <rgomes@octobus.net>
parents: 49983
diff changeset
    71
                    None
df9eabc9837b rust-narrow: enable narrow support for plain `rhg files`
Raphaël Gomès <rgomes@octobus.net>
parents: 49983
diff changeset
    72
                })
49980
95ffa065204e rhg-files: reuse centralized dirstate logic
Raphaël Gomès <rgomes@octobus.net>
parents: 49978
diff changeset
    73
            })
95ffa065204e rhg-files: reuse centralized dirstate logic
Raphaël Gomès <rgomes@octobus.net>
parents: 49978
diff changeset
    74
            .collect();
95ffa065204e rhg-files: reuse centralized dirstate logic
Raphaël Gomès <rgomes@octobus.net>
parents: 49978
diff changeset
    75
95ffa065204e rhg-files: reuse centralized dirstate logic
Raphaël Gomès <rgomes@octobus.net>
parents: 49978
diff changeset
    76
        let mut files = files_res?;
95ffa065204e rhg-files: reuse centralized dirstate logic
Raphaël Gomès <rgomes@octobus.net>
parents: 49978
diff changeset
    77
        files.par_sort_unstable();
95ffa065204e rhg-files: reuse centralized dirstate logic
Raphaël Gomès <rgomes@octobus.net>
parents: 49978
diff changeset
    78
49984
df9eabc9837b rust-narrow: enable narrow support for plain `rhg files`
Raphaël Gomès <rgomes@octobus.net>
parents: 49983
diff changeset
    79
        display_files(
df9eabc9837b rust-narrow: enable narrow support for plain `rhg files`
Raphaël Gomès <rgomes@octobus.net>
parents: 49983
diff changeset
    80
            invocation.ui,
df9eabc9837b rust-narrow: enable narrow support for plain `rhg files`
Raphaël Gomès <rgomes@octobus.net>
parents: 49983
diff changeset
    81
            repo,
df9eabc9837b rust-narrow: enable narrow support for plain `rhg files`
Raphaël Gomès <rgomes@octobus.net>
parents: 49983
diff changeset
    82
            files.into_iter().map::<Result<_, CommandError>, _>(Ok),
df9eabc9837b rust-narrow: enable narrow support for plain `rhg files`
Raphaël Gomès <rgomes@octobus.net>
parents: 49983
diff changeset
    83
        )
45364
5fe25f8ef5d9 rhg: add a `Files` `Command` to prepare the `rhg files` subcommand
Antoine Cezar <antoine.cezar@octobus.net>
parents:
diff changeset
    84
    }
5fe25f8ef5d9 rhg: add a `Files` `Command` to prepare the `rhg files` subcommand
Antoine Cezar <antoine.cezar@octobus.net>
parents:
diff changeset
    85
}
45535
72b7d58d6e35 hg-core: simplify `list_tracked_files` operation
Antoine Cezar <antoine.cezar@octobus.net>
parents: 45438
diff changeset
    86
49983
795b5b01cbd2 rhg-files: make signature of `display_files` more flexible
Raphaël Gomès <rgomes@octobus.net>
parents: 49980
diff changeset
    87
fn display_files<'a, E>(
46500
184e46550dc8 rhg: replace command structs with functions
Simon Sapin <simon.sapin@octobus.net>
parents: 46484
diff changeset
    88
    ui: &Ui,
184e46550dc8 rhg: replace command structs with functions
Simon Sapin <simon.sapin@octobus.net>
parents: 46484
diff changeset
    89
    repo: &Repo,
49983
795b5b01cbd2 rhg-files: make signature of `display_files` more flexible
Raphaël Gomès <rgomes@octobus.net>
parents: 49980
diff changeset
    90
    files: impl IntoIterator<Item = Result<&'a HgPath, E>>,
795b5b01cbd2 rhg-files: make signature of `display_files` more flexible
Raphaël Gomès <rgomes@octobus.net>
parents: 49980
diff changeset
    91
) -> Result<(), CommandError>
795b5b01cbd2 rhg-files: make signature of `display_files` more flexible
Raphaël Gomès <rgomes@octobus.net>
parents: 49980
diff changeset
    92
where
795b5b01cbd2 rhg-files: make signature of `display_files` more flexible
Raphaël Gomès <rgomes@octobus.net>
parents: 49980
diff changeset
    93
    CommandError: From<E>,
795b5b01cbd2 rhg-files: make signature of `display_files` more flexible
Raphaël Gomès <rgomes@octobus.net>
parents: 49980
diff changeset
    94
{
46500
184e46550dc8 rhg: replace command structs with functions
Simon Sapin <simon.sapin@octobus.net>
parents: 46484
diff changeset
    95
    let mut stdout = ui.stdout_buffer();
48174
9ecf802b06e0 rhg: refactor function to relativize paths in utils
Pulkit Goyal <7895pulkit@gmail.com>
parents: 46925
diff changeset
    96
    let mut any = false;
46925
b5e8bf10436e rhg: Make `files` work on repo-relative paths when possible
Simon Sapin <simon.sapin@octobus.net>
parents: 46745
diff changeset
    97
48453
9b0e1f64656f rhg: refactor relativize_path into a struct + method
Simon Sapin <simon.sapin@octobus.net>
parents: 48409
diff changeset
    98
    let relativize = RelativizePaths::new(repo)?;
9b0e1f64656f rhg: refactor relativize_path into a struct + method
Simon Sapin <simon.sapin@octobus.net>
parents: 48409
diff changeset
    99
    for result in files {
9b0e1f64656f rhg: refactor relativize_path into a struct + method
Simon Sapin <simon.sapin@octobus.net>
parents: 48409
diff changeset
   100
        let path = result?;
9b0e1f64656f rhg: refactor relativize_path into a struct + method
Simon Sapin <simon.sapin@octobus.net>
parents: 48409
diff changeset
   101
        stdout.write_all(&relativize.relativize(path))?;
9b0e1f64656f rhg: refactor relativize_path into a struct + method
Simon Sapin <simon.sapin@octobus.net>
parents: 48409
diff changeset
   102
        stdout.write_all(b"\n")?;
48174
9ecf802b06e0 rhg: refactor function to relativize paths in utils
Pulkit Goyal <7895pulkit@gmail.com>
parents: 46925
diff changeset
   103
        any = true;
48453
9b0e1f64656f rhg: refactor relativize_path into a struct + method
Simon Sapin <simon.sapin@octobus.net>
parents: 48409
diff changeset
   104
    }
9b0e1f64656f rhg: refactor relativize_path into a struct + method
Simon Sapin <simon.sapin@octobus.net>
parents: 48409
diff changeset
   105
46500
184e46550dc8 rhg: replace command structs with functions
Simon Sapin <simon.sapin@octobus.net>
parents: 46484
diff changeset
   106
    stdout.flush()?;
46745
63bfcddddac1 rhg: Exit with an error code if `files` finds nothing
Simon Sapin <simon.sapin@octobus.net>
parents: 46740
diff changeset
   107
    if any {
63bfcddddac1 rhg: Exit with an error code if `files` finds nothing
Simon Sapin <simon.sapin@octobus.net>
parents: 46740
diff changeset
   108
        Ok(())
63bfcddddac1 rhg: Exit with an error code if `files` finds nothing
Simon Sapin <simon.sapin@octobus.net>
parents: 46740
diff changeset
   109
    } else {
63bfcddddac1 rhg: Exit with an error code if `files` finds nothing
Simon Sapin <simon.sapin@octobus.net>
parents: 46740
diff changeset
   110
        Err(CommandError::Unsuccessful)
63bfcddddac1 rhg: Exit with an error code if `files` finds nothing
Simon Sapin <simon.sapin@octobus.net>
parents: 46740
diff changeset
   111
    }
45537
2f8227a12592 rhg: add `--revision` argument to `rhg files`
Antoine Cezar <antoine.cezar@octobus.net>
parents: 45535
diff changeset
   112
}