[PATCH] contrib/hg: sync with mercurial 7.0

[Julien Cristau]

# HG changeset patch
# User Julien Cristau <jcri...@mozilla.com>
# Date 1752075456 -7200
# Wed Jul 09 17:37:36 2025 +0200
# Node ID 17eb9e7dee667b3944c52bb07864b987c188371b
# Parent 9806d49225a505445a9b2bbde5037e3ffa6f1006
# EXP-Topic update-contrib-hg
contrib/hg: sync with mercurial 7.0

diff --git a/contrib/hg b/contrib/hg
--- a/contrib/hg
+++ b/contrib/hg
@@ -1,58 +1,51 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# mercurial - scalable distributed SCM
#
-# Copyright 2005-2007 Matt Mackall <m...@selenic.com>
+# Copyright 2005-2007 Olivia Mackall <oli...@selenic.com>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.

+from __future__ import annotations

import os
import sys

-cwd = os.getcwd()
-if cwd in sys.path:
- # Always remove current directory for Windows exe
- if hasattr(sys, "frozen") and os.name == 'nt':
- sys.path.remove(cwd)
- elif os.path.dirname(__file__) != cwd:
- sys.path.remove(cwd)
- sys.path.append(cwd)
-
-if hasattr(sys, "frozen") and os.name == 'nt':
- # Make `pip install --user` packages visible, because py2exe doesn't
- # process sitecustomize.py.
+# Make `pip install --user ...` packages available to the official Windows
+# build. Most py2 packaging installs directly into the system python
+# environment, so no changes are necessary for other platforms. The Windows
+# py2 package uses py2exe, which lacks a `site` module. Hardcode it according
+# to the documentation.
+if getattr(sys, 'frozen', None) == 'console_exe':
vi = sys.version_info
- sys.path.append(os.path.join(os.environ['APPDATA'], 'Python',
- 'Python%d%d' % (vi[0], vi[1]),
- 'site-packages'))
+ appdata = os.environ.get('APPDATA')
+ if appdata:
+ sys.path.append(
+ os.path.join(
+ appdata,
+ 'Python',
+ 'Python%d%d' % (vi[0], vi[1]),
+ 'site-packages',
+ )
+ )

-if os.environ.get('HGUNICODEPEDANTRY', False):
- try:
- reload(sys)
- sys.setdefaultencoding("undefined")
- except NameError:
- pass
-
-libdir = '@LIBDIR@'
-
-if libdir != '@' 'LIBDIR' '@':
- if not os.path.isabs(libdir):
- libdir = os.path.join(os.path.dirname(os.path.realpath(__file__)),
- libdir)
- libdir = os.path.abspath(libdir)
- sys.path.insert(0, libdir)
-
-# enable importing on demand to reduce startup time
try:
- if sys.version_info[0] < 3 or sys.version_info >= (3, 6):
- import hgdemandimport; hgdemandimport.enable()
+ from hgdemandimport import tracing
except ImportError:
- sys.stderr.write("abort: couldn't find mercurial libraries in [%s]\n" %
- ' '.join(sys.path))
+ sys.stderr.write(
+ "abort: couldn't find mercurial libraries in [%s]\n"
+ % ' '.join(sys.path)
+ )
sys.stderr.write("(check your install and PYTHONPATH)\n")
sys.exit(-1)

-from mercurial import dispatch
-dispatch.run()
+with tracing.log('hg script'):
+ # enable importing on demand to reduce startup time
+ import hgdemandimport
+
+ hgdemandimport.enable()
+
+ from mercurial import dispatch
+
+ dispatch.run()

[Yuya Nishihara]

On Wed, 9 Jul 2025 17:55:21 +0200, Julien Cristau wrote:
> # HG changeset patch
> # User Julien Cristau <jcri...@mozilla.com>
> # Date 1752075456 -7200
> # Wed Jul 09 17:37:36 2025 +0200
> # Node ID 17eb9e7dee667b3944c52bb07864b987c188371b
> # Parent 9806d49225a505445a9b2bbde5037e3ffa6f1006
> # EXP-Topic update-contrib-hg
> contrib/hg: sync with mercurial 7.0

The patch doesn't apply. Can you rebase?

> -cwd = os.getcwd()
> -if cwd in sys.path:
> - # Always remove current directory for Windows exe
> - if hasattr(sys, "frozen") and os.name == 'nt':
> - sys.path.remove(cwd)
> - elif os.path.dirname(__file__) != cwd:
> - sys.path.remove(cwd)
> - sys.path.append(cwd)

Last time we've synced the script at c23400682cbd, this part was left
unchanged. I don't know if it's still needed, but I think it's safer to
not remove local changes.

[Yuya Nishihara]

On Tue, 22 Jul 2025 12:37:23 +0200, Julien Cristau wrote:
> # HG changeset patch
> # User Julien Cristau <jcri...@mozilla.com>

> # Date 1753179736 -7200
> # Tue Jul 22 12:22:16 2025 +0200
> # Branch stable
> # Node ID a18ebf91161ce4b48ceb2a8634a5dfc20c375248
> # Parent e6e24115b428ac3bf18e1d342801395d94163334

> # EXP-Topic update-contrib-hg
> contrib/hg: sync with mercurial 7.0

Queued, thanks.