patchbomb: fix handling of email addresses with Unicode domains (IDNA) dom.encode('idna') requires dom to be a Unicode string.

clone: add option -u/--updaterev

hgweb/sshserver: extract capabilities for easier modification

kill trailing whitespace

color: wrap qrecord The qrecord command is registered in uisetup phase, so we do our wrapping in extsetup phase.

record: use uisetup instead of extsetup to register qrecord New commands should be registered in uisetup so that other extensions have a change of wrapping them in extsetup.

merge: supply base node to merge tools in the environment Merge tools will be able to exploit this to correctly merge backouts. This won't work fully, though, until issue 1327 is solved, since the node information is not necessarily correct.

test-bisect: normalize shell error message Different shells on vary in their error messages. Here we're satisfied if the shell mentions './foobar' at all.

run-tests: add "debug" mode: don't capture child output, just show it. In debug mode, we: - don't try to diff expected vs actual output - disallow --interactive - disable timeouts (warn if user tried to supply one) - don't try to parse hghave output, since we don't have the output - don't try to save output to .err file

run-tests: make --tmpdir option more useful. - instead of creating HGTMP inside tmpdir, now HGTMP is tmpdir (thus, fail if tmpdir already exists) - passing --tmpdir automatically turns on --keep-tmpdir

hg.1: kill spurious backslash I believe the backslash prevented asciidoc from automatically turning "(C)" into a real copyright symbol. This replacement is not done in reST in the first place.

help: markup email addresses as inline literals Otherwise we get useless links to user@example.org in the HTML version of the man pages.

doc/Makefile: add help/*.txt as a dependency

doc: add some internal links to man pages

hgrc.5: combined short paragraphs into one Short and precise sentences are good, but we can have more than one such sentence per paragraph.

doc: use reST note directive The 'NOTE: bla bla' syntax was for asciidoc and is still present in a couple of docstrings. The docstrings will be converted to reST format when minirst knows how to handle it.

hgrc.5: capitalize True and False consistently

commands: slightly better help for --traceback

hgrc.5: document ui.traceback setting

fix tests output changed by 8269fe2d48f6

byterange: backport fix from upstream

hgweb: send proper error messages to the client Fixes a bug in protocol which caused an exception during exception handling in some cases on Windows. Also makes sure the server error message is correctly propagated to the client, instead of being thrown away.

transaction: always remove empty journal on abort When transactions without entries were aborted, the journal (of size 0) was not unlinked, which prevents subsequent operations until hg recover is run on the repository. We also make sure the journal is unlinked when committing, even if the provided hook doesn't do so.

test-bisect: fix shell-dependent output

change 'journal already exists' to 'abandoned transaction found' Journal already exists is a pretty internal piece of information, which doesn't necessarily mean much to people who are not familiar with the code. The new text is a more well-known concept.

verify: report existence of journal

bisect: no need to save the state if it wasn't changed

record: get the right position (account for skipped files)

log --limit: break after a limited number of csets (broken by f3d60543924f)

transaction: more specific exceptions, os.unlink can raise OSError