mercurial@50331: new changeset (1 on stable)
New changeset (1 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/22d7cb8174ef changeset: 50331:22d7cb8174ef branch: stable tag: tip user:Jordi Gutiérrez Hermoso date:Thu Oct 27 17:34:02 2022 -0400 summary: histedit: fix diff colors -- Repository URL: https://www.mercurial-scm.org/repo/hg ___ Mercurial-devel mailing list Mercurial-devel@lists.mercurial-scm.org https://lists.mercurial-scm.org/mailman/listinfo/mercurial-devel
Re: [PATCH] histedit: fix diff colors
pushed on stable though heptapod. Thanks On 3/15/23 19:55, Jordi Gutiérrez Hermoso wrote: # HG changeset patch # User Jordi Gutiérrez Hermoso # Date 1666906442 14400 # Thu Oct 27 17:34:02 2022 -0400 # Node ID 28cad0a7eb26a3bb0edd4623d1ec1c9169eb49e2 # Parent dd42156b6441f6b8356100b4228fa16fbf95f669 histedit: fix diff colors The problem here is that indexing a bytestring gives you integers, not chars, so the comparison to b'+' ends up being wrong. We don't really have a way to test curses output, so no tests to verify the correctness of this behaviour. diff --git a/hgext/histedit.py b/hgext/histedit.py --- a/hgext/histedit.py +++ b/hgext/histedit.py @@ -1427,11 +1427,11 @@ pgup/K: move patch up, pgdn/J: move patc for y in range(0, length): line = output[y] if diffcolors: -if line and line[0] == b'+': +if line.startswith(b'+'): win.addstr( y, 0, line, curses.color_pair(COLOR_DIFF_ADD_LINE) ) -elif line and line[0] == b'-': +elif line.startswith(b'-'): win.addstr( y, 0, line, curses.color_pair(COLOR_DIFF_DEL_LINE) ) ___ Mercurial-devel mailing list Mercurial-devel@lists.mercurial-scm.org https://lists.mercurial-scm.org/mailman/listinfo/mercurial-devel -- Pierre-Yves David ___ Mercurial-devel mailing list Mercurial-devel@lists.mercurial-scm.org https://lists.mercurial-scm.org/mailman/listinfo/mercurial-devel
Re: [PATCH 1 of 4 stable] cext: fix for PyLong refactoring in CPython 3.12
Queued¹ (by Pierre-Yves, reviewed by me) all except the redundant
Cargo.toml patch with slightly one modified patch due to formatting.
[1]
https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/505/
On 3/7/23 19:23, Mads Kiilerich wrote:
# HG changeset patch
# User Mads Kiilerich
# Date 1678202751 -3600
# Tue Mar 07 16:25:51 2023 +0100
# Branch stable
# Node ID 1efa4e96f6461bf071b28d66b13bdb67fdc91fc6
# Parent 8a65b43457aba02741bedabe100823d3041af0b5
cext: fix for PyLong refactoring in CPython 3.12
Compiling Mercurial with Python 3.12 a5 would fail with:
mercurial/cext/dirs.c: In function '_addpath':
mercurial/cext/dirs.c:19:44: error: 'PyLongObject' {aka 'struct _longobject'}
has no member named 'ob_digit'
19 | #define PYLONG_VALUE(o) ((PyLongObject *)o)->ob_digit[0]
|^~
mercurial/cext/dirs.c:97:25: note: in expansion of macro 'PYLONG_VALUE'
97 | PYLONG_VALUE(val) += 1;
| ^~~~
mercurial/cext/dirs.c:19:44: error: 'PyLongObject' {aka 'struct _longobject'}
has no member named 'ob_digit'
19 | #define PYLONG_VALUE(o) ((PyLongObject *)o)->ob_digit[0]
|^~
mercurial/cext/dirs.c:108:17: note: in expansion of macro 'PYLONG_VALUE'
108 | PYLONG_VALUE(val) = 1;
| ^~~~
mercurial/cext/dirs.c: In function '_delpath':
mercurial/cext/dirs.c:19:44: error: 'PyLongObject' {aka 'struct _longobject'}
has no member named 'ob_digit'
19 | #define PYLONG_VALUE(o) ((PyLongObject *)o)->ob_digit[0]
|^~
mercurial/cext/dirs.c:145:23: note: in expansion of macro 'PYLONG_VALUE'
145 | if (--PYLONG_VALUE(val) <= 0) {
| ^~~~
This was caused by
https://github.com/python/cpython/commit/c1b1f51cd1632f0b77dacd43092fb44ed5e053a9
.
diff --git a/mercurial/cext/dirs.c b/mercurial/cext/dirs.c
--- a/mercurial/cext/dirs.c
+++ b/mercurial/cext/dirs.c
@@ -13,7 +13,11 @@
#include "util.h"
+#if PY_VERSION_HEX >= 0x030C00A5
+#define PYLONG_VALUE(o) ((PyLongObject *)o)->long_value.ob_digit[0]
+#else
#define PYLONG_VALUE(o) ((PyLongObject *)o)->ob_digit[0]
+#endif
/*
* This is a multiset of directory names, built from the files that
___
Mercurial-devel mailing list
Mercurial-devel@lists.mercurial-scm.org
https://lists.mercurial-scm.org/mailman/listinfo/mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@lists.mercurial-scm.org
https://lists.mercurial-scm.org/mailman/listinfo/mercurial-devel
mercurial@50335: 4 new changesets (3 on stable)
4 new changesets (3 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/0d3690f8ce2a changeset: 50332:0d3690f8ce2a branch: stable user:Mads Kiilerich date:Tue Mar 07 16:25:51 2023 +0100 summary: cext: fix for PyLong refactoring in CPython 3.12 https://www.mercurial-scm.org/repo/hg/rev/805d4a462abb changeset: 50333:805d4a462abb branch: stable user:Mads Kiilerich date:Tue Mar 07 16:45:54 2023 +0100 summary: py3: fix for Python 3.12 emitting SyntaxWarning on invalid escape sequences https://www.mercurial-scm.org/repo/hg/rev/972f3e5c94b8 changeset: 50334:972f3e5c94b8 branch: stable user:Mads Kiilerich date:Tue Mar 07 17:13:38 2023 +0100 summary: statprof: with Python 3.12, lineno is (more) often None https://www.mercurial-scm.org/repo/hg/rev/c5e93c915ab6 changeset: 50335:c5e93c915ab6 bookmark:@ tag: tip parent: 50324:dd42156b6441 parent: 50334:972f3e5c94b8 user:Raphaël Gomès date:Mon Mar 20 23:16:14 2023 +0100 summary: branching: merge stable into default -- Repository URL: https://www.mercurial-scm.org/repo/hg ___ Mercurial-devel mailing list Mercurial-devel@lists.mercurial-scm.org https://lists.mercurial-scm.org/mailman/listinfo/mercurial-devel
mercurial-devel | Failed pipeline for branch/default | c5e93c91
Pipeline #64597 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: c5e93c91 ( https://foss.heptapod.net/mercurial/mercurial-devel/-/commit/c5e93c915ab668abf3eb695e6a6df0c91643eb5a ) Commit Message: branching: merge stable into default Commit Author: Raphaël Gomès Pipeline #64597 ( https://foss.heptapod.net/mercurial/mercurial-devel/-/pipelines/64597 ) triggered by Raphaël Gomès ( https://foss.heptapod.net/raphael.gomes ) had 1 failed job. Job #1793408 ( https://foss.heptapod.net/mercurial/mercurial-devel/-/jobs/1793408/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@lists.mercurial-scm.org https://lists.mercurial-scm.org/mailman/listinfo/mercurial-devel
