##// END OF EJS Templates
largefiles: properly pass kwargs into url.open...
largefiles: properly pass kwargs into url.open The url.open function has acquired a lot of kwargs over the years. When running `hg import http://example.com/hg/diff/1`, since at least a708e1e4d7a8 in March, 2018, the calling sites for url.open try to pass a `sendaccept` parameter that largefiles' override doesn't accept. Currently that stack traces something like this: Traceback (most recent call last): File "/tmp/hgtests.sv744r5t/install/bin/hg", line 59, in <module> dispatch.run() File "/tmp/hgtests.sv744r5t/install/lib/python/mercurial/dispatch.py", line 143, in run status = dispatch(req) File "/tmp/hgtests.sv744r5t/install/lib/python/mercurial/dispatch.py", line 245, in dispatch status = _rundispatch(req) File "/tmp/hgtests.sv744r5t/install/lib/python/mercurial/dispatch.py", line 289, in _rundispatch ret = _runcatch(req) or 0 File "/tmp/hgtests.sv744r5t/install/lib/python/mercurial/dispatch.py", line 465, in _runcatch return _callcatch(ui, _runcatchfunc) File "/tmp/hgtests.sv744r5t/install/lib/python/mercurial/dispatch.py", line 475, in _callcatch return scmutil.callcatch(ui, func) File "/tmp/hgtests.sv744r5t/install/lib/python/mercurial/scmutil.py", line 155, in callcatch return func() File "/tmp/hgtests.sv744r5t/install/lib/python/mercurial/dispatch.py", line 455, in _runcatchfunc return _dispatch(req) File "/tmp/hgtests.sv744r5t/install/lib/python/mercurial/dispatch.py", line 1259, in _dispatch lui, repo, cmd, fullargs, ui, options, d, cmdpats, cmdoptions File "/tmp/hgtests.sv744r5t/install/lib/python/mercurial/dispatch.py", line 913, in runcommand ret = _runcommand(ui, options, cmd, d) File "/tmp/hgtests.sv744r5t/install/lib/python/mercurial/dispatch.py", line 1270, in _runcommand return cmdfunc() File "/tmp/hgtests.sv744r5t/install/lib/python/mercurial/dispatch.py", line 1256, in <lambda> d = lambda: util.checksignature(func)(ui, *args, **strcmdopt) File "/tmp/hgtests.sv744r5t/install/lib/python/mercurial/util.py", line 1867, in check return func(*args, **kwargs) File "/tmp/hgtests.sv744r5t/install/lib/python/mercurial/commands.py", line 4184, in import_ patchfile = hg.openpath(ui, patchurl, sendaccept=False) File "/tmp/hgtests.sv744r5t/install/lib/python/mercurial/hg.py", line 181, in openpath return url.open(ui, path, sendaccept=sendaccept) TypeError: openlargefile() got an unexpected keyword argument 'sendaccept' So, just accept and pass along any kwargs of the overridden function.

File last commit:

