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.

test: cleanup verbosity variant from fatelog test Unlike the '{obsfate}' keyword defined in 'hg-evolve', the definition of hg fatelog in test-obsmarker-template.t is not verbosity dependent. Remove useless call to fatelog -v and fatelog -q.

test: rename obsfate template alias We will introduce an obsfate templatekw in the next patch that will conflict with the obsfate template in the test file, rename the one in test file to avoid this collision.

obsolete: add a devel.user.obsmarker In tests, we often want to use a different username in obs-markers without changing the default user. Add a 'devel.user.obsmarker'.

strip: factor out update target selection The same algorithm was used in two places: one to find out which commit shall become the parent of wdir, and the other to prepare the wdir when keeping changes. Factoring it out prevents inconsistent changes in either occurrence.