Mercurial > hg
view rust/hg-cpython/src/exceptions.rs @ 44667:b561f3a68e41 stable
discovery: avoid wrongly saying there are nothing to pull
We can get in a situation where a revision passed through `hg pull --rev REV`
are available on the server, but not a descendant of the advertised server
heads.
For example the server could lying be during heads advertisement, to hide some
pull request. Or obsolete/hidden content could be explicitly pulled.
So in this case the lookup associated to `REV` returned successfully, but the
normal discovery will find all advertised heads already known locally. This flip
a special boolean `anyinc` that will prevent any fetch attempt, preventing `REV`
to be pulled over.
We add three line of code to detect this case and make sure a pull actually
happens.
My main target is to make some third party extensions happy (I expect the
associated test to move upstream with the extension). However this fix already
make some of the `infinitepush` test happier.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Mon, 06 Apr 2020 00:24:57 +0200 |
parents | 7a01778bc7b7 |
children | 3bd77c64bc74 |
line wrap: on
line source
// ancestors.rs // // Copyright 2018 Georges Racinet <gracinet@anybox.fr> // // This software may be used and distributed according to the terms of the // GNU General Public License version 2 or any later version. //! Bindings for Rust errors //! //! [`GraphError`] exposes `hg::GraphError` as a subclass of `ValueError` //! but some variants of `hg::GraphError` can be converted directly to other //! existing Python exceptions if appropriate. //! //! [`GraphError`]: struct.GraphError.html use cpython::{ exc::{IOError, RuntimeError, ValueError}, py_exception, PyErr, Python, }; use hg; py_exception!(rustext, GraphError, ValueError); impl GraphError { pub fn pynew(py: Python, inner: hg::GraphError) -> PyErr { match inner { hg::GraphError::ParentOutOfRange(r) => { GraphError::new(py, ("ParentOutOfRange", r)) } hg::GraphError::WorkingDirectoryUnsupported => { match py .import("mercurial.error") .and_then(|m| m.get(py, "WdirUnsupported")) { Err(e) => e, Ok(cls) => PyErr::from_instance(py, cls), } } } } } py_exception!(rustext, PatternError, RuntimeError); py_exception!(rustext, PatternFileError, RuntimeError); py_exception!(rustext, HgPathPyError, RuntimeError); impl PatternError { pub fn pynew(py: Python, inner: hg::PatternError) -> PyErr { match inner { hg::PatternError::UnsupportedSyntax(m) => { PatternError::new(py, ("PatternError", m)) } } } } impl PatternFileError { pub fn pynew(py: Python, inner: hg::PatternFileError) -> PyErr { match inner { hg::PatternFileError::IO(e) => { let value = (e.raw_os_error().unwrap_or(2), e.to_string()); PyErr::new::<IOError, _>(py, value) } hg::PatternFileError::Pattern(e, l) => match e { hg::PatternError::UnsupportedSyntax(m) => { PatternFileError::new(py, ("PatternFileError", m, l)) } }, } } } py_exception!(shared_ref, AlreadyBorrowed, RuntimeError);