convert: tuple parameter unpacking is deprecated in py3k

revlog: Marked classic int divisions as such.

Merge with stable (again)

debugger: give a little intro before entering pdb

debugger: show traceback before entering pdb post-mortem

Merge with stable

wix: generate a new GUID for the help folder A GUID change is recommended after changes like 159233cc9c14

wix: pick up new help topics added between 1.5 and 1.6 These files are not included the 1.6.0 installer, but will be picked up by nightly builds as soon as this makes it to the stable branch.

Added signature for changeset f786fc4b8764

Added tag 1.6 for changeset f786fc4b8764

log: follow filenames through renames (issue647) In commands.log a displayer was initialized from cmdutil.show_changeset() with the initial matchfn (which designates the specified files which only is correct in the highest revision in the range). prep() is handed the correct list of files, but displayer.show() didn't use that list but keept using the original matchfn. The matchfn argument to cmdutil.show_changeset() wasn't specified in other places and is only used in .show(), so now we give the matchfn as an optional parameter to .show(). We do however still have to detect --patch and --stat from opts in show_changeset() and let it imply a matchall, but that can now be overruled with the new .show() matchfn parameter.

i18n-pt_BR: synchronized with d3c3e2fdeb0c

commit: add missing _()

subrepo: refuse to commit subrepos if .hgsub is excluded (issue2232)

Merge with i18n

i18n-da: translated eol extension and various small strings

i18n-ja: synchronized with 13d02d6677f2

i18n-pt_BR: synchronized with 59af1d65029c

merge with stable

i18n-sv: synchronized with 13d02d6677f2

i18n-pt_BR: synchronized with 9fa255c32406

Merge with stable

i18n-pt_BR: glossary.txt translation

i18n-sv: output from 'hg' is once again fully Swedish

i18n-sv: synchronized with 469a48dff18b

i18n-pt_BR: synchronized with 2186124f08e4

Merge with stable

i18n-sv: synchronized with 4d03c3680400

subrepo: correctly handle update -C with modified subrepos (issue2022) (based on a patch by Saint Germain)

http: deliver hook output to client

setup: ignore failures to build optional inotify extension

revset: make negate work for sort specs

update: synchronize permissions in the dirstate (issue1473) fix by Benoit, updated by mpm to not affect all clean files

heads: fix templating of headers again (issue2130) (tweaks and test by mpm)

minirst: use unicode string as intermediate form for replacement Some character encodings use ASCII characters other than control/alphabet/digit as a part of multi-bytes characters, so direct replacing with such characters on strings in local encoding causes invalid byte sequences.

subrepo: fix recording of + in .hgsubstate (issue2217)

mq: qimport cleanup on fail (issue2214) save state of successfully added patches and ensure cleanup on the way out.

test-acl: don't use $PWD solaris ....

test-alias: don't use the environment variable PWD solaris ...

revert: Make it clearer when not to use revert

progress: check stderr.isatty() before each print This prevents writing progress information to a non-tty stderr if one is swapped in after startup, which happens in `hg serve`.

http digest auth: reset redirect counter on new requests (issue2255) This fixes a regression introduced in a1e575b48563 when Mercurial reuses the auth handler for several requests and the redirect counter never is reset.

revset: deal with empty sets in range endpoints (spotted by Julian Cowley <julian@lava.net>)

subrepo: fix silent push failure for SVN (issue2241)

merge: pass constant cset ancestor to fctx.ancestor

context: allow passing the common cset ancestor to fctx.ancestor This is used by the next patch to speed up merge.applyupdates.

merge: document how to 'undo' a merge

resolve: do not crash on empty mergestate I managed to get an empty .hg/merge/state file by interrupting a merge by pressing Control-C. This lead to this error: TypeError: a2b_hex() argument 1 must be string or read-only buffer, not None since localnode is assigned None before the iteration over lines in the mergestate begins.