match: fix bug caused by refactoring in cfc89398f710

revert: be more helpful on uncommitted merges BEFORE: $ hg revert abort: no files or directories specified (use --all to discard all changes) AFTER: $ hg revert abort: no files or directories specified (uncommitted merge, use --all to discard all changes, or 'hg update -C .' to abort the merge)

opener: add self._audit (issue2862)

cmdserver: write the hello message as one chunk on the 'o' channel This is a guaranteed by the protocol: clients know they need to read one chunk off of the 'o' channel and treat that as the hello message. They should ignore fields they don't recognize so they stay compatible with new versions of the server in case we decide to add something.

fileset: copied takes no arguments

revset and fileset: fix typos in parser error messages

fileset: use ParseError pos field correctly The pos field is intended to describe the position of the error - it should not be used for other potentially interesting information.

revset: fix parameter name in implementation of follow()

merge with stable

revert: be more explicit that changes are lost BEFORE: $ hg revert abort: no files or directories specified (use --all to revert all files) AFTER: $ hg revert abort: no files or directories specified (use --all to discard all changes)

dispatch: do not close the request repo Closing here means we've closed the repo passed to us in the request, which is not our responsibility. This is essential for bundlerepo, and possibly other localrepository subclasses who do something in their close().

hook: write hook output to ui fout descriptor output on stderr will also be written to ui.fout, unless sys.__stdout__ is passed in (see util.system), thus not changing previous behavior. This fixes a bug where hooks run through the command server would mess up with the command protocol, sending non-channeled data to the client.

merge with stable

check-code: don't mark debug messages for translation

i18n: remove translation of debug messages

cmdserver, runcommand: properly handle the client sending no arguments No real reason for a client to do this, but still possible. Previously if the client sent no arguments, a list with an empty string [''] would be used as the arguments to dispatch, which would cause hg to complain about an ambiguous command. Instead, we simply check for no arguments and use an empty list instead (which is equivalent to invoking hg with no args on the command line).

cmdserver: don't raise EOFError when trying to read 0 bytes from the client

i18n: extract docstrings from fileset module

Backed out changeset 1ec8bd909ac3 Debug messages should not be translated.

merge with stable

dispatch: translate alias debugging messages

parsers: fix localization markup of parser errors

fileset: use correct function name for hgignore in docstring docstring refereed to "resolved" instead of "hgignore"

url: catch UNC paths as yet another Windows special case (issue2808)

treediscovery: always return all remote heads Old discovery only returned incoming heads, not all of them (for changegroupsubset). New discovery must always return all of the remote heads (for getbundle). I failed to properly adjust treediscovery in cb98fed52495 when introducing setdiscovery. The actual observable problem was 'remote: unsynced changes' when trying to push a cset on one named branch to a server with a new cset on another named branch. This scenario is now tested in test-treediscovery.t.

merge with stable

config.sortdict: override clear method Overrides dict.clear. It's not currently used, but was broken for sortdict. Contributed by Stepan Koltsov <yozh@mx1.ru>

patch: fix typo in variable name

merge with stable

help/revsets: revset aliases can be defined on any config file