context: remove parents parameter to workingctx it was needed before the refactor of commit, workingctx always uses the dirstate now.

dirstate: more explicit name, rename normaldirty() to otherparent()

keyword: monkeypatch patch so that optional args can be passed as kwargs

patch: refactor applydiff to allow for mempatching

patch: move mercurial-specific imports after stdlib imports

test-record: add hg summary to verify we update dirstate

log -b: use opts.get() instead of assuming opts is correctly filled

Merge with stable

Respect the DESTDIR variable during 'make install' The DESTDIR variable used to tell 'make install' an alternate system root to install the software to. Since setup.py supports the same via its --root parameter, it's easy to make life easier for many packagers.

commands: add more robust support for 'hg log -b' (issue2078) Fixes issue2078 and adds tests to cover various 'hg log -b' uses. This change adds a localrepo.lookupbranch(key, remote=None) function. This will look up the branch of the revision with the given key. The algorithm works like this: * If a remote repo is given and KEY is the name of a branch in that repo, return KEY. * If no remote repo is given and KEY is the name of a branch in the local repo object, return KEY. * Otherwise look up the revision with the identifier KEY in the local repo and return its branch. This change also makes 'hg log -b' use this new functionality and adds a few tests for it.