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.

configitems: register the 'web.logourl' config

configitems: register the 'web.logoimg' config

configitems: register the 'web.labels' config

configitems: register the 'web.hidden' config

configitems: register the 'web.guessmime' config

configitems: register the 'web.deny_push' config

configitems: register the 'web.contact' config

configitems: register the 'web.cache' config

configitems: register the 'web.allowzip' config

configitems: register the 'web.allow_push' config

configitems: register the 'web.allowpull' config

configitems: register the 'web.allowgz' config

configitems: register the 'web.allowbz2' config

configitems: register the 'email.reply-to' config

configitems: register the 'email.cc' config

configitems: register the 'email.bcc' config

configitems: register the 'logtoprocess.uiblocked' config

configitems: register the 'logtoprocess.develwarn' config

configitems: register the 'logtoprocess.command' config

configitems: register the 'logtoprocess.commandfinish' config

configitems: register the 'logtoprocess.commandexception' config

configitems: register the 'pager.pager' config

configitems: register the 'web.maxchanges' config

configitems: register the 'web.maxfiles' config

configitems: register the 'web.maxshortchanges' config

configitems: register the 'web.motd' config

configitems: register the 'web.name' config

configitems: register the 'web.push_ssl' config

configitems: register the 'web.view' config

configitems: fix registration for 'blackbox.track' config Default mutable values could be problematic. Use a lambda that returns the value instead. Thanks to martin for catching this bug.

status: copy-edit and improve --terse and --verbose help

templater: store revisions as ints so min/max won't compare them as strings Because a template value has no explicit type (like ancient PHP), ifcontains() has to coerce the type of the needle. Before, it was always converted to a string, which meant any container type should be a list/dict of strings. This no longer works since we've introduced min/max functions. In order to work around the untyped nature of templater, this patch adds a type specifier to hybrid dict/list. It isn't named as "valuetype" since the _hybrid class can also wrap a dict.

fsmonitor: update to match new dirstate refactor The dirstate was refactored so dirstate._map is now at dirstate._map._map. Same for _copymap, is not _map.copymap. It seems none of the mercurial tests cover this stuff, but it was caught by our Facebook extension tests. Differential Revision: https://phab.mercurial-scm.org/D945

doc: rename README to README.rst Many hosting services consider README without extension as plain text. By using .rst extension, we bring better formatting on many services (e.g. bitbucket).

test: use current user in the multi-user amend scenario The obsfate template keyword that will be introduced in a later patch distinguish between current user and other users when displaying the obsfate users. Update the test before for clarity.