[PATCH] copyright: update to 2025

6 views
Skip to first unread message

Matt Harbison

unread,
Jan 3, 2025, 5:49:45 PM1/3/25
to thg...@googlegroups.com
# HG changeset patch
# User Matt Harbison <matt_h...@yahoo.com>
# Date 1735835119 18000
# Thu Jan 02 11:25:19 2025 -0500
# Branch stable
# Node ID 5ddaf2b2833010fa5397295fa0c3c6a8c9ce29cb
# Parent 0ff1072c3279ff18a1a6481e3287e711f273fc01
copyright: update to 2025

diff --git a/contrib/packaging/macos/setup.py b/contrib/packaging/macos/setup.py
--- a/contrib/packaging/macos/setup.py
+++ b/contrib/packaging/macos/setup.py
@@ -56,7 +56,7 @@
CFBundleIdentifier = 'org.pythonmac.tortoisehg.thg',
CFBundleName = 'TortoiseHg',
NSRequiresAquaSystemAppearance = 'Yes', # disable dark mode
- NSHumanReadableCopyright = 'Copyright 2008-2024 Steve Borho and others',
+ NSHumanReadableCopyright = 'Copyright 2008-2025 Steve Borho and others',
CFBundleShortVersionString = os.environ['THG_CFVERSION'],
CFBundleVersion = os.environ['THG_CFVERSION']
)
diff --git a/doc/source-cs/conf.py b/doc/source-cs/conf.py
--- a/doc/source-cs/conf.py
+++ b/doc/source-cs/conf.py
@@ -44,7 +44,7 @@

# General information about the project.
project = u'TortoiseHg'
-copyright = u'2010-2024, Steve Borho and others'
+copyright = u'2010-2025, Steve Borho and others'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
diff --git a/doc/source-ja/conf.py b/doc/source-ja/conf.py
--- a/doc/source-ja/conf.py
+++ b/doc/source-ja/conf.py
@@ -44,7 +44,7 @@

# General information about the project.
project = u'TortoiseHg'
-copyright = u'2010-2024, Steve Borho、他'
+copyright = u'2010-2025, Steve Borho、他'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
diff --git a/doc/source/conf.py b/doc/source/conf.py
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -44,7 +44,7 @@

# General information about the project.
project = u'TortoiseHg'
-copyright = u'2010-2024, Steve Borho and others'
+copyright = u'2010-2025, Steve Borho and others'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -31,8 +31,8 @@
from distutils.spawn import spawn, find_executable
from i18n.msgfmt import Msgfmt

-thgcopyright = 'Copyright (C) 2010-2024 Steve Borho and others'
-hgcopyright = 'Copyright (C) 2005-2024 Matt Mackall and others'
+thgcopyright = 'Copyright (C) 2010-2025 Steve Borho and others'
+hgcopyright = 'Copyright (C) 2005-2025 Matt Mackall and others'


def _walklocales():
diff --git a/tortoisehg/hgqt/about.py b/tortoisehg/hgqt/about.py
--- a/tortoisehg/hgqt/about.py
+++ b/tortoisehg/hgqt/about.py
@@ -77,7 +77,7 @@
self.copyright_lbl = QLabel()
self.copyright_lbl.setAlignment(Qt.AlignmentFlag.AlignCenter)
self.copyright_lbl.setText('\n'
- + _('Copyright 2008-2024 Steve Borho and others'))
+ + _('Copyright 2008-2025 Steve Borho and others'))
self.vbox.addWidget(self.copyright_lbl)
self.courtesy_lbl = QLabel()
self.courtesy_lbl.setAlignment(Qt.AlignmentFlag.AlignCenter)
diff --git a/tortoisehg/hgqt/run.py b/tortoisehg/hgqt/run.py
--- a/tortoisehg/hgqt/run.py
+++ b/tortoisehg/hgqt/run.py
@@ -61,7 +61,7 @@
config_nofork = None

shortlicense = b'''
-Copyright (C) 2008-2024 Steve Borho <st...@borho.org> and others.
+Copyright (C) 2008-2025 Steve Borho <st...@borho.org> and others.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
'''

Matt Harbison

unread,
Jan 3, 2025, 9:42:12 PM1/3/25
to TortoiseHg Developers
On Friday, January 3, 2025 at 5:49:45 PM UTC-5 Matt Harbison wrote:
# HG changeset patch
# User Matt Harbison <matt_h...@yahoo.com>
# Date 1735835119 18000
# Thu Jan 02 11:25:19 2025 -0500
# Branch stable
# Node ID 5ddaf2b2833010fa5397295fa0c3c6a8c9ce29cb
# Parent 0ff1072c3279ff18a1a6481e3287e711f273fc01
copyright: update to 2025

I thought it might be worth fixing this before doing the release:


I guess they removed QTextCodec in Qt6, and replaced it with a less functional QStringConverter.  I have no idea how to make that work for the locale hacking that's being done in the tests.

Yuya Nishihara

unread,
Jan 4, 2025, 8:32:59 AM1/4/25
to 'Matt Harbison' via TortoiseHg Developers
On Fri, 3 Jan 2025 18:42:12 -0800 (PST), 'Matt Harbison' via TortoiseHg Developers wrote:
> On Friday, January 3, 2025 at 5:49:45 PM UTC-5 Matt Harbison wrote:
>
> # HG changeset patch
> # User Matt Harbison <matt_h...@yahoo.com>
> # Date 1735835119 18000
> # Thu Jan 02 11:25:19 2025 -0500
> # Branch stable
> # Node ID 5ddaf2b2833010fa5397295fa0c3c6a8c9ce29cb
> # Parent 0ff1072c3279ff18a1a6481e3287e711f273fc01
> copyright: update to 2025

Queued, thanks.

> I thought it might be worth fixing this before doing the release:
>
> https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/6010
>
> I guess they removed QTextCodec in Qt6, and replaced it with a less
> functional QStringConverter. I have no idea how to make that work for the
> locale hacking that's being done in the tests.

I don't remember. If the tests pass, it's probably okay to remove these.

Matt Harbison

unread,
Jan 4, 2025, 9:59:39 PM1/4/25
to TortoiseHg Developers
They passed with PyQt5 (apparently), but I don't think tests have ever been run with PyQt6.  Maybe I'll see if there's a way to skip those tests for now until somebody feels motivated to fix them properly.
 
Reply all
Reply to author
Forward
0 new messages