formatter: verify number of arguments passed to write functions zip() takes the shortest length, which can be a source of bug.

help: unify handling of DEPRECATED/EXPERIMENTAL keywords This fixes listexts() to exclude translated "(DEPRECATED)" marker correctly. On the other hand, help_() doesn't need translated keywords, but I don't think it's worth to separate untranslated keywords just for it.

help: include parens in DEPRECATED/EXPERIMENTAL keywords In some languages that have no caps, "DEPRECATED" and "deprecated" can be translated to the same byte sequence. So it is too wild to exclude messages by _("DEPRECATED").

help: define list of keywords that should be excluded from non-verbose output This list will be reused by the other deprecated/experimental handling.

merge with stable

unbundle: cleanly abort on unknown bundle2 feature The exception wasn't caught and resulted in a traceback.

phases: return zero for no-op operations (issue4751) (BC) It is rather unhelpful to return 1 if there were no changes because the request matches the current state of phases. So we just undo that.

help: add config.troubleshooting section at the top

dispatch: don't stack trace on commands like `hg .log` This used to stack trace because it raised a util.Abort which wasn't handled in this block. We now handle it. Additionally, we error out earlier instead of plodding on and showing the "log" entry of the plain `hg help` output.

gitweb, monoblue: port highlighting linked lines from paper This is adapted from 41c4bdd1d585, fbfe5748ef3e and f3393d458bf5.

gitweb, monoblue: fix vertical align of spans in .sourcelines Empty lines in file view could produce an inexplicable margin before the next line (most noticeable in browsers on webkit/blink engine). That was making empty lines seem taller than the rest. Instead of using default vertical align, let's set it to 'top'. This issue is actually present in paper, and only recently got into gitweb (2239626369f5) and monoblue (119202d4d7a4). There's a bit more to it in paper, so that will be dealt with in a future patch. Recipe to see live: preferably using a webkit/blink browser, such as chromium, browse a file with empty lines, e.g. https://selenic.com/hg/file/3.5/README#l8 Selecting a block of text that includes empty lines will reveal white "breaks" in the selection. Highlighted line (#l8) also shows such a break below itself.

merge: fix mergestate comment

rebase: avoid losing branch commits with --keepbranch (issue4835)

lock.release: do not unlink inherited locks This is part of a series that will allow locks to be inherited by subprocesses in limited circumstances. A subprocess unlinking a lock will lead to potential corruption from other concurrent processes.

lock: add a method to reacquire the lock after subprocesses exit This is part of a series that will allow locks to be inherited by subprocesses in limited circumstances.

lock: add a method to prepare the lock for inheritance This is part of a series that will allow locks to be inherited by subprocesses in limited circumstances.

lock: introduce state to keep track of inheritance This is part of a series that will allow locks to be inherited by subprocesses in limited circumstances. In upcoming patches we will refer to this state.

error: add an exception to indicate lock inheritance API contract violations

clone: check update rev for being True In 30be3aeb5344, there was an attempt to fallback to looking up the update revision assuming it was always a rev but the documentation states: True means update to default rev, anything else is treated as a revision Therefore, we should only fallback to looking up the update rev if it is not True. This bug was found in hg-git and I couldn't think of a test that does this in pure Mercurial since the source repository is checked for the revision as well (and therefore gracefully falls back).

clone: fix over-indented continuation line

resolve: consistently describe re-merge + unresolved

mercurial: add debugextensions command (issue4676) Add debugextensions command to help users debug their extension problems. If there are no extensions command prints nothing, otherwise it prints names of extension modules. If quiet or verbose option is not specified it prints(after extensions name) last version of mercurial in which given module was tested for non internal modules or not tested with user mercurial version. If verbose is specified it prints following information for every extension: extension name, import source, testedwith and buglink information. Extensions are printed sorted by extension name.

dispatch: stop warning about EPIPE in --debug mode It seems silly for "hg --debug manifest | less" to print a scary message after the user hits "q" in less. hg should just exit silently instead, since EPIPE on stdout is a perfectly reasonable result.

rebase: don't rebase obsolete commit whose successor is already rebased This patch avoids unnecessary conflicts to resolve during rebase for the users of changeset evolution. This patch modifies rebase to skip obsolete commits if they are being rebased on their successors. It introduces a new rebase state 'revprecursor' for these revisions that are being skipped and a new message to inform the user of what is happening. This feature is gated behind the config flag experimental.rebaseskipobsolete When an obsolete commit is skipped, the output is: not rebasing 14:9ad579b4a5de "I", already in destination as 17:fc37a630c901 "K"

check-code: forbid mutable value for default argument default value are common to all call. Using mutable value is a classical source of bug in Python. We forbid it. The regexp (Courtesy of Matt Mackall) is only catching such value on the first line of a definition, but that will be good enough for now.

httpconnection: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

transplant: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

mq: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs. The underlying function already handle "None" as an option value, so we do not need to do anything else.

largefiles: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

largefiles: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

largefiles: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

largefiles: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

largefiles: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

largefiles: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

largefiles: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

largefiles: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

largefiles: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

histedit: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

templater: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

templater: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

templater: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

templater: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

templater: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

addremove: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

match: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs. We added support for None in the underlying function in the parent commit. therefore we do not need to do anything but passing None.

match: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

match: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

match: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

addremove: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

tag: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs. We just added support of None for the underlying function, so nothing else the required.

commit: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

lock: move acquirefn call to inside the lock We're going to need to call it again as part of reinitialization after a subprocess inherits the lock.

localrepo: call lock.lock with releasefn as a keyword arg We'll be adding an acquirefn argument soon, and this makes that clearer.

copies: move debug statement to appropriate place

bidmerge: choose shortest list of diverge and rename/delete warnings Slightly less arbitrary than choosing the first set.

copies: rename diverge2 to divergeset for clarity

copies: begin separating mergecopies sides

copies: rename ctx() to getfctx() for clarity

monoblue: port code selection without line numbers from gitweb This is adapted from 2239626369f5. It also fixes issue4790 in monoblue; tab characters now have meaningful width on the modified pages (file view, file diff, changeset).

help: copy-edit description of ui.supportcontact