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.

hg tag: run tag hook just once

patchbomb: break lines > 80 chars (coding style)

changelog: inline trivial call for extra data unescaping

changelog: remove extract function

util: simplify unique

remove unused util.localsub function

add debugfsinfo to check fs capabilities

atomictempfile: avoid chmod weirdness on Linux vfat

checkexec: fix VFAT tempfile droppings with more modern Linux kernels More recent Linux kernels don't pretend to allow any bogus chmods on VFAT.

bisect: use proper locking when updating bisect.state

bisect: remove class - rename core function to _bisect - rename command function to bisect - move state management to bisect

bisect: keep history of all bad revisions - use a single state dict - find the minimum bad revision

bisect: use more standard command syntax and help

bisect: move reporting out of core bisect function

bisect: add skip command - read/write skip lines in state - skip candidates in skipnodes - move bisect begin logic to next - add skip command

bisect: simplify state handling and init - use a single bisect.state file - unify init and reset (delete the state) - move write into good/bad

bisect: remove unused imports

bisect: rename autobad/good/next

bisect: slightly improve the help message

bisect: remove stale test function

bisect: use array.array rather than lists for ancestor lists This nearly doubles performance and cuts memory usage in half on large bisections.

bisect: switch individual ancestor lists from dict to list This saves quite a lot of memory and increases performance

bisect: turn ancestors into an array This makes things faster and eliminates the separate stop hash

bisect: greatly simplify the ancestor accumulating loop

bisect: switch to rev-based calculation - use revlog.parentrevs in search loops - calculate stop directly in O(N) without reachable - move badrev check into candidates

bisect: fix up node vs rev naming

bisect: clarify some bisection code - rename __ancestors... to candidates - remove head parameter (it's always badrev) - eliminate comprehensions to shrink parents - num_ancestors -> n_child name fix - clarify node selection

bisect: inline num_children function

bisect: remove usage of sets

bisect: remove stop argument to ancestors function

bisect: use bail_if_changed - switch to using existing bail_if_changed code - only abort when we're about to do an update

cmdutil: make bail_if_changed bail on uncommitted merge

bisect: remove versionstr

bisect: simplify lookup - use repo.lookup directly - move merge check to check_clean

bisect: remove redundant clean checks

bisect: fold in two trivial functions

bisect: remove two unused functions

update test-merge-types

ui: allow default when prompting

merge: add flag merging intelligence - properly handle all 27 combinations of flags - prompt on conflicts

util: remove set_exec and set_link methods

patch: use util.set_flags

convert/svn: use util.set_flags

merge: use util.set_flags

wwrite: simplify with util.set_flags - always attempt to delete the file (gets rid of read-only message) - always write as a normal file - use set_flags to convert to link or set exec

util: add new set_flags method This is more efficient than calling set_link and set_exec

add --debug to test-merge-types

merge: simplify merge tests, fix exec flag bug If local changed exec bit and remote changed file contents, exec bit change would be lost.

hg: fail upon copy/link errors while cloning locally

convert: svn-sink: copy and set properties after adding dirs/files We can't store properties for files we haven't added to repo. Similarly, we can't copy file to directory we haven't added to svn yet. Remember needed changes and apply them in putcommit().

convert: don't read ~/.cvsrc in test-convert-cvs

merge with crew-stable