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