rebase: allow rebase to ancestor (issue3010) We only deny rebasing onto direct parent. Thanks to the ancestor argument of merge. the "implementation" of this feature only consist in loosing the check and imply detach when rebasing on ancestor.

rollback: only restore dirstate and branch when appropriate. If the working dir parent was destroyed by rollback, then the old behaviour is perfectly reasonable: restore dirstate, branch, and bookmarks. That way the working dir moves back to an existing changeset rather than becoming an orphan. But if the working dir parent was unaffected -- say, you updated to an older changeset and then did rollback -- then it's silly to restore dirstate and branch. So don't do that. Leave the status of the working dir alone. (But always restore bookmarks, because that file refers to changeset IDs that may have been destroyed.)

rollback: refactor for readability; cosmetics. - clarify how we parse undo.desc - fix bad grammar in an error message - factor out ui local - rename some local variables - standardize string quoting

help: make optlist local to subfunctions

help: move option list display into subfunctions

help: fold header selection into helplist

help: fold some list help clauses into the helplist function

minirst: end all blocks with newlines Formerly RST blocks were formatted without a trailing newline, which wasn't particularly helpful. Now everything that comes back from the formatter has a trailing newline so remove all the extra ones added by users.

convert: rename local variable

minirst: don't choke on empty text

minirst: remove some whitespace

minirst: remove pointless transcoding

tests: fix up help test for new verbose sections

status: add some help examples

forget: add help examples

revsets: add first alias for last

revset: add default of 1 to limit and last functions

remove: suggest forget to undo adds

remove: simplify help - move the obscure parts into the verbose help - drop confusing references to "remove from repository" / "not remove from history" - add mention of hg forget

import: add help examples

id: add some help examples

export: add help examples

diff: add help examples

archive: add help examples

test-rollback: tinker a bit to make it easier to add more tests.

convert: added bookmarks support in filemap When using the convert extension from a Mercurial rep. to subset it with filemap, the bookmarks are not copied. I fixed this by calling the base.get_bookmarks() from the filemap getbookmarks() instead of returning an empty dictionary. It should work also for other converters that implement getbookmarks() (like git). I don't see any drawbacks except that the bookmarks are always copied (not necessarily wanted all the times).

util: fix finding of hgexecutable The version introduced in 89d9f92f6fdd would for example return thg (thanks to Mads Kiilerich for pointing to this)

log: add a usage note about --removed

log: rearrange the help text a bit

log: add some usage examples to verbose help

minirst: fix container stripping logic

share: allow trailing newline on .hg/sharedpath. This is extremely handy for those occasional circumstances where you need to edit .hg/sharedpath manually, since modern Unix text editors make it surprisingly difficult to create a text file with no trailing newline.