merge with stable

hgweb: avoid config object race with hgwebdir (issue4326) Turns out hgwebdir passes full repo objects to each hgweb request instance, but with a shared baseui. We explicitly break the sharing.

test-commandserver.py: filter path separator Was failing on Windows: -bundle.mainreporoot=$TESTTMP/repo +bundle.mainreporoot=$TESTTMP\repo

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

i18n-ru: update 'revsets' translation

i18n-ru: prompts fixed

whitespace: nuke triple blank lines in **.py

check-commit: spot growing whitespace We discourage PEP-8-style double blank lines, spot them creeping in.

strip: remove -b/--backup codepaths cset ba3bc6474bbf has removed this option. This commit just tidies the code that was associated to it. It also fixes the internal calls to the strip() function. Before this change, any function that thought it would want as a final safety to keep a partial backup bundle (bundling changes not linearly related to the current change being stripped), had to explicitly pass a backup="strip" option. With this change, these backups are always kept in case of an exception and always removed if there is no exception. Only full backups can be specified with backup=True or no full backups with backup=False.

simplemerge: remove dead code The following functions in simplemerge are dead code. I reran "make test-merge*" after this change, and it passed. Looks like cruft that we've been carrying since we nabbed this code from bzr.

basectx: add missing, merge, and branch args to dirty method This fixes a discrepency for basectx and classes that inherit from it. Now callers can pass these arguments to any context without an exception being raised.

basefilectx: move isexec and islink from memfilectx This will be used in the future for creating memctx objects from other store-type objects, such as a patch store or even another context.

tests: fix pyflakes test whitespace breakage

pushkey: wrap pushkey phase movement in a transaction Phases are not yet inside the transaction, but we need to prepare for it. So we wrap the phase movement inside a transaction.

push: wrap local phase movement in a transaction Phases are not yet inside the transaction, but we need to prepare for it. So we wrap the phase movement inside a transaction.

phase: wrap `hg phases` phase movement in a transaction Phases are not yet inside the transaction, but we need to prepare for it. So we wrap the phase movement inside a transaction.

mq: wrap qimport phase movement in a transaction Phases are not yet inside the transaction, but we need to prepare for it. So we wrap the phase movement inside a transaction.

mq: wrap qfinish phase movement in a transaction Phases are not yet inside the transaction, but we need to prepare for it. So we wrap the phase movement inside a transaction.

tests: change some #ifs to #requires

tests: replace exit 80 with #require

run-tests: add #require to abort full test This allows nuking a bunch of ugly hghave || exit 80 lines.

run-tests: add support for xunit test reports The Jenkins CI system understands xunit reports natively, so this will be helpful for anyone that wants to use Jenkins for testing hg or extensions that use run-tests.py for their testing.

contrib: add check-commit hook script to sanity-check commits

shelve: use `targetphase` while unbundling This removes the last manual phase movement in shelve.

changegroup: add a `targetphase` argument to `addchangegroup` This argument controls the phase used for the added changesets. This can be useful to unbundle in "secret" phase as required by shelve. This change aims at helping high-level code get rid of manual phase movement. An important milestone for having phases part of the transaction.

shelve: do not retract phase boundary by hand We rely on the internal mechanism to commit the changeset in the right state. This is similar to what the mq extension is doing. This is an important change as we plan to move phase movement with the transaction. Avoiding phase movement from high level code will avoid them the burden of transaction handling. It is also important to limit the need for transaction handling as this limits the odds of people messing up. Most common expected mess-up is to use a different transaction for changesets creation and phase adjustment.

commit: update the --secret code to use backupconfig and restoreconfig Those dedicated methods also preserve all associated data (eg: sources, lack of value).

rebase: do not retract phase boundary by hand We rely on the internal mechanism to commit the changeset in the right phase. This similar to what the mq extension is doing. This is an important change as we plan to includes phase movement within the transaction. Avoiding phase movement from high-level code will avoid the burden of transaction handling. It is also important to limit the need for transaction handling as this limits the odds of people messing up. Most common expected mess-up is code using a different transaction for changeset creation and phase adjustment.

config: fix restoreconfig of non existing config When the section, but no value existed, the `del` call raised a key error.

push: use stepsdone for obsmarkers push We do not have infrastructure to include obsolescence markers in the bundle2 push from core. But extensions may so we make sure it would not be sent twice.

push: introduce a discovery step for obsmarker The discovery step is still not doing anything smart. But this will allow extension to wrap it.

push: move the list of obsmarker to push into the push operation The list is now carried in the push operation, this will let extensions override it.

push: explicitly encode a list of obsmarkers to push Sending obsmarkers through pushkey requires extra encoding (since pushkey can't take binary content) and slicing (since we can hit http header limit). As we send all obsolescences markers that exists in the repo for each push, we used to just look at the content of the "obsolete" pushkey namespace (already encoded and sliced) and send its content. However, future changeset will make it possible to push only parts of the obsmarkers. To prepare this we now explicitly encode a list of markers. The list of markers is still "all of them" but future changeset will takes care of that. The new code uses a "_protected" method but that seems reasonable to keep it private as this is the is the only external user of it and this whole pushing obsmarker through pushkey things in fairly hacky already)

merge-tools: add a `premerge=keep-merge3` config option This value leaves premerge markers that includes the merge base too. This is a the same as what `internal:merge3` would do.

merge-tools: make premerge valid values extensible We want to introduce a version leaving merge3 style markers.

mergetools: add a test for premerge --keep It works! No surprise.

test-merge-tools: introduce a "revision 4" that merges with conflict We need conflicts to test the premerge=keep configuration.