Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 948006 - dev-vcs/tortoisehg-6.9 stabilisation, then cleanup old
Summary: dev-vcs/tortoisehg-6.9 stabilisation, then cleanup old
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Stabilization (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: Sergey Torokhov
URL:
Whiteboard: scheduled on 2025-02-18
Keywords: CC-ARCHES, PullRequest
Depends on: 947315
Blocks: 948062
  Show dependency tree
 
Reported: 2025-01-12 20:44 UTC by Andreas Sturmlechner
Modified: 2025-02-19 20:17 UTC (History)
2 users (show)

See Also:
Package list:
dev-vcs/tortoisehg-6.9
Runtime testing required: ---
nattka: sanity-check+


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Andreas Sturmlechner gentoo-dev 2025-01-12 20:44:14 UTC
Scheduled for 2025-01-31 if no more blockers occur and existing one fixed.
Comment 1 Sergey Torokhov 2025-01-14 04:55:47 UTC
Upstream add changes to disable QTextCodec tests on Qt6 platform. But there are also several patches to fix other tests with Qt6 that affect sourcecode out of tests directory so dev-vcs/tortoisehg-6.6.3 revision will be required too. 

Maybe is it worth to add 6.9_rc0 pre-release with mentioned patches instead?
Comment 2 Larry the Git Cow gentoo-dev 2025-01-19 13:48:42 UTC
The bug has been referenced in the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12d10fba7c53fa06425b3c28d347ecd8ce35a55b

commit 12d10fba7c53fa06425b3c28d347ecd8ce35a55b
Author:     Sergey Torokhov <torokhov-s-a@yandex.ru>
AuthorDate: 2025-01-16 18:00:14 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2025-01-19 13:48:25 +0000

    dev-vcs/tortoisehg: 6.9 version bump
    
    Closes: https://bugs.gentoo.org/947315
    Bug: https://bugs.gentoo.org/948006
    Signed-off-by: Sergey Torokhov <torokhov-s-a@yandex.ru>
    Closes: https://github.com/gentoo/gentoo/pull/40166
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 dev-vcs/tortoisehg/Manifest               |  1 +
 dev-vcs/tortoisehg/tortoisehg-6.9.ebuild  | 82 +++++++++++++++++++++++++++++++
 dev-vcs/tortoisehg/tortoisehg-9999.ebuild | 12 ++---
 3 files changed, 89 insertions(+), 6 deletions(-)
Comment 3 NATTkA bot gentoo-dev Security 2025-01-19 14:00:42 UTC Comment hidden (obsolete)
Comment 4 Andreas Sturmlechner gentoo-dev 2025-01-19 14:07:19 UTC
> >=dev-vcs/mercurial-6.3[${PYTHON_USEDEP}]
> +               $(python_gen_cond_dep '>=dev-vcs/mercurial-6.9[${PYTHON_USEDEP}]' python3_13 )

I don't understand that construct. Why not simply have

> $(python_gen_cond_dep '>=dev-vcs/mercurial-6.3[${PYTHON_USEDEP}]' )
?
Comment 5 Sergey Torokhov 2025-01-19 14:39:07 UTC
There is was an issue [1] when was tortoisehg-6.3.2 version bump [2]


[1] https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/5826

[2] https://gitweb.gentoo.org/repo/gentoo.git/commit/dev-vcs/tortoisehg?id=5bac945c9c46e2b67d92f00bdf7f22a4cc454a7d

The dev-vcs/mercurial-6.8.2 from portage tree currently isn't set to support py3.13 but the line

> $(python_gen_cond_dep '>=dev-vcs/mercurial-6.9[${PYTHON_USEDEP}]' python3_13 

is left just to reinsure.
Comment 6 Sergey Torokhov 2025-01-19 14:49:42 UTC
On the other hand it's unlikely that similar issue will take place - I didn't try to add py3.13 compat for mercurial-6.8.2 and ran tests so this additional condition could be removed until problem will encounter.

I misunderstand if sanity check is due to only MUSL platform or at all? And why it is if it take place for all platforms.
Comment 7 Andreas Sturmlechner gentoo-dev 2025-01-19 15:05:13 UTC
(In reply to Sergey Torokhov from comment #5)
> The dev-vcs/mercurial-6.8.2 from portage tree currently isn't set to support
> py3.13
That's not something you have to care about using python_gen_cond_dep.

(In reply to Sergey Torokhov from comment #5)
> but the line
> 
> > $(python_gen_cond_dep '>=dev-vcs/mercurial-6.9[${PYTHON_USEDEP}]' python3_13 
> 
> is left just to reinsure.
That's not what it does. The second line simply overrides the first one wrt minimum dev-vcs/mercurial version, and since >=6.9 is not stable there yet, the depencency condition fails for this stabilisation bug.
Comment 8 Sergey Torokhov 2025-01-19 15:32:13 UTC
Should I then create pull request to drop this additional condition?
Could it be done without revision bump in this case?
Comment 9 Larry the Git Cow gentoo-dev 2025-02-11 20:57:06 UTC
The bug has been referenced in the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a8d6b6d4f1c3472063b22abf236c321fe60e903

commit 5a8d6b6d4f1c3472063b22abf236c321fe60e903
Author:     Sergey Torokhov <torokhov-s-a@yandex.ru>
AuthorDate: 2025-01-19 18:03:19 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2025-02-11 20:56:46 +0000

    dev-vcs/tortoisehg: 6.9, rm additional 'python_gen_cond_dep' condition
    
    Bug: https://bugs.gentoo.org/948006
    Signed-off-by: Sergey Torokhov <torokhov-s-a@yandex.ru>
    Closes: https://github.com/gentoo/gentoo/pull/40211
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 dev-vcs/tortoisehg/tortoisehg-6.9.ebuild  | 1 -
 dev-vcs/tortoisehg/tortoisehg-9999.ebuild | 1 -
 2 files changed, 2 deletions(-)
Comment 10 NATTkA bot gentoo-dev Security 2025-02-12 04:48:37 UTC Comment hidden (obsolete)
Comment 11 Larry the Git Cow gentoo-dev 2025-02-18 22:55:02 UTC
The bug has been referenced in the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f164097c5036a41a2d1528bc8274f14f968a07c1

commit f164097c5036a41a2d1528bc8274f14f968a07c1
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2025-02-18 22:53:52 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2025-02-18 22:53:52 +0000

    dev-vcs/tortoisehg: Split out py3_13 support into 6.9-r1
    
    So as to not block stabilisation of 6.9-r0.
    
    Bug: https://bugs.gentoo.org/948006
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 dev-vcs/tortoisehg/tortoisehg-6.9-r1.ebuild | 81 +++++++++++++++++++++++++++++
 dev-vcs/tortoisehg/tortoisehg-6.9.ebuild    |  2 +-
 2 files changed, 82 insertions(+), 1 deletion(-)
Comment 12 Andreas Sturmlechner gentoo-dev 2025-02-18 22:56:14 UTC
Arches please stabilise.
Comment 13 Sam James archtester Gentoo Infrastructure gentoo-dev Security 2025-02-19 11:04:54 UTC
x86 done
Comment 14 Sam James archtester Gentoo Infrastructure gentoo-dev Security 2025-02-19 11:04:55 UTC
amd64 done

all arches done
Comment 15 Larry the Git Cow gentoo-dev 2025-02-19 20:17:05 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f52e180114e3de5c335376cd2ebd4f9f9acfab8f

commit f52e180114e3de5c335376cd2ebd4f9f9acfab8f
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2025-02-19 15:05:16 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2025-02-19 20:16:23 +0000

    dev-vcs/tortoisehg: drop 6.6.3, 6.6.3-r1
    
    Closes: https://bugs.gentoo.org/948006
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 dev-vcs/tortoisehg/Manifest                   |  1 -
 dev-vcs/tortoisehg/tortoisehg-6.6.3-r1.ebuild | 81 ---------------------------
 dev-vcs/tortoisehg/tortoisehg-6.6.3.ebuild    | 81 ---------------------------
 3 files changed, 163 deletions(-)