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

help/revsets: clean up whitespace between paragraphs

help/config: mention [revsetalias] section

fileset: add missing whitespace around operator

fileset: drop backwards SI size units - the power of 2 ones should be kiB, MiB, etc. - the power of 10 ones (SI standard) should be kB, MB, but we're currently using the industry traditional units elsewhere

remove bogus test copy

merge default branch into stable to mark the start of the code freeze

fileset: add a help topic Add crosslinking with patterns topic.

fileset: add copied predicate

fileset: add encoding() predicate

fileset: add size() predicate

fileset: add grep predicate

fileset: add some function help text

fileset: add hgignore

fileset: add resolved and unresolved predicates

fileset: prescan parse tree to optimize status usage We only call status if needed to avoid walking the working directory or comparing manifests. Similarly, we scan for whether unknown or ignored files are mentioned so we can include them.

fileset: add support for file status predicates This forcibly walks the tree looking for unknown and ignored files, which is suboptimal. A better approach would scan the tree first to find required status components and skip the status check entirely if it's unused.

fileset: add some basic predicates

match: introduce basic fileset support

match: allow passing a context object to match core

fileset: drop matchfn This is now built into contexts

scmutil: match no longer accepts repo objects

scmutil: switch match users to supplying contexts The most appropriate context is not always clearly defined. The obvious cases: For working directory commands, we use None For commands (eg annotate) with single revs, we use that revision The less obvious cases: For commands (eg status, diff) with a pair of revs, we use the second revision For commands that take a range (like log), we use None

scmutil: match now accepts a context or a repo

context: add a match builder method This is groundwork for matching against filesets in contexts

help/hgignore: refer to the builtin help instead of external URLs

sslutil: make messages for Python without certificate handling more helpful We now explain why there is no certificate to verify and do not give hints about cacerts when they can't be used anyway.

sslutil: fall back to commonName when no dNSName in subjectAltName (issue2798) Any entries in subjectAltName would prevent fallback to using commonName, but RFC 2818 says: If a subjectAltName extension of type dNSName is present, that MUST be used as the identity. Otherwise, the (most specific) Common Name field in the Subject field of the certificate MUST be used. We now only consider dNSNames in subjectAltName. (dNSName is known as 'DNS' in OpenSSL/Python.)

merge with i18n

svn subrepos: work around checkout obstructions (issue2752) We do this by ensuring the working copy is clean and then blowing away the working copy and replacing it with one from the desired path. We could probably use 'svn switch' to do this more efficiently, but there's some subtle logic required to get that right and this is more likely to work reliably.

update: check wc.dirty() before setting overwrite=True merge.update() was missing a few dirtiness checks from workingcontext, including subrepo cleanliness checks. Using wc.dirty() instead of one-off checks for various forms of dirtiness will be significantly safer.

tags: don't allow environment errors to be raised from _writetagscache See https://bitbucket.org/tortoisehg/thg/issue/719

help/config: replace docutils markup

test-i18n, i18n-pt_BR: update test message This changes both a test and a translation, so I'm sending a patch; please let me know if I should push this directly to i18n instead.

config: undo change of empty line definition We don't allow spaces in front of comment markers

patch: make filestore store data in memory and fallback to fs

i18n: merge in latest Romanian translations

i18n-ro: synchronized with 3c7907dc95ca

i18n-ro: outstanding changes

help/config: quote config section names consistently

help/config: fix small typo

help/config: do not refer to config files as hgrc files

help/config: fix 'Mercurial' casing

revset: add desc(string) to search in commit messages Like keyword(), but does not search in filenames and users. No grepdesc() or descgrep() added, because it might be bad to introduce grepfoo() versions of too many string searches.

revset: update sorting of symbols

http: fix variable name in unexpected response message