r47175:1dcd9c99 default
r47202:32da5891 stable
Show More
files.rs
142 lines | 4.7 KiB | application/rls-services+xml | RustLexer
Antoine Cezar
rhg: add a `Files` `Command` to prepare the `rhg files` subcommand...
r45923 use crate::commands::Command;
use crate::error::{CommandError, CommandErrorKind};
Antoine Cezar
hg-core: simplify `list_tracked_files` operation...
r46106 use crate::ui::utf8_to_local;
Antoine Cezar
rhg: add a `Files` `Command` to prepare the `rhg files` subcommand...
r45923 use crate::ui::Ui;
Antoine Cezar
hg-core: simplify `list_tracked_files` operation...
r46106 use hg::operations::{
Simon Sapin
rust: replace most "operation" structs with functions...
r46751 list_rev_tracked_files, ListRevTrackedFilesError,
ListRevTrackedFilesErrorKind,
Antoine Cezar
hg-core: simplify `list_tracked_files` operation...
r46106 };
Antoine Cezar
rhg: add `--revision` argument to `rhg files`...
r46108 use hg::operations::{
Simon Sapin
rust: replace most "operation" structs with functions...
r46751 Dirstate, ListDirstateTrackedFilesError, ListDirstateTrackedFilesErrorKind,
Antoine Cezar
rhg: add `--revision` argument to `rhg files`...
r46108 };
Simon Sapin
rust: introduce Repo and Vfs types for filesystem abstraction...
r46782 use hg::repo::Repo;
Raphaël Gomès
rhg: make output of `files` relative to the current directory and the root...
r46007 use hg::utils::files::{get_bytes_from_path, relativize_path};
Antoine Cezar
rhg: add `--revision` argument to `rhg files`...
r46108 use hg::utils::hg_path::{HgPath, HgPathBuf};
Antoine Cezar
rhg: add a `Files` `Command` to prepare the `rhg files` subcommand...
r45923
pub const HELP_TEXT: &str = "
List tracked files.
Returns 0 on success.
";
Antoine Cezar
rhg: add `--revision` argument to `rhg files`...
r46108 pub struct FilesCommand<'a> {
rev: Option<&'a str>,
Antoine Cezar
rhg: add a `Files` `Command` to prepare the `rhg files` subcommand...
r45923 }
Antoine Cezar
rhg: add `--revision` argument to `rhg files`...
r46108 impl<'a> FilesCommand<'a> {
pub fn new(rev: Option<&'a str>) -> Self {
FilesCommand { rev }
}
Antoine Cezar
rhg: add a `Files` `Command` to prepare the `rhg files` subcommand...
r45923
Antoine Cezar
rhg: add `--revision` argument to `rhg files`...
r46108 fn display_files(
&self,
ui: &Ui,
Simon Sapin
rust: introduce Repo and Vfs types for filesystem abstraction...
r46782 repo: &Repo,
Antoine Cezar
rhg: add `--revision` argument to `rhg files`...
r46108 files: impl IntoIterator<Item = &'a HgPath>,
) -> Result<(), CommandError> {
Raphaël Gomès
rhg: make output of `files` relative to the current directory and the root...
r46007 let cwd = std::env::current_dir()
.or_else(|e| Err(CommandErrorKind::CurrentDirNotFound(e)))?;
let rooted_cwd = cwd
Simon Sapin
rust: introduce Repo and Vfs types for filesystem abstraction...
r46782 .strip_prefix(repo.working_directory_path())
Raphaël Gomès
rhg: make output of `files` relative to the current directory and the root...
r46007 .expect("cwd was already checked within the repository");
let rooted_cwd = HgPathBuf::from(get_bytes_from_path(rooted_cwd));
Antoine Cezar
rhg: pass `ui` to `Command` `run`...
r46009 let mut stdout = ui.stdout_buffer();
Raphaël Gomès
rhg: make output of `files` relative to the current directory and the root...
r46007
Antoine Cezar
rhg: add a `Files` `Command` to prepare the `rhg files` subcommand...
r45923 for file in files {
Raphaël Gomès
rhg: make output of `files` relative to the current directory and the root...
r46007 stdout.write_all(relativize_path(file, &rooted_cwd).as_ref())?;
Antoine Cezar
rhg: add a `Files` `Command` to prepare the `rhg files` subcommand...
r45923 stdout.write_all(b"\n")?;
}
stdout.flush()?;
Ok(())
}
}
Antoine Cezar
hg-core: simplify `list_tracked_files` operation...
r46106
Antoine Cezar
rhg: add `--revision` argument to `rhg files`...
r46108 impl<'a> Command for FilesCommand<'a> {
fn run(&self, ui: &Ui) -> Result<(), CommandError> {
Simon Sapin
rust: introduce Repo and Vfs types for filesystem abstraction...
r46782 let repo = Repo::find()?;
repo.check_requirements()?;
Antoine Cezar
rhg: add `--revision` argument to `rhg files`...
r46108 if let Some(rev) = self.rev {
Simon Sapin
rust: introduce Repo and Vfs types for filesystem abstraction...
r46782 let files = list_rev_tracked_files(&repo, rev)
Antoine Cezar
rhg: add `--revision` argument to `rhg files`...
r46108 .map_err(|e| map_rev_error(rev, e))?;
Simon Sapin
rust: introduce Repo and Vfs types for filesystem abstraction...
r46782 self.display_files(ui, &repo, files.iter())
Antoine Cezar
rhg: add `--revision` argument to `rhg files`...
r46108 } else {
Simon Sapin
rust: introduce Repo and Vfs types for filesystem abstraction...
r46782 let distate = Dirstate::new(&repo).map_err(map_dirstate_error)?;
Simon Sapin
rust: replace most "operation" structs with functions...
r46751 let files = distate.tracked_files().map_err(map_dirstate_error)?;
Simon Sapin
rust: introduce Repo and Vfs types for filesystem abstraction...
r46782 self.display_files(ui, &repo, files)
Antoine Cezar
rhg: add `--revision` argument to `rhg files`...
r46108 }
}
}
/// Convert `ListRevTrackedFilesErrorKind` to `CommandError`
fn map_rev_error(rev: &str, err: ListRevTrackedFilesError) -> CommandError {
CommandError {
kind: match err.kind {
ListRevTrackedFilesErrorKind::IoError(err) => {
CommandErrorKind::Abort(Some(
utf8_to_local(&format!("abort: {}\n", err)).into(),
))
}
ListRevTrackedFilesErrorKind::InvalidRevision => {
CommandErrorKind::Abort(Some(
utf8_to_local(&format!(
Simon Sapin
rhg: add a test for --rev with a hex changeset ID...
r46611 "abort: invalid revision identifier {}\n",
Antoine Cezar
rhg: add `--revision` argument to `rhg files`...
r46108 rev
))
.into(),
))
}
Simon Sapin
rhg: allow specifying a changeset ID prefix...
r46646 ListRevTrackedFilesErrorKind::AmbiguousPrefix => {
CommandErrorKind::Abort(Some(
utf8_to_local(&format!(
"abort: ambiguous revision identifier {}\n",
rev
))
.into(),
))
}
Antoine Cezar
rhg: add `--revision` argument to `rhg files`...
r46108 ListRevTrackedFilesErrorKind::UnsuportedRevlogVersion(version) => {
CommandErrorKind::Abort(Some(
utf8_to_local(&format!(
"abort: unsupported revlog version {}\n",
version
))
.into(),
))
}
ListRevTrackedFilesErrorKind::CorruptedRevlog => {
CommandErrorKind::Abort(Some(
"abort: corrupted revlog\n".into(),
))
}
ListRevTrackedFilesErrorKind::UnknowRevlogDataFormat(format) => {
CommandErrorKind::Abort(Some(
utf8_to_local(&format!(
"abort: unknow revlog dataformat {:?}\n",
format
))
.into(),
))
}
},
}
}
/// Convert `ListDirstateTrackedFilesError` to `CommandError`
Antoine Cezar
hg-core: simplify `list_tracked_files` operation...
r46106 fn map_dirstate_error(err: ListDirstateTrackedFilesError) -> CommandError {
CommandError {
kind: match err.kind {
ListDirstateTrackedFilesErrorKind::IoError(err) => {
CommandErrorKind::Abort(Some(
utf8_to_local(&format!("abort: {}\n", err)).into(),
))
}
ListDirstateTrackedFilesErrorKind::ParseError(_) => {
CommandErrorKind::Abort(Some(
// TODO find a better error message
b"abort: parse error\n".to_vec(),
))
}
},
}
}