obsstore: have the `mergemarkers` method return the number of new markers The mergemarkers function now returns the number of unknown markers in the stream that have been added to the obsstore. This is similar to what `obsstore.add` already does. The method gains a docstring in the process.

merge with i18n

test-bundle2: add obsolescence information to be exchanged To introduce a bundle2 way to exchange obsolescence markers, we need to have some information available to exchange. Introduce markers relevant to changesets involved in the exchange. The new markers reference the changesets as successor nodes of clowny (nonexistent) hashes so that other than being exchanged they have no effect. We introduce them in two waves as push is expected to be smart about the number of markers it exchanges sooner than pull.

help: only call doc() when it is callable `hg help -k` on my machine was aborting because the hg-prompt extension was inserting a string and not a function into help.helptable and help was blindly calling it. This patch changes keyword searching to be more robust against unexpected types.

i18n-pt_BR: synchronized with 6a8b8efb0641

merge with i18n

i18n-ja: synchronized with 0c838e7459a5

i18n-pt_BR: synchronized with 0c838e7459a5

repoview: fix typo in repoview.changelog Incidentally, this avoids the changelog cache being invalidated each time it's accessed on a repoview. On a filtering experiment on a repository the size of mozilla-central, this makes a significant difference: Before, running hg log -l 10 --time with about 8k changesets filtered out: time: real 1.490 secs (user 1.450+0.000 sys 0.040+0.000) After: time: real 0.540 secs (user 0.530+0.000 sys 0.010+0.000)

config: exit non zero on non-existent config option (issue4247) When running 'hg config no_such_option', hg exited with a zero exit code. This change now exits with a 1 if the config option does not exist.

merge with crew

bookmarks: refer to "the" active bookmark to clarify that there's only one This is a follow-on to 0c6cdbb697d9 that just makes a slight clarification.

memctx: allow extensions to determine what filectxfn should do Rev 650b5b6e75ed switched the contract for filectxfn from "raise IOError if file is missing" to "return None if file is missing". Out of tree extensions need to be updated for that, but for extensions interested in compatibility with both Mercurial <= 3.1 and default, it is next to impossible to introspect core Mercurial to figure out what to do. This patch adds a field to memctx for extensions to use.

revsetbenchmark: add revset with lazyset subtraction The added revset is used by obsolescence and currently results in recursion in __contains__ between 2 lazysets. We should have coverage of this revset.

debugrevlog: add chainlen column to --dump output