merge with stable

merge with i18n

i18n-ru: fix RST breakage spotted by test-gendoc test-gendoc complained: % extracting documentation from ru checking for parse errors + gendoc-ru.txt:5686: (WARNING/2) Field list ends without a blank line; unexpected unindent. + gendoc-ru.txt:8327: (WARNING/2) Definition list ends without a blank line; unexpected unindent.

i18n-ru: undo fix buildbot breakage Buildbot complained: $ python check-translation.py *.po + ru.po:9576:fatal(promptchoice): number of choices differs between msgid and msgstr + [1] Prompt text was obviously wrong.. because it didn't include a prompt.

contrib: add emacs mode for *.t files

phase: attach phase to the transaction instead of the lock The phase cache file is no longer written on lock release, it is now handled by the transaction (as changesets and obsolescence markers are). (Hooray) As we stop relying on the lock to write phase, repos with no existing phase information will need to wait for a phase move or a strip to happen in order to get the first write in the `phaseroots` file. This explain the change in test-inherit-mode.t. This should not have any side effects but in very obscure cases where people interact with pre-2.1 and post-2.1 versions of Mercurial on the same repo while having MQ patches applied but the MQ extension disabled from time to time. A case unlikely enough to not be worth preserving the old behavior with awful hacks.

phase: extract the phaseroots serialization in a dedicated method In most case, the file creation logic will be handled by the transaction itself. The write method has to stay around for the case where the repository is modified outside a transaction (strip).

transaction: add a file generation mechanism A new `transaction.addfilegenerator` function is added. It allows external code to register files to be generated. See inline documentation for details. It is important to gather all file creation logic on the transaction as at some point we'll want to mimic the "pre-transaction-commit" logic that we use for revlog. I'm refering to the logic that lets hooks see the result of the transaction before it actually gets committed.

transaction: backup file in a dedicated "namespace" File backup may conflict with other "journal.*" file. We add a fixed part in the backup name file to prevent it.

transaction: use `self.journal` to create backup file Transaction journal name is "journal" in most case, but it can be something else. We use the appropriate attribute to create the file.

memctx: add note about p2

memfilectx: add remove and write methods Similar to the previous patch for workingfilectx, this patch will allow abstracting localrepo.remove / write method to refactor working directory code but instead operate on files in memory.

workingfilectx: add remove and write methods This patch will allow abstracting localrepo.remove / write method to refactor working directory code.

memctx: create a filectxfn if it is not callable This will allow future patches to construct a memctx based on another context or any other store-type object.

test-patchbomb.t: work around Python change d579866d6419 (issue4188) Python 2.7.7 and later (as well as some ubuntu/debian packages of 2.7.6) include a fix that makes the email module more pedantically correct for MIME boundaries, but this breaks our tests. We work around this by filtering the output of any 'hg email' invocations in the test that produce MIME messages.

phase: add a transaction argument to retractboundary We now pass a transaction option to this phase movement function. The object is currently not used by the function, but it will be in the future. All call sites have been updated. Most call sites were already enclosed in a transaction for a long time. The handful of others have been recently updated in previous commit.

phase: add a transaction argument to advanceboundary We now pass a transaction option to this phase movement function. The object is currently not used by the function, but it will be in the future. All call sites have been updated. Most call sites were already enclosed in a transaction for a long time. The handful of others have been recently updated in previous commit. The retractboundary function remains to be upgraded.

pull: pre-filter remote phases before moving local ones We were relying on the phase internals to filter out redundant phase information from remove. However as we plan to integrate phase movement inside the transaction, we want to avoid useless transaction creation on no-op pulls. Therefore we filter out all the information that already matches the current repository state. This will let us create a transaction only when there is actual phase movement needed.

test-check-commit-hg.t: automatically test all 'draft() and ::.' changesets We introduce a test-check-commit-hg.t file that will happily run the check-commit file on all draft changeset under the working directory. This should help newcomers to catch up with the rules. (And will helps old timer from time to time).

i18n-ru: syncronized with 45a01832cad1

merge with i18n

i18n-ru: sync with ad56fc55cbc3 (fuzzies)

i18n-ru: sync with ad56fc55cbc3 (missing strings)

i18n-ru: update 'revisions' translation