fix comment

Merge with stable

revset: fix ancestor subset handling (issue2298)

hgwebdir: use template paths configured in the hgrc (issue2281)

changegroup*(): use set instead of dict

Merge with stable

bash/zsh completion: use HGPLAIN when invoking hg (issue2297)

patch: fix extract() docstring, it returns branch as well

merge with stable

doc: remove has_key usage in hgmanpage

gendoc: remove callable usage (check-code)

bookmarks: rewrite _bookmarks method documentation

init: create target directory recursively Subrepos with relative paths must often be cloned to locations deep in the directory structure. This allows clone over ssh (init+push) work.

doc: make sure we use our own code for generating man pages docutils would in some situations pick up its own manpage.py instead of doc/manpage.py. Renaming to hgmanpage.py makes it less ambiguous.

transplant: crash if repo.commit() finds nothing to commit (makes issue2135, issue2264 more obvious, but does nothing to fix either one) This seems to happen in two distinct cases: * patch.patch() claims success but changes nothing (e.g. the transplanted changeset adds an empty file that already exists) * patch.patch() makes changes, but repo.status() fails to report them Both of these seem like bugs in other parts of Mercurial, so arguably it's not transplant's job to detect the failure to commit. However: * detecting the problem as soon as possible is desirable * it prevents a more obscure crash later, in transplants.write() * there might be other lurking (or future) bugs that cause repo.commit() to do nothing Also, in the case of issue2264 (source changesets silently dropped by transplant), the only way to spot the problem currently is the crash in transplants.write(). Failure to transplant a patch should abort immediately, whether it's user error (patch does not apply) or a Mercurial bug (e.g. repo.status() failing to report changes).

mq: cleanup status if applied mq is stripped (issue1881) stripping of applied mq patches leads to wrong state recorded in status file. find all mq patches that will be affected and clean up status file before strip.

bundle: lookup revisions after addbranchrevs When addbranchrevs extends revs, it adds changeset hashes, and not node ids. Which means that we have to lookup for revisions _after_ the addbranchrevs call, instead of before.

log: do not redefine cachefunc in walkchangerevs The same variable is defined a few blocks earlier. The first phases in walkchangerevs should in fact fill that cache, and allow faster lookups in the last phase. Redefining and overriding this cached function, (knowing that it will be called with the same arguments) defeats the caching purpose.

cmdutils: fix code style

contrib: add debugshell extension

log: document the different phases in walkchangerevs

log: slowpath: only walk specified revision range during preparation Even with --removed, it does not make sense to examine changesets outside of the revision range that was specified by the user: the last phase only yields a subset of (revs), preparation phase hence only has to examine (revs) to fill correctly fncache.

Merge with stable

revert: rename original to .orig instead of copying (issue2282) By renaming before reverting the content of the file we ensure that we handle and break hardlinks properly. Handling of other hardlinks to .orig is somebody elses problem.

inotify: make inotifydirstate.status() returns a tuple of lists. This makes it consistent with dirstate.status(), which is important if there are other extensions messing with the output of status(). Those extensions can safely assume that dirstate.status() returns a tuple of lists, because its docstring says it does. But inotifystatus.dirstate() returns a list of lists, which can break those other extensions.

protocol: move the streamclone implementation into wireproto

protocol: use generators instead of req.write() for hgweb stream responses

protocol: wrap non-string protocol responses in classes

protocol: convert StreamException to generated error code This makes it much easier to handle these errors at the transport level.

protocol: extract compression from streaming mechanics