phase: use standard syntax for command line flags We don't mark them as literal text and we mention the short option the first time we talk about a given flag.

phase: fix RST markup (use ``...`` for literal text)

phase: lowercase option help, rephrase slightly

filectx: fix cmp() of file starting with '\1\n' If file data starts with '\1\n', it will be escaped in the revlog to create an empty metadata block, thus adding four bytes to the size in the revlog size index. There's no way to detect that this has happened in filelog.size() faster than decompressing each revision [1]. For filectx.cmp(), we have the size of the file in the working directory available. If it differs by exactly four bytes, it may be this case, so do a full comparison. [1]: http://markmail.org/message/5akdbmmqx7vq2fsg

merge with stable

merge with i18n

merge with i18n

i18n-pt_BR: synchronized with e6c44dbe902f

merge with i18n

i18n-ru: spellcheck

i18n-ru: editorial for vocabulary words. Edited for: backup, bundle, repository, checkout

i18n-ru: editorial for hg help hgignore

tests: make {date|age} template output independent of the current date

phases: make outgoing object and discovery aware of exclusion The outgoing object gains an "excluded" members holding all changesets which were excluded because there where secret. The core discovery code now remove secret changeset from discovery by default. This means that any command relying on discovery will exclude secret changeset. Most notable one are outgoing and bundle. (But bundle with and explicit ``--base`` still allow to bundle outgoing changeset.

discovery: introduce outgoing object for result of findcommonoutgoing Simplifies client logic in multiple places since it encapsulates the computation of the common and, more importantly, the missing node lists. This also allows an upcomping patch to communicate precomputed versions of these lists to clients.

commands: make bundle use heads computed by findoutgoing

revlog: improve docstring for findcommonmissing

commands: bump copyright year

phase: mark messages for i18n

phase: fix up help string

phase: drop reference to working directory phase

phases: add a phases command to display and manipulate phases

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