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

configitems: register the 'convert.cvsps.logencoding' config

configitems: register the 'ui.interface.chunkselector' config

configitems: register the 'experimental.archivemetatemplate' config

configitems: register the 'rebase.singletransaction' config

configitems: register the 'server.bundle*' family of config All these config use the same function specifying a default value. We need to register them all at the same time.