Merge with crew-stable

convert: fix /dev/null redirections under Windows

Merge with crew-stable

Test git repository conversion

hghave: detect git availability

convert: fix issue702 about GIT_DIR= construct unsupported under Windows.

convert: gitcmd wrapper for os.popen

Improve extdiff configuration. In addition to the old cmd.foo, opts.foo hgrc entries, allow a more simple alias = command [opts]... form. For example: [extdiff] cdiff = colordiff -uprN

cgi: sys.path.insert should be before importing mercurial thanks to R. Burke

merge with crew

improve error message for 'hg merge' when repo already at branchtip

imerge: add automerge flag to attempt to batch merge all conflicts

Merge with crew

imerge: fix ancestor calculation If wctx already has two parents, ancestor calculation is wrong. Normally merge is called before wctx gets the second parent, so we simulate this in imerge by temporarily popping the second parent before calling filemerge. Highly dirty. This patch also handles the ParseError move from cmdutil to dispatch.

merge with crew-stable

fix test-permissions output

merge with crew-stable

testcase for issue705 (fixed by 316ce5e85b3e)

merge with crew-stable

merge with -stable

check exec: return fallback in case of error during the check If there is any error while checking if exec is supported, we can return fallback. fix issue705

mq: some improvements to header rewriting (closes #690) Tested with qrefresh -m against the mm series.

Merge with crew-stable

Do not lose previous tags when adding a tag in raw mode

merge: forcefully mark files that we get from the second parent as dirty After a hg merge, we want to include in the commit all the files that we got from the second parent, so that we have the correct file-level history. To make them visible to hg commit, we try to mark them as dirty. Unfortunately, right now we can't really mark them as dirty[1] - the best we can do is to mark them as needing a full comparison of their contents, but they will still be considered clean if they happen to be identical to the version in the first parent. This changeset extends the dirstate format in a compatible way, so that we can mark a file as dirty: Right now we use a negative file size to indicate we don't have valid stat data for this entry. In practice, this size is always -1. This patch uses -2 to indicate that the entry is dirty. Older versions of hg won't choke on this dirstate, but they may happily mark the file as clean after a full comparison, destroying all of our hard work. The patch adds a dirstate.normallookup method with the semantics of the current normaldirty, and changes normaldirty to forcefully mark the entry as dirty. This should fix issue522. [1] - well, we could put them in state 'm', but that state has a different meaning.

gendoc: use demandimport

Merge with -crew

Merge with -stable

match: handle large regexes Some Python versions don't handle large regexes, so when we hit an overflow, split our regex in two.

make hg add of a removed file unremove the file if a file was removed, hg add shouldn't mark the file as added, but as normal see issue683