obsmarker: record the number of new markers in the transaction This lets hooks be notified about new markers in the repository.

obssmarker: add a bundle2 record with the number of markers added

obsmarker: write a message with the number of markers added through bundle2

bundle2: add an obsmarkers part handler This part contains a binary stream of obsolescence markers. Received markers are added to the repository.

obsolete: make encodemarkers a public function We'll need access to it for bundle2.

obsolete: move _encodemarkers next to _readmarkers

obsstore: store and preserve ondisk version

obsolete: have _readmarkers return the format version readmarkers is not returning the version of the format it read from. This will let callers know about the format and allow them to preserve it.

obsolete: support for any known obsstore format when reading or writing We can now read and write any known format. The list of known formats currently has one element (0). The obsstore itself is not aware of multiple formats yet and always uses format 0.

obsolete: move _fm0encodeonemarker next to _fm0readmarkers

obsolete: rename _encodeonemarker to _fm0encodeonemarkers This function encodes markers in version 0 of the format.

obsolete: extract the part of _readmarkers specific to format version 0 If we are to introduce new formats we need to be able call different functions for different formats. Creating a function for format version 0 is the first step.

obsolete: rename all _fm to _fm0 This change is because these formats are used for version 0 of the obsstore format. This is going to be useful in the future when we introduce new versions of the format.

obsolete: rename _fnodesize to _fmfnodesize All variables involved in the obsstore format are prefixed with `_fm`. `_fnodesize` was the exception. It is now back in line. This is meaningful as we'll need to distinguish between multiple versions of the obsstore format.

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

debugdag: stop wrongly sorting parents The dag being dumped is not in a format that allows us to reconstruct the original dag as the parent revisions are normalised.

obsolete: avoid slow, generic date parsing Simple profiling of `hg log -r .` revealed ~18,000 calls to mercurial.i18n.gettext() on the author's repository. The culprit was 3 _() calls in util.parsedate() multiplied by ~6000 obsmarkers originating from the parsing of obsmarkers. Changing the obsmarker code to parse the stored format of dates instead of going through a generic path eliminates these gettext() lookups and makes `hg log -r .` execute ~10% faster on the author's repo. The performance gain is proportional to the number of obsmarkers. The author attempted to patch util.parsedate() to avoid the gettext() lookups. However, that code is whacky and the author is jet lagged, so the approach was not attempted.

build: don't use -s flag for `which` `which -s` is a BSDism that doesn't exist on other versions of `which`. That means that even on Mac OS X, `make osx` breaks if you have another utils package installed (e.g. debianutils installed thru fink). Redirect output to /dev/null instead.