codemod: use pycompat.isdarwin This is done by: sed -i "s/pycompat\.sysplatform == 'darwin'/pycompat.isdarwin/" **/*.py Plus a manual change to `sslutil.py` which involves indentation change that cannot be done by `sed`. Differential Revision: https://phab.mercurial-scm.org/D1035

codemod: use pycompat.isposix This is done by: sed -i "s/pycompat\.osname == 'posix'/pycompat.isposix/" **/*.py Differential Revision: https://phab.mercurial-scm.org/D1036

codemod: use pycompat.iswindows This is done by: sed -i "s/pycompat\.osname == 'nt'/pycompat.iswindows/" **/*.py sed -i "s/pycompat\.osname != 'nt'/not pycompat.iswindows/" **/*.py sed -i 's/pycompat.osname == "nt"/pycompat.iswindows/' **/*.py Differential Revision: https://phab.mercurial-scm.org/D1034

pycompat: define operating system constants As suggested by Ryan in D1019, it's cleaner if we use defined constants instead of `osname == 'nt'` everywhere. Differential Revision: https://phab.mercurial-scm.org/D1033

hgweb: do not import uuid immediately to avoid its side effect With hgdemandimport disabled (chg's case), `import uuid` has an immediate side effect calling `ctypes.util.find_library` trying to locate the `libuuid` library. This happens at `import` time before `dispatch.run()`. The call trace is like: File "hg/hg", line 54, in <module> from mercurial import ( File "hg/mercurial/dispatch.py", line 24, in <module> from . import ( File "hg/mercurial/commands.py", line 23, in <module> from . import ( File "hg/mercurial/help.py", line 33, in <module> from .hgweb import ( File "hg/mercurial/hgweb/__init__.py", line 20, in <module> from . import ( File "hg/mercurial/hgweb/hgweb_mod.py", line 14, in <module> from .common import ( File "hg/mercurial/hgweb/common.py", line 15, in <module> import uuid File "/usr/lib64/python2.7/uuid.py", line 404, in <module> lib = ctypes.CDLL(ctypes.util.find_library(libname)) The problem is, `ctypes.util.find_library` will execute `sh -c '/sbin/ldconfig -p 2>/dev/null'` on Python <= 2.7.12. The output of `sh` may pollute the terminal: shell-init: error retrieving current directory: getcwd: cannot access parent directories: No such file or directory This patch moves `import uuid` so its side-effect can only happen after the cwd check in `dispatch._getlocal`. Therefore the terminal won't be polluted by importing `uuid`. Differential Revision: https://phab.mercurial-scm.org/D1024

check-code: forbid platform.system() See the previous patches for the reason. Differential Revision: https://phab.mercurial-scm.org/D1021

largefiles: do not use platform.system() See the previous patch for the reason. Differential Revision: https://phab.mercurial-scm.org/D1020

logtoprocess: do not use platform.system() See the previous patch for the reason. Differential Revision: https://phab.mercurial-scm.org/D1019

selectors2: do not use platform.system() `platform.system()` may have a side effect spawning a shell executing `uname -p`, which may print a warning when the current directory is removed: shell-init: error retrieving current directory: getcwd: cannot access parent directories: No such file or directory This patch changes selectors2 to test the `sys.platform` string, which is a much safer way to detect Jython. Jython's `sys.platform` looks like this: Jython 2.7.1 (default:0df7adb1b397, Jun 30 2017, 19:02:43) [OpenJDK 64-Bit Server VM (Oracle Corporation)] on java1.8.0_144 Type "help", "copyright", "credits" or "license" for more information. >>> import sys >>> sys.platform 'java1.8.0_144 ( ==linux2 for targets )' Differential Revision: https://phab.mercurial-scm.org/D1018

dispatch: when --pager=no is passed, also disable pager on req.repo.ui With a future chg change, `req.repo` could be set and currently it is unaffected by `--pager=on`. This patch makes it so. This could make one of the test cases in `test-pager.t` pass with future chg changes. Differential Revision: https://phab.mercurial-scm.org/D990

bundle2: immediate exit for ctrl+c (issue5692) 21c2df59a regressed bundle2 by catching all exceptions and trying to handle them. The old behavior was to allow KeyboardInterrupts to throw and not have graceful cleanup, which allowed it to exit immediately. Let's go back to that behavior. Differential Revision: https://phab.mercurial-scm.org/D960

exewrapper: format with clang-format A few *s move around, some spaces around parens, a couple of braces. Nothing remarkable. Differential Revision: https://phab.mercurial-scm.org/D1032

util: add clang-format control comment around struct and format macro clang-format is not a fan of PyObject_HEAD. Differential Revision: https://phab.mercurial-scm.org/D1031

mpatch: reflow two oddly formatted else blocks with clang-format Differential Revision: https://phab.mercurial-scm.org/D1029

mpatch: re-wrap wide line with clang-format Differential Revision: https://phab.mercurial-scm.org/D1027

bdiff: remove trailing newlines Differential Revision: https://phab.mercurial-scm.org/D1009

bdiff: rewrap function prototypes per clang-format Differential Revision: https://phab.mercurial-scm.org/D1008

bdiff: re-wrap lines per clang-format A few too-wide lines corrected, and some places where clang-format prefers to wrap after the binary operator instead of before. I don't feel strongly, so I'm leaving the auto-format result as "after the binary operator". Differential Revision: https://phab.mercurial-scm.org/D1007

bdiff: remove extra space after * per clang-format Differential Revision: https://phab.mercurial-scm.org/D1006

bdiff: fix misplaced comma in macro definition with clang-format Differential Revision: https://phab.mercurial-scm.org/D1005

bdiff: format header file with clang-format Differential Revision: https://phab.mercurial-scm.org/D1004

bdiff: sort includes using clang-format Differential Revision: https://phab.mercurial-scm.org/D1003

build: "make deb" failed when the base path contained spaces With these changes, all the commands triggered by "make deb" use proper quoting and succeed even when invoked from a directory containing spaces.

build: chg build was failing when the base directory contained spaces

build: initial version detection by make deb/rpm was missing quoting

build: make install in "/doc" failed if the destination dir contained spaces This and the following commits try to add the necessary quoting in the build scripts to make the process more robust. The target for now is rendering "make deb" successful even when the base directory contains spaces (eg. "/opt/mercu rial"). The build process should succeed without scattering files in spurious directories (eg.: "/opt/mercu/usr/bin/hg").

strip: take branch into account when selecting update target (issue5540) Test contributed by Matt Harbison Keep the same behavior in most cases (i.e. first parent of the first root of stripped changsets), but if the branch differs from wdir's, try to find another parent of stripped commits that is on the same branch.

scmutil: factor out building of transaction summary callback In registersummarycallback(), we extra generic bits of the existing "reportsummary" function into a decorator which will be used in forthcoming changesets to add new summary callbacks.

scmutil: factor out transaction name lookup in registersummarycallback() Add an inner txmatch function in registersummarycallback() factoring out the logic to determine if the transaction matches a particular sources set. We'll reuse this function to add some new report logic in the new changeset.

configitems: register the annotate diff options