mercurial-devel | Failed pipeline for branch/default | a1fa920e
Pipeline #46897 has failed! Project: mercurial-devel ( https://foss.heptapod.net/mercurial/mercurial-devel ) Branch: branch/default ( https://foss.heptapod.net/mercurial/mercurial-devel/-/commits/branch/default ) Commit: a1fa920e ( https://foss.heptapod.net/mercurial/mercurial-devel/-/commit/a1fa920e74c0078c329e3fd7153b99ac2d36da4c ) Commit Message: tests: stop excluding the pycompat module from ... Commit Author: Matt Harbison Pipeline #46897 ( https://foss.heptapod.net/mercurial/mercurial-devel/-/pipelines/46897 ) triggered by Administrator ( https://foss.heptapod.net/root ) had 1 failed job. Job #463841 ( https://foss.heptapod.net/mercurial/mercurial-devel/-/jobs/463841/raw ) Stage: tests Name: test-c -- You're receiving this email because of your account on foss.heptapod.net. ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D12427: dispatch: stop sometimes generating silly blackbox entries
valentin.gatienbaron created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY When hg is interrupted, it creates ui.log like this: 1970/01/01 00:00:00 user @ (62488)> killed! exited 255 after 1.78 seconds This is due to a scoping problem: two different uses of the name "msg" collide. So rename one of them. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D12427 AFFECTED FILES mercurial/dispatch.py CHANGE DETAILS diff --git a/mercurial/dispatch.py b/mercurial/dispatch.py --- a/mercurial/dispatch.py +++ b/mercurial/dispatch.py @@ -269,7 +269,7 @@ ferr.write(inst.format()) return -1 -msg = _formatargs(req.args) +formattedargs = _formatargs(req.args) starttime = util.timer() ret = 1 # default of Python exit code on unhandled exception try: @@ -308,7 +308,7 @@ req.ui.log( b"commandfinish", b"%s exited %d after %0.2f seconds\n", -msg, +formattedargs, return_code, duration, return_code=return_code, To: valentin.gatienbaron, #hg-reviewers Cc: mercurial-patches, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Re: 6.1.1 and review delay
On 4/1/22 11:35, Raphaël Gomès wrote: We do have a somewhat concerning bug in `test-install.t` in the CI after rebuilding some base images, but the reason why is not clear yet. For the record I created a topic to get more information about that failure: https://foss.heptapod.net/mercurial/mercurial-devel/-/jobs/462754 (as we discussed, it seems like some version of setuptools might be either buggy or incompatible with some of our changes) -- Pierre-Yves David ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
6.1.1 and review delay
Hi all, I've been quite busy this week, not just for personal reasons, but also try to find the source of a use-after-free in the Rust extensions. This means that 6.1.1 will be delayed for at most a few days next week until I fix this bug (or fail to do so reasonably quickly). I've tried to review all patches for stable, so the rest of the 6.1.1 release should be relatively quick to fix. We do have a somewhat concerning bug in `test-install.t` in the CI after rebuilding some base images, but the reason why is not clear yet. I will start reviewing patches for default again soon. (not even an April's fool joke ;) ) Raphaël ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D12426: rhg: don't skip empty lines when iterating over changeset lines
martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REVISION SUMMARY
The first empty line in the changeset indicates the end of headers and
beginning of description. Callers can't know figure out where that
position is if empty lines are skipped.
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D12426
AFFECTED FILES
rust/hg-core/src/revlog/changelog.rs
CHANGE DETAILS
diff --git a/rust/hg-core/src/revlog/changelog.rs
b/rust/hg-core/src/revlog/changelog.rs
--- a/rust/hg-core/src/revlog/changelog.rs
+++ b/rust/hg-core/src/revlog/changelog.rs
@@ -51,17 +51,17 @@
impl ChangelogRevisionData {
/// Return an iterator over the lines of the entry.
pub fn lines() -> impl Iterator {
-self.bytes
-.split(|b| b == '\n')
-.filter(|line| !line.is_empty())
+self.bytes.split(|b| b == '\n')
}
/// Return the node id of the `manifest` referenced by this `changelog`
/// entry.
pub fn manifest_node() -> Result {
-match self.lines().next() {
-None => Ok(NULL_NODE),
-Some(x) => Node::from_hex_for_repo(x),
+let manifest_node_hex = self.lines().next().unwrap();
+if manifest_node_hex.is_empty() {
+Ok(NULL_NODE)
+} else {
+Node::from_hex_for_repo(manifest_node_hex)
}
}
}
To: martinvonz, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D12425: rhg: allow loading repos with `bookmarksinstore` requirement
martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY `rhg` does support bookmarks, so it can load repos with the `bookmarksinstore` requirement just as well as other repos. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D12425 AFFECTED FILES rust/hg-core/src/requirements.rs CHANGE DETAILS diff --git a/rust/hg-core/src/requirements.rs b/rust/hg-core/src/requirements.rs --- a/rust/hg-core/src/requirements.rs +++ b/rust/hg-core/src/requirements.rs @@ -92,6 +92,8 @@ // not should opt out by checking `has_sparse` and `has_narrow`. SPARSE_REQUIREMENT, NARROW_REQUIREMENT, +// rhg doesn't care about bookmarks at all yet +BOOKMARKS_IN_STORE_REQUIREMENT, ]; // Copied from mercurial/requirements.py: @@ -103,6 +105,11 @@ #[allow(unused)] pub(crate) const NARROW_REQUIREMENT: = "narrowhg-experimental"; +/// Bookmarks must be stored in the `store` part of the repository and will be +/// share accross shares +#[allow(unused)] +pub(crate) const BOOKMARKS_IN_STORE_REQUIREMENT: = "bookmarksinstore"; + /// Enables sparse working directory usage #[allow(unused)] pub(crate) const SPARSE_REQUIREMENT: = "exp-sparse"; To: martinvonz, #hg-reviewers Cc: mercurial-patches, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
