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

ui: just return it if it's already a bool

demandimport: ignore _winreg (used in python-2.7 mimetypes)

shrink-revlog: add --dry-run option

cmdutil: hide child window created by win32 spawndetached() Hiding the child process window is not strictly necessary but it avoids opening an empty shell window when running hg serve as well as a task in the task bar. The window is hidden after the process is already started causing a single flicker.

Find right hg command for detached process On Windows, Mercurial can be run from the python script of from a frozen executable. In the first case, we have to call the python interpreter since the script is not executable. Frozen executable can be called directly. Fix 3/3 for issue421

cmdutil: replace unix pipe handshake with file lock The pipe handshake cannot be implemented with Windows detached process, which disables handle inheritance. Fix 2/3 for issue421

serve: add and use portable spawnvp replacement There is no standard python command to really detach a process under Windows. Instead we use the low level API wrapped by subprocess module with all necessary options to avoid any kind of context inheritance. Unfortunately, this version still opens a new window for the child process. The following have been tried: - os.spawnv(os.P_NOWAIT): works but the child process is killed when parent console terminates. - os.spawnv(os.P_DETACH): works on python25, hang on python26 when writing to the hgweb output socket. - subprocess.CreateProcess() hack without shell mode: similar to os.spawnv(os.P_DETACH). Fix 1/3 for issue421

shrink-revlog: help/doc tweaks - make it look right in 'hg help extensions' - clarify --revlog option - add a main program to tell users this is no longer a standalone script

Add shrink-revlog.py to win32 installer

shrink-revlog: make it work on windows (issue1976)

merge main with stable

merge crew together

merge stable together

merge with stable

shrink-revlog: avoid cryptic error when used as an extension When shrink-revlog is used as an extension, it would produce an error when switching back to stable because the script will try to execute itself.

transaction: initialize self.journal to None after deletion This avoid a warning when having an empty transaction, where hg would try to delete the journal twice.

subrepo: fix typo in help text

Merge with stable

relink: ensure consistent candidate order

commands: fix typo in help text

color: colorize output of hg resolve -l

color: improve coding style

Merge with crew-stable

ui: display progress with decimal notation

win32: close file when leaving _getfileinfo()

Add support for relinking on Windows. Test and minor code change by Patrick Mézard <pmezard@gmail.com>

Add test for relink extension

contrib: small documentation fixes in shrink-revlog.py

contrib: turn shrink-revlog.py into an extension

contrib: fix error handling in shrink-revlog.py to be more hg-like

contrib: use ui to write in shrink-revlog.py

Merge with stable.

Update test and man page for multiple matching encode/decode filters

commands: fix help string for pull -u and unbundle -u. They update to new branch head, not new tip -- same as 'hg update'.

Update copyright year to 2010

httprepo: always store the response url (issue1968) Fixes a regression caused by 54b518fc6671

Merge with stable

commands: update copyright year to 2010

test-convert-svn-branches: filter unwanted output Windows cmd.exe emits a different message than sh: """ foobar is not recognized as an internal or external command, operable program or batch file. """ Filter it.

Merge with crew-stable

patch: explicitely close input patch files when leaving If applydiff() raises an exception, the opened patch file is kept alive in the exception context. If it is a temporary file (for instance supplied by import command with stdin input), Windows cannot clean it up.

Merge with crew-stable

hgweb: improve IIS PATH_INFO fix ee8af8a4d905 (issue1580) Copy PHP IIS detection.

Minor svn conversion tests cleanup

subrepo: force en_US.UTF-8 locale when calling svn Parser only knows about en_US output. Forcing the encoding to UTF-8 might not be the best thing to do since the caller may receive some of the subversion output, but at least it should prevent conversion errors from svn client.

test-subrepo-svn: normalize OS specific path separator

subrepo: normalize svn output line-endings

test-subrepo-svn: avoid pushd/popd

Merge with stable

Added signature for changeset 296a0b14a686

Added tag 1.4.2 for changeset 296a0b14a686

Merge with crew

mq: qdiff with the same diff options than qrefresh (issue1350) Specifically, if current patch is a git patch and mq.git=keep, diff in git mode.

mq: upgrade to git patch when necessary (issue767)

patch: support diff data loss detection and upgrade In worst case, generating diff in upgrade mode can be two times more expensive than generating it in git mode directly: we may have to regenerate the whole diff again whenever a git feature is detected. Also, the first diff attempt is completely buffered instead of being streamed. That said, even without having profiled it yet, I am convinced we can fast-path the upgrade mode if necessary were it to be used in regular diff commands, and not only in mq where avoiding data loss is worth the price.

Merge with crew-stable

Merge with stable

mq: preserve --git flag when folding patches Without this, folding a git patch into a regular one downgrades the resulting patch to a regular patch.

mq: preserve --git flag when merging patches Without this, merging a patch queue without diff.git=1 downgrades all git patches to regular patches, losing data in the process.

mq: stop caching and sharing diff options Several mq commands mutate the shared options which causes hard to track bugs when multiple calls are combined.

subrepo: mark string for translation and fix case

Add RelaxNG schema to win32 installer

Merge with mpm

Merge with crew-stable

copies: don't report copies with unrelated branch

subrepo: Subversion support

subrepo: add table-based dispatch for subrepo types

dirstate: don't check state of subrepo directories

subrepo: load from a context where the subrepo exists

subrepo: fix includes support in .hgsub

Merge with stable

i18n: update po files for 703db37d186b and 0ddbc0299742

Merge with i18n

Merge with stable

Merge with i18n.

Merge with i18n-stable

i18n: merge with stable

i18n-da: import strings from default branch

i18n-sv: synchronized with 37679dbf2ee3

merge with i18n stable

i18n-it: removed extraneous '\r' from message

i18n-pt_BR: synchronized with 37679dbf2ee3

Added RelaxNG schema for hg log XML output format

Bugfix and test for hg log XML output

Added output of "extras" to hg log XML output

Merge with stable

run-tests.py: clears http_proxy for all tests

windows: expand environment vars in find_exe This allows us to use ${ProgramFiles} in our [merge-tools] sections so we can provide locale safe program paths.

Merge with stable

run-tests.py: clears http_proxy for all tests

Added XML output for hg log The XML format is based on the one used by Subversion. Currently the closing "</log>" tag is not written, since cmdutil.py does not support the "footer" template variable.

Added support for templatevar "footer" to cmdutil.py

patch: make git diffline generation more explicit

mq: untangle git patch detection

test-mq: better tests delimitation