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