subrepo: propagate matcher to subrepos when archiving Add a match object to subrepo.archive(). This will allow the -X and -I options to be honored inside subrepos when archiving. They formerly only affect the top level repo.

largefiles: remove a standin check that could never be true

largefiles: fix the directory structure when archiving a subrepo in a subrepo Previously, a repo consisting of main/sub/subsub archived sub and subsub as siblings under main.

largefiles: fix a traceback when archiving a subrepo in a subrepo This regression was introduced in 43fb170a23bd.

help: improve hgweb help The existing help only walked through an example. Now we first explain the basic rules and then show an example. The 'collections' example and description only cause confusion and is removed. Bikeshedded by Patrick Mezard <patrick@mezard.eu>

convert: keep branch switching merges with ancestors (issue3340) When running convert with a filemap, merge parents which are ancestors of other parents are ignored. This is hardly a problem when parents belong to the same branch, but the result could be confusing when named branches are involved. With: -o-a1-a2-a3... <- A \ \ b1-b2-b3...-m- <- B If all b* revisions are discarded, it is useful to preserve 'm' even if it is empty after filtering to record the branch switch. This patch makes filemap preserve "ancestor parents" if there is no "non-ancestor parent" on the same branch than the merge revision. Remarks: - I am not completely convinced by the reasons given above and those detailed by Matt in this thread: http://selenic.com/pipermail/mercurial-devel/2012-May/040627.html The properties we try to preserve are not clearly defined. That said, I know this patch already helped someone on IRC and the tests output look reasonable. - This is a new version of the original "convert: filemap must preserve fast-forward merges" patch. It has exactly the same output for 2 parents merges, the additional complexity is here to handle more than two parents.

revset: add "diff" field to "matching" keyword The new "diff" field lets you use the matching revset keyword to find revisions that apply the same change as the selected revisions. The match must be exact (i.e. same additions, same deletions, same modified lines and same change context, same file renames and copies). Two revisions matching their diff must also match their files. Thus, to match the diff much faster we will always check that the 'files' match first, and only then check that the 'diff' matches as well.

mq: defer command wrapping to extsetup (API) mq wraps all commands that are not in commands.norepo, which is now performed in this second phase of the extensions setup process. This goes against the current best practices on the wiki [1] as far as where command wrapping is performed, but follows it regarding where global options are injected. mq needs to be the first layer called when command dispatching in order to consistently retarget to the patch repo, regardless of the load order of the extensions. This means being the last to wrap the command table. Previously, 'hg <extdiff> --mq' would diff the main repo unless mq was enabled after extdiff. [1] http://mercurial.selenic.com/wiki/WritingExtensions

revset: ensure we are reversing a list (issue3530)

test-keyword: adapt for Windows

tests: don't use dates before epoch in test-keyword.t Timezone offsets of less than a minute is not shown but can cause displayed dates to be before epoch start - and dates before epoch start is not shown correctly on Windows (see also 4d5b12a5517b). These 'negative' dates could be considered undefined behaviour so we don't care and swap the tests values for timestamp and timezone.

tests: make test-convert-bzr.t more stable The test would occasionally fail because datesort don't have sub-second granularity and thus can't sort commits made in the same second. The test is made more stable by adding 1 second of sleep to make sure the bzr commits are done with different timestamps.

casecollision: add tests Add more tests to exercise the case collion detection code

dirstate: add dir/file collision test Add a test exercising collisions in add between files and directories of the same name.

dirstate: factor common update code into _addpath Factor update code common to all callers of _addpath into _addpath. By centralizing the update code here, it provides one place to put updates to new data structures - in a future patch. It also removes a few lines of duplicate code.

test-subrepo-relative-path: partially adapt for Windows

tests: make rm of usercache in test-largefiles.t more robust Recursive removal of a different path could be fatal - better avoid recursive rm completely.

merge with stable

merge with crew

tests: enable test-largefiles.t on Windows MSYS The 'serve' requirement is moved to the sections that really need it. $USERCACHE needs quoting.

test-largefiles: partially adapt for Windows The adaption is partial, because "serve" is not yet officially supported in tests on Windows. The test passes on Windows with an experimental testbed that supports hg serve in tests on Windows - except for some USERCACHE issues. The added (glob)'s are needed because of backslash <-> shlash issues in paths.

tests: make histedit pass on Windows MSYS The command file will now be named with $TESTTMP (with '\') instead of `pwd` (with '/') to avoid wrong path conversions.

tests: make histedit tests more resilient to filesystem variation Better quoting of odd filesystem paths and no dependency to execute bit.

tests: convert histedit tests to .t Mostly a trivial conversion.

histedit: use stable iteration order for processing bookmarks Random dict iteration order caused test failure in test-histedit-bookmark-motion.t.

Added signature for changeset b013baa3898e

Added tag 2.2.3 for changeset b013baa3898e

record: fix display of non-ASCII names spotted by Nikolaj Sjujskij

i18n-pt_BR: synchronized with d63fb1fce977

merge with i18n

i18n-ja: fix some rst syntax problems

i18n-ja: synchronized with 86a3bb9c5f5c

obsolete: function and method to access some obsolete data An `obsolete` boolean property is added to changeset context. Function to get obsolete marker object from a changeset context are added to the obsolete module.

obsolete: exchange obsolete marker over pushkey For a version of the exchange, all markers are exchange. This won't scale and we will need a better protocol later.

debugobsolete: list all obsolete marker if no argument are specified

obsolete: add easy way to iterate over obsolete marker object

obsolete: helper class to access obsolete marker data

command: creation of obsolete marker * add metadata encoding/decoding ability * add a method to obsstore to help creating marker * add a debug command to create marker

obsolete: introduction of obsolete markers Markers are stored as binary records in a log structured file in .hg/store/obsstore.

histedit: mark as a first party extension

histedit: remove use of reduce() builtin spotted by check-code

test-histedit-edit: improve coverage of histedit code

histedit: fix most check-code violations

histedit tests: fix check-code problems

histedit: new extension for interactive history editing

exewrapper: use generic term script The exewrapper doesn't know anything so far about what the script is or does.

Makefile: add build_hgexe -i for local

setup: compile hg.exe This implements a new command $ python setup.py build_hgexe -i which places the hg.exe in the root of the source tree.