tests: Don't use $PWD $PWD doesn't work with solaris sh - use `pwd` instead

mq: Do not translate import message that are appended to commits. We should not translate the "imported patch" message. The translated message confuses the detection whether the user has not updated the commit message yet. We try to avoid to translate generated commit messages.

subrepo: handle svn externals and meta changes (issue1982) - Detect changes to meta on regular and external entries - Do not try to commit external entries

subrepo: svn xml output is much easier to parse That's especially true with status flags: there are different fields and values for regular changes, meta changes, externals changes and externals meta changes.

subrepo: make svn use C locale for portability My reasons to do c2e2a5e6c36b were wrong. We want to have non-localized svn output while preserving current locale for input arguments and svn internals. This is achieved by setting LC_MESSAGE=C.

Merge with stable

summary: L10N messages hide clean-ness of workdir from 'hg summary' 'hg summary' recognizes workdir as clean by searching for 'clean' is in own output text. But 'clean' is one of I18N target texts, so 'hg summary --quiet' behaves incorrectly in non-English locale.

mercurial.el: add forgotten version number The number was accidentally removed in the change from GPLv2 to GPLv2+ in 25e572394f5c.

test-subrepo-svn: remove bashism

Merge with crew-stable

test-patch-offset: Don't use unified diff Solaris diff -u likes to be "helpful" and tell that "No differences encountered"

Merge with stable

Update license to GPLv2+

copies: speed up copy detection On some large repos, copy detection could spend > 10min using fctx.ancestor() to determine if file revisions were actually related. Because ancestor must traverse history to the root to determine the GCA, it was doing a lot more work than necessary. With this replacement, same status -r a:b takes ~3 seconds.

hgweb: request: strip() form values Entering "<correct_cset_hash> " in the search form was not returning anything. This happens relatively often, due to HTML formatting: when copy/pasting a cset hash from the web, selection might contain surrounding spaces.

templatekw: fix extras, manifest and showlist args (issue1989) Removing the explicit parameters from keywords signature is easier than copying and reproducing the original argument list.

merge with i18n stable

i18n-pt_BR: synchronized with 279c8a73fde1

Merge with stable

share: be more explicit about the dangers of rollback.

mercurial.spec: Alignment with AIX spec by Jim Hague * Require Python 2.4 or later * Note that hgk uses tk - but don't require it * Remove bashism to support ksh * Install mq.el * Handle uncompressed man pages

hgweb: changenav: separate pages before and after the current position This should allow styles to customize more precisely navigation bar, for example inserting a cursor to show where we are in the navigation bar.

Work around AIX shell builtin printf not handling \NNN. On AIX, ksh builtin printf does not understand \NNN. Some tests use this to generate test data, and so fail on AIX. Rework these tests to use python to generate the correct characters. This fixes the tests on AIX and should be more generally portable.

merge with stable

subrepo: fix merging of already merged subrepos (issue1986) This fixes a bug seen when merging a main repo which contains a subrepo when both repos have been merged before. Each repo (main and sub) has two branches, both of which have been merged before. In a subrepo, if the revision to merge to is an ancestor of the current rev, then the merge should be a noop. Test provided by Steve Losh.

Merge with crew-stab le

cmdutil: expand style paths (issue1948) Fix suggested by Andrea Riciputi <andrea.riciputi@gmail.com>

hgweb: add a test for search logs

hgweb: add less/more links for search logs (issue1972)

hgweb: add less/more links to shortlog/filelog nav

hgweb: make graph page size equal to shortlog

merge with stable