memctx: remove files since it is now inherited This is a slight change in definition from memctx returning only modified() but its parent's definition is more consistent with other contexts' behavior so we can call this change a slight bugfix and step in the right direction.

memctx: remove description since it is now inherited

memctx: remove date since it is now inherited

memctx: remove user since it is now inherited

memctx: remove p2 since it is now inherited

memctx: remove p1 since it is now inherited

memctx: remove __getitem__ since it is now inherited

memctx: remove __nonzero__ since it is now inherited

memctx: remove __int__ since it is now inherited

memctx: remove __str__ since it is now inherited

memctx: call super.__init__ instead of duplicating code

memctx: inherit from committablectx This patch marks the start of having memctx inherit from committablectx, thereby making it a full-fledged context that will eventually grow the ability to perform diffing and also merging.

committablectx: fix _manifest doc string

context: fix wrong indentation from renaming method

push: use bundle2 to push phases when available We now use a bundle2 container to push all phase updates at the same time. This is a significant step forward, even if further refactoring is needed to unify phase push with the changeset push.

pushkey: add an ``encode`` function This function is just a shorthand for ``encoding.fromlocal``. It will help hiding the encoding business from other code exchanging pushkey data over the wire.

bundle2: add ``pushkey`` support After ``listkeys`` we can now include ``pushkey`` request in a bundle2. The part uses a very simple scheme closest as possible to the current wireproto command for ``pushkey``. We may eventually decide for a more sophisticated part format before the protocol becomes final.

pushkey: add a ``decode`` function This function is just a shorthand for ``decoding.fromlocal``. It will help hiding the encoding business from other code exchanging pushkey data over the wire.

pull: when remote supports it, pull phase data alongside changesets We use bundle2 to retrieve the remote phase data at the same time as changesets. This reduces the amount of requestis and should improve consistency as the server can ensure nothing changed between the retrieval of those parts.

getbundle: support of listkeys argument when bundle2 is used A new ``listkeys`` is supported by getbundle. It is a list of namespaces whose content should be included in the bundle. An appropriate entry has been added to the wireproto map of getbundle arguments and a new bundle2 capability is advertised. There are still no codes that request such parts in core mercurial.

getbundle: raise error if extra arguments are provided for bundle10 New arguments are most likely to be supported by bundle20 (and above) only.

bundle: introduce a listkey handler This makes it possible to handle listkeys-related data stored in a bundle2. There are no producers yet.

pull: split remote phases retrieval from actual application We want to be able to retrieve phases information through bundle2. The logic to apply remote phases will not change.

wireproto: use pushkey.decodekey

pushkey: introduce an ``decodekeys`` function This function provides a standardized way to exchange pushkey content over the wire.

wireproto: use pushkey.encodekey

pushkey: introduce an ``encodekeys`` function This function provides a standardized way to exchange pushkey content over the wire.

bundle2: add more phase movement in the test To test phase exchange with bundle2 we need some phase movement to happen. Appropriate logging is added to track those changes.

bundle2: use non-publishing repo in test If we are going to test usage of bundle for phases exchange, we need some phase movements to be exchanged.

bundle2: use a smarter template for test We use a more compact template that includes phase information.

getbundle: declare type of parameters In addition to listing the expected options for ``getbundle``, we also list their types and handle the encoding/decoding automatically. This should make it easier for extensions to transmit additional information to getbundle.

bundle2: introduce a ``caps20to10`` function This function factors the creation of appropriate entries to use in ``bundlecaps`` argument of ``getbundle``. This cleans up code calling ``getbundle`` and helps its usage in more part of the code.

bundle2: introduce a bundle2caps function The process of decoding remote bundle2caps blob into a dictionary is cumbersome. We move it into a small helper function. This will clarify code that reads bundle2 capabilities of peers and helps using it in new places.

exchange: reinsert comment in the right place Unrelated new code was inserted between the original comment and the related code block.

docker: check for docker.io first

buildrpm: include release version in .tar.gz name Official releases are fully indentified by the version number, these builds are not. Specs are however traditionally not versioned.

buildrpm: remove prompt for uncommitted changes - it was a bad idea We want a command that is useful in scripts, not an interactive command.

buildrpm: collect code for building local hg and using it in one place

buildrpm: various minor cleanup

fix_bytes: loosen blacklist matching requirements On my Linux machine, paths seen by 2to3 include the build directory. We switch from an exact to substring match to allow 2to3 to work in more environments.

convert: only consider shamap revisions converted if they still exists Rollback or strip could leave a Mercurial repo with a shamap with revisions no longer in the repository. To ensure reliable conversions we now check that the commit actually exists and consider it non-existing if it doesn't exist.

convert: introduce hascommitfrommap sink method Mercurial has stable revision identifiers and rollback and strip. Revisions referenced in the shamap are thus not necessarily still present but we can easily check for it. Subversion do not have stable identifiers and no rollback or strip(?). We must thus assume that all revisions referenced from a shamap still must be present. This method is similar to hascommitforsplicemap but different ...

convert: rename sink hascommit to hascommitforsplicemap The name 'hascommit' sounds like something generic ... but it might also throw exceptions in specific cases and it is thus (apparently) only useful for splicemap.

tests: better tests for two-way convert

mergetools.hgrc: add minimal configuration for editmerge The ``editmerge`` script is shipped in contrib and opens an editor on every conflicting file. It needs minimal configuration to inject the config marker in the file before opening. Otherwise it behaves the same as ``internal:local`` and bad things happen.

merge with stable

convert: drastically speed up git conversions We would formerly exec git cat-file once for every commit, plus once for every tree and file we wnated to read. This switches to using git cat-file's batch mode, which is much, much, much faster. Using this new code, converting the git git repo to hg ran in 106 minutes on my machine. Using the stock mercurial, it required 1239 minutes. I believe this to be typical of the speedups we will see form this patch.

vim: use try catch in vim plugin to avoid conflicts

bundle2: raise BundleValueError error for stream level unsupported params This ensures both consistency and smooth propagation over the wire.

bundle2: support None parttype in BundleValueError This will be used for errors at the stream level.

bundle2: ignore advisory part with unknown parameters Advisory parts are advisory. If a handler exists but does not support the proper parameters, we can safely ignore it. Test has been updated to include this case.

bundle2: enforce all parameters in a part to be handled Once we picked a handler, we check that all mandatory parameter keys are properly supported. If not we raise an exception. We added a test for this case. The code now fails for any part with unknown mandatory parameters. We will ignore such errors for advisory parts in a later changeset.

bundle2: declare supported parameters for all handlers We now update all existing handlers with the supported parameters information.

bundle2: make it possible to declare params handled by a part handler If we are to enforce the mandatory aspect of parameter, we need a way to discover what a handler supports. The best option we end up with is this a simple declaration of known parameters at registration time. We simply plug the list of parameters on the function object because Python lets us do that and there is no benefit for a more complicated way. One of the handlers is updated for example and testing.

bundle2: support transmission of params error over the wire We picked a null character to split each parameter during the transfer. This is fragile if the same character is used in parameter name. However other codes will already behave in a strange way in that case, so we are not introducing any regression. A better format may be picked for the final version of the protocol.

bundle2: introduce a ``params`` attribute to BundleValueError We'll first use it for unsupported mandatory parameters on parts.

bundle2: introduce a parttype attribute to BundleValueError We will use the Exception for more that just unknown part type.

bundle2: rename b2x:error:unknownpart to b2x:error:unsupportedcontent This is a backward compatibility breakage per se. But bundle2 was explicitly flagged as experimental, and this is one an error path anyway. So the worse possible outcome from this change is to still have a crash but with a different message.

bundle2: move exception classes into the error module Exceptions should have known their place.

bundle2: rename UnknownPartError to BundleValueError We are going to raise exceptions for a wider range of cases: unsupported mandatory stream and part parameters. We rename the exception with a wider name.