merge: move apply and dirstate code into separate functions

merge: remove linear variable

merge: simplify hook code

merge: linear_path -> linear

merge: pull manifest checks and updates into separate functions

merge: remove now unused umap dict

merge: pull manifest comparison out into separate function

Merge with mainline

merge: move set_exec to actions

merge: add forget to action list

merge: add codes to action list, eliminate None elements

merge: convert actions to list

Merge with backout

Back out trusted hgrc change for now Backed out changeset 494521a3f1425

Merge with crew

Add support for diffstat in commit emails, and move diffstat from patchbomb to patch

cat: default to working dir parent instead of tip This introduces a defaultrev function that chooses the working dir parent if a revision isn't specified, and uses it in several places.

merge with brendan

hgk: add --limit, and revranges

hgk: add revision numbers

mq: handle patch names containing ":"

Move revision parsing into cmdutil.

Avoid negative block sizes in lazyparser. This fixes a bug introduced by changeset baa3873eb387 .

mq: add qdelete --forget option This removes an applied patch from the series and status files without popping it. It is useful when an mq patch has been applied upstream.

mq: do not update an empty working directory after strip. Closes #296.

mq: Add --git option to qrefresh

Add the -s option to `hg help qseries`.

sshrepo: don't try to validate when creating the repo - This removes the "repo not found" error when cloning or init-ing a remote repo. - Since the remote hg will abort if the repo already exists we don't need to validate it.

Make qrename handle directory targets; closes #333.

Fixed python2.3 incompatibility (rsplit) in qpush/qpop with index.

Added tests for qpush/qpop with index.

Fixed OSError "No such file or directory: None" and make IOError consistent. The None error occurs when the current working directory is no longer available, e.g. because it was removed in another shell.

If local repository is missing, make error message clearer. Faheem Mitha suggested finding a better error message. The nice error message is taken from cogito.

don't let lazyparser read more data than it can handle This should fix issue368.

document changelog format

merge with brendan

strip: strip changelog before manifest

extdiff: do not shell-quote options to new commands revert a change introduced by 453097750fbf

Include section name and parameter name (if available) in config errors. Added tests for this.

Never apply string formatting to generated errors with util.Abort. Otherwise error messages containing % chars yield errors or worse. Fixed (hopefully) all users of util.Abort.

hg merge: fix lookup of branch add some tests for branch usage

merge with crew

hgk.py: fix for a bug introduced in 32fd512ca7c0

allow shell-quoting in command defaults

hgk.py: use mercurial.patch functions when possible

git --diff: fix traceback when getting mode change - use the manifest instead of the mode in the working dir if the diff is against two revisions - add a testcase

hgk.py: use nullid instead of a constant

hgk.py: fix warnings from pychecker - unused variables - usage of undefined variables (opts and filterfiles)