Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)

Make ui.prompt repeat on "unrecognized response" again (issue897) (this was accidentally changed in ca0d02222d6a)

Fix misleading error and prompts during update/merge (issue556)

patch: be more tolerant to diffstat failures (issue 865) Sometimes, revisions cannot be represented by a regular diff, only a git diff would capture binary files or permission changes. diffstat cannot handle git patches and will output "0 files changed" when fed with an empty diff. We cannot consider the latter to be an error, unless we rewrite diffstat to handle these correctly.

Fix chmod of writable but unowned files (issue530) This could happen e.g. in group writable local repositories where a file should become executable on update. (Patch by Benoit Boissinot attached to issue530)

Fix test-convert-darcs output on Debian etch (issue779) The CR characters of darcs get confused the output. Additionally this darcs version printed: darcs: <stdin>: hGetLine: end of file

fix spelling error

Merge with stable

Fix income/pull with bundle and -R (issue 820). Uses ui.setconfig() to tell bundlerepo where the main repo is. This is needed for when the --repository option is used. Adds tests to test-bundle and a new test script test-mq-pull-from-bundle, which plays out the situation that initially made me detect this bug (hg -R .hg/patches pull ../bundle.hg).

Add output markers to test-bundle so it's easier to spot the source of output diffs.

hgk: add black and blue as preferred colors

Remove spurious escape attempt in hg.1.txt

Use VISUAL in addition to EDITOR when choosing the editor to use.

util: get rid of is_win_9x wart

Add --verbose support to tags command.

Properly check tag's existence as a local/global tag when removing it.

[RFC] convert: fix --datesort The problem is that previously commit.date was used for sorting, but it's a string like "1 Jan xxx 2007", so it it wrong to use it for sorting. Another problem is that why we are using depth for sorting -- I have no clear answer -- it seems to be plain wrong. This patch is just an RFC.

highlight: pass encoding to lexers and formatter Try to avoid UnicodeDecodeError by: - encoding to local - passing util._encoding as lexer input encoding - passing hgweb.encoding as formatter output encoding

highlight: mandatory arguments where possible

patch: simplify directory creation

patch: write rej files for missing targets (issue 853)

patch: avoid file existence tests when possible in selectfile()

patch: move diff parsing in iterhunks generator

patch: move NoHunk detection up with parsing code

merge with main

Workaround for "Not enough space" error due to the bug of Windows. Large write requests fail when stdout is switched to binary mode. As a workaround, limit the data size to write once.

fix typo in sshargs the original typo dated back to early 2005

mq: drop obsolete reference to 'qversion'

win32: fix ssh://host:port when using Plink Moves ssh argument building to platform specific utils code. The win32 version looks for plink in ssh command string and uses '-P' in lieu of '-p' for specifying a port

patchbomb: make "hg email -b" w/o destination work as advertised

Default to 10.5 version using the default python 2.5

patchbomb: prompt with ui.prompt() Avoid Windows raw_input() issue introduced by a3fe91b4f6eb. Found by Steve Borho <steve@borho.org>.

ignore: fix up comment parsing - remove redundant newline bits - change loop to use regex - eliminate escaping of # in internal representation

demandload: give better diagnostic for call of an unloaded module

fancyopts: lots of cleanups

commit: avoid losing edits during commit If a file is edited between the time we record file states in the repo and update the dirstate, that change can be lost to hg status. Because we invoke the editor between these two points, that window can be arbitrarily large. This greatly shrinks the window by recording the commit change immediately. If our checkin fails, we simply invalidate the dirstate.

rm: complain more about removing added files

merge: make return codes more sensible Commands that call merge were exiting with a return code equal to the number of unresolved files. We now return 1 if there are unresolved files.

doc: correct preoutgoing description

dispatch: report OOM rather than traceback

Merge with crew-stable

convert: move commands definition to ease demandload job (issue 860)

win32: remove text man pages from Windows package The HTML versions are still packaged, and do not suffer from eoln problems. This solves issue531 (addition through subtraction)

Merge with mpm

win32: include zsh_completion in Windows package

win32: include contrib/vim in Windows package

win32: use relative path to install source Remove hard-coded path to the source repo to be packaged.

win32: move default install path inside program files All of the 'space in path' problems have been resolved, so we can install Mercurial the Windows standard location. The {pf} InnoSetup variable is locale aware.