upstream/mercurial-mirror Files · rust/rhg/src/commands/root.rs

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 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.

Simon Sapin - - Load All Authors

File last commit:

r46782:8a491439 default


                r47202:32da5891

stable

Download file

             root.rs
        
                    29 lines
            
             | 677 B
            
                | application/rls-services+xml
            
             |
                RustLexer
            
             / rust / rhg / src / commands / root.rs
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Antoine Cezar
    
rhg: add RootCommand using hg-core FindRoot operation to prepare `hg root`...

              r45592
            
      use crate::commands::Command;

        Antoine Cezar
    
rhg: simplify `FindRootError` handling...

              r45922
            
      use crate::error::CommandError;

        Antoine Cezar
    
rhg: add RootCommand using hg-core FindRoot operation to prepare `hg root`...

              r45592
            
      use crate::ui::Ui;

        Raphaël Gomès
    
rhg: use `format_bytes!` for error messages...

              r46598
            
      use format_bytes::format_bytes;

        Simon Sapin
    
rust: introduce Repo and Vfs types for filesystem abstraction...

              r46782
            
      use hg::repo::Repo;

        Antoine Cezar
    
rhg: add RootCommand using hg-core FindRoot operation to prepare `hg root`...

              r45592
            
      use hg::utils::files::get_bytes_from_path;

      pub const HELP_TEXT: &str = "

      Print the root directory of the current repository.

      Returns 0 on success.

      ";

        Antoine Cezar
    
rhg: pass `ui` to `Command` `run`...

              r46009
            
      pub struct RootCommand {}

        Antoine Cezar
    
rhg: ask the error message from `CommandError`...

              r45920
            
        Antoine Cezar
    
rhg: pass `ui` to `Command` `run`...

              r46009
            
      impl RootCommand {

          pub fn new() -> Self {

              RootCommand {}

        Antoine Cezar
    
rhg: ask the error message from `CommandError`...

              r45920
            
          }

        Antoine Cezar
    
rhg: add RootCommand using hg-core FindRoot operation to prepare `hg root`...

              r45592
            
      }

        Antoine Cezar
    
rhg: pass `ui` to `Command` `run`...

              r46009
            
      impl Command for RootCommand {

          fn run(&self, ui: &Ui) -> Result<(), CommandError> {

        Simon Sapin
    
rust: introduce Repo and Vfs types for filesystem abstraction...

              r46782
            
              let repo = Repo::find()?;

              let bytes = get_bytes_from_path(repo.working_directory_path());

        Raphaël Gomès
    
rhg: use `format_bytes!` for error messages...

              r46598
            
              ui.write_stdout(&format_bytes!(b"{}\n", bytes.as_slice()))?;

        Antoine Cezar
    
rhg: Do not return error when when we really mean ok in commands...

              r45919
            
              Ok(())

        Antoine Cezar
    
rhg: add RootCommand using hg-core FindRoot operation to prepare `hg root`...

              r45592
            
          }

      }

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

Antoine Cezar rhg: add RootCommand using hg-core FindRoot operation to prepare `hg root`...	r45592	use crate::commands::Command;
Antoine Cezar rhg: simplify `FindRootError` handling...	r45922	use crate::error::CommandError;
Antoine Cezar rhg: add RootCommand using hg-core FindRoot operation to prepare `hg root`...	r45592	use crate::ui::Ui;
Raphaël Gomès rhg: use `format_bytes!` for error messages...	r46598	use format_bytes::format_bytes;
Simon Sapin rust: introduce Repo and Vfs types for filesystem abstraction...	r46782	use hg::repo::Repo;
Antoine Cezar rhg: add RootCommand using hg-core FindRoot operation to prepare `hg root`...	r45592	use hg::utils::files::get_bytes_from_path;

		pub const HELP_TEXT: &str = "
		Print the root directory of the current repository.

		Returns 0 on success.
		";

Antoine Cezar rhg: pass `ui` to `Command` `run`...	r46009	pub struct RootCommand {}
Antoine Cezar rhg: ask the error message from `CommandError`...	r45920
Antoine Cezar rhg: pass `ui` to `Command` `run`...	r46009	impl RootCommand {
		pub fn new() -> Self {
		RootCommand {}
Antoine Cezar rhg: ask the error message from `CommandError`...	r45920	}
Antoine Cezar rhg: add RootCommand using hg-core FindRoot operation to prepare `hg root`...	r45592	}

Antoine Cezar rhg: pass `ui` to `Command` `run`...	r46009	impl Command for RootCommand {
		fn run(&self, ui: &Ui) -> Result<(), CommandError> {
Simon Sapin rust: introduce Repo and Vfs types for filesystem abstraction...	r46782	let repo = Repo::find()?;
		let bytes = get_bytes_from_path(repo.working_directory_path());
Raphaël Gomès rhg: use `format_bytes!` for error messages...	r46598	ui.write_stdout(&format_bytes!(b"{}\n", bytes.as_slice()))?;
Antoine Cezar rhg: Do not return error when when we really mean ok in commands...	r45919	Ok(())
Antoine Cezar rhg: add RootCommand using hg-core FindRoot operation to prepare `hg root`...	r45592	}
		}