annotate: append newline after non newline-terminated file listings The last line of a non newline-terminated file would mix with the first line of the next file in multiple-file listings before this patch. Possible compatibility issue: no longer possible to tell from the annotate output if the file is terminated by new line or not.

subrepo: avoid syncing bookmarks twice on clone (issue3191) Clone internally handles bookmark synchronization. (Fix spotted by Eric Blood)

revlog: clarify strip docstring "readd" -> "re-add" I misread it as "read".

merge with stable

filesets: use example with quotes for encoding predicate A user on IRC was confused that "encoding(ASCII)" works and "encoding(UTF-8)" fails with "parse error: encoding requires an encoding name".

phases: use graph and phase name in exchange test

phases: ``{phase}`` template keyword display the phase name ``{phaseidx}`` is providing the phase index as integer. This integer representation is useful when people need to use the fact that phase are ordered. Test keep using the number version for readability purpose.

phases: add a phasestr method on context

phases: add list of string to access phase name

phases: fix phase synchronization on push The bugs seemed to show up when element not in future common changeset should hold new hold phase data. The whole phase push machinery was rewritten in the process.

phases: implements simple revset symbol This changeset adds ``public()``, ``draft()`` and ``secret`` symbol for revset.

phases: store phase values in constant instead of using raw integer Phases constant are named after the phase name. Usage of integer have been replaced by proper constant.

sslutil: abort properly if no certificate received for https connection According to the documentation SSLSocket.getpeercert() can return None.

sslutil: work around validator crash getting certificate on failed sockets The previous workaround for correct handling of wrapping of failing connections might be enough to prevent this from happening, but the check here makes this function more robust.

sslutil: reorder validator code to make it more readable

sslutil: show fingerprint when cacerts validation fails

sslutil: handle setups without .getpeercert() early in the validator This simplifies the code and makes the flow more obvious and reduces the indentation level.

sslutil: verify that wrap_socket really wrapped the socket This works around that ssl.wrap_socket silently skips ssl negotiation on sockets that was connected but since then has been reset by the peer but not yet closed at the Python level. That leaves the socket in a state where .getpeercert() fails with an AttributeError on None. See http://bugs.python.org/issue13721 . A call to .cipher() is now used to verify that the wrapping really did succeed. Otherwise it aborts with "ssl connection failed".

largefiles: remove pasted code Refactor and remove pasted code from lfcommands.py

largefiles: add tests for uncovered codepaths (issue3092) Add tests for lfconvert codepaths where: * largefiles have been both renamed and relinked * .hgtags has invalid content

largefiles: add error checking to tags conversion (issue3092) Check for errors when parsing .hgtags during lfconvert, and skip lines that don't parse or refer to invalid changesets.

largefiles: don't reference uninitialized variable (issue3092)

merge with i18n

i18n-ru: synchronized with e251250ac20b

i18n-ru: revsets predicates translated

i18-ru: debug commands translated

i18n-ru: user prompt related strings translated

i18n-ru: tanslated record-zeroconf

merge with stable

rebase: reinstate old-style rev spec support for the source and base (issue3181) As of b12362ab13e7 (first released as part of Mercurial 2.0), the rebase command accepted ONLY revsets for the source and base arguments and no longer accepted old-style revision specifications. As a result, some revision names were no longer recognised, e.g. hg rebase --base br-anch abort: unknown revision 'br'! These arguments are now interpreted first as old-style revision specifications, then as revsets when no matching revision is found. This restores backwards compatibility with releases prior to 2.0.