Clarify some messages during commit: - use "branch 'foo'" to distinguish from "branch merge". - commit messags can be empty (to abort commits) - Added value for editor message: Tell about HG: lines like CVS does.

merge with crew

Merge with crew-stable

Prompt for a commit message in editor, improve error message

patchbomb: make --bundle respect --desc

patchbomb: read bundle file in binary mode

prompt: kill matchflags Python already lets one to embed RE flags directly in a regex, which is a much nicer way to do things: (?iLmsux) (One or more letters from the set "i", "L", "m", "s", "u", "x".) ... matchflags was introduced in 67afecb8d6cc, and the record extension is the only user. I've killed matchflag, and adjusted record code appropriately.

test-convert-cvs: force cvs -f options to avoid cvsrc There are some reference to a CVS_OPTIONS environment variable doing that but it does not work on my system (cvs 1.11.20, macosx).

Patchbomb: Prompt password when using SMTP/TLS and no password in .hgrc. If .hgrc specifies SMTP/TLS and a username without specifying a password, prompt for a password.

highlight: fix more tracebacks by forcing util._encoding to hgweb.encoding This is needed in case util._encoding and hgweb.encoding conflict. Extreme example: HGENCODING=UTF-8 [web] encoding = ascii Note: display of files whose encoding differs from HGENCODING or hgweb.encoding behaves not exactly the same way as with highlight turned off as replacement chars are either converted or replaced.