bookmarks: introduce a bmstore to manage bookmark persistence Bookmarks persistence still showed a fair amount of its legacy as a monkeypatching extension. This encapsulates all bookmarks serialization and parsing in a single class, and offers a single location where other bookmarks storage engines can be substituted in. As a result, many files no longer import the bookmarks module, which strikes me as an encapsulation win. This doesn't do anything to the current bookmark state yet, but I'm hoping put that in the bmstore class as well.

run-tests: add --time option to log times for each test --time also prints out the wall-clock time each test takes in descending order.

run-tests: remove resultslock since it serves no useful purpose Each child process has its own copy of the results dict, so all access to the results dict is serial.

run-tests: use pickle to send results from children to parent JSON would probably be preferable, but it isn't available for Python 2.4 or 2.5.

bookmark: remove useless line in `validdest` This case is already covered by the `if old == new:` conditional at the start of the function.

bookmark: issue a single call to `allsuccessors` per loop Update to this code was minimalist when `allsuccessors` argument were changed from a list to a set. As this code is getting my attention again I realised we can drastically simplify this part of the code by issue a single call to `allsuccessors`.

bookmark: simplify mutability check in `validdest` There is no need to check phase by hand. We already have a ctx method for that.

Merge with stable

Merge with mpm

bundle: add revset expression to show bundle contents (issue3487) bundle() revset expression returns all changes that are present in the bundle file (no matter whether they are in the repo or not). Bundle file should be specified via -R option.

tags: add formatter support

manifest: add formatter support

status: use condwrite to avoid zero-width format string hack

formatter: add condwrite method This makes handling conditional output tidier

run-tests: skip unnecessary operations on the args in the child proces The arguments are already sorted and never empty.

test-subrepo: adapt for Windows after 17c030014ddf Fixes @@ -606,7 +606,7 @@ issue3276_ok $ rm repo/s/b $ hg -R repo revert --all - reverting repo/.hgsubstate + reverting repo\.hgsubstate reverting subrepo s $ hg -R repo update 1 files updated, 0 files merged, 0 files removed, 0 files unresolved on Windows

test-mq-qrefresh: adapt for Windows after 39b7052b217b Fixes @@ -208,7 +208,7 @@ $ echo 'orphan' > orphanchild $ hg add orphanchild $ hg qrefresh nonexistentfilename # clear patch - nonexistentfilename: No such file or directory + nonexistentfilename: The system cannot find the file specified $ hg qrefresh --short 1/base $ hg qrefresh --short 2/base on Windows

merge with stable

Added signature for changeset 195ad823b5d5

Added tag 2.4 for changeset 195ad823b5d5

tests: fix test for issue3581 for vfat on Linux

filemerge: only run test for issue3581 on non-windows environments

openpath: specify binary mode and use util.posixfile follow-up to 0e2846b2482c

i18n-pt_BR: synchronized with afa7e6fa820b

merge with i18n

i18n-pt_BR: synchronized with 36ed69d4593d

i18n-ja: synchronized with 0188ddfa844e

subrepo: only do clean update when overwrite is set (issue3276) Files in a subrepo were overwritten on update. But this should only happen on a clean update (example: -C is specified). Use the overwrite parameter introduced for svn subrepos in c19b9282d3a7 to decide whether to merge changes (as update) or remove them (as clean). The new function hg.updaterepo is intruduced to keep all update calls in hg. test-subrepo.t is extended to test if an untracked file is overwritten (issue3276). (Update -C is already tested in many places.) The first two chunks are debugging output which has changed. (Because overwrite is not always true anymore for subrepos) All other tests still pass without any change.

i18n: change output of largefiles for summary to distinguish from one for outgoing Before this patch, largefiles extension uses "largefiles: No remote repo" message not only for "outgoing" as status report, but also for "summary" as summarized information. This sharing prevents message translators from inserting white spaces between "largefiles:" and "No remote repo" in translated message to align column position of summarized information. This patch changes output of largefiles for summary to distinguish from one for outgoing. This patch puts "no remote repo" into parentheses, because this is not summarized information.

i18n: make column positioning message of MQ summary output translatable Before this patch, one of column positioning messages of MQ summary output is not translatable, and patches are always listed up at fixed column position like below, when patch queue is not empty: mq: 1 applied, 1 unapplied But column positioning messages for other summarized information are translatable, so other information may be displayed at different column position on non-English locale environments. This patch makes column positioning message of MQ summary output translatable.