churn: issue833 was reintroduced in 9bc46d069a76, correct it and add a test

templatefilters: indent: do not compute text.endswith('\n') in each iteration

util: canonpath: simplify logic if root == os.sep, then endswithsep(root) is True as well: one test is enough

Merge with crew-stable

test-parse-date: test 12-hours time formats (issue1804)

util: Fix date format for 12-hour time.

test-command-template: Don't diff files with same content Solaris diff will report "No differences encountered" on stdout

Merge with crew-stable

hgrc.5: document %unset directive

merge with crew-stable

dirstate.write: don't ignore stat data if mtime is in the future (issue1790) This change narrows the race guard that was introduced by af3f26b6bba4 ("dirstate: ignore stat data for files that were updated too recently") to not discard the _map entry's stat data if the mtime is in the future. Without this change, status locks files having odd mtimes in the future into the 'unset' state, causing needless file compares later (admittedly harmless), but also inflicting highly irritating sticky effects on tools/plugins that directly read .hg/dirstate (e.g. TortoiseHg).

Merge with crew-stable

hgrc.5: document %include directive

mq: don't mention qtop in module doc string (qtop was removed in b8dc3eba4f9d)

color: no need for itertools, zip() is good enough

log: fix traceback for log -k caused by 1ef630452e0b (issue1805)

templater: remove support for ## template variables

graphlog: simplify ascii drawing to process one cset at a time

graphlog: shorter variable names, fewer underscores, single state container

graphlog: move common code into function again, change function types

graphlog: extract some setup code out of common functions

cmdutil: use context objects for walkchangerevs()

tags: don't crash if unable to write tag cache This happens with hgweb in real life, if the httpd user is unable to write in the repository directory. Another case is doing 'hg incoming' on a repository in the filesystem owned by someone else.

mq: get rid of qnext, qprev and qtop

mq: add options to qapplied/qunapplied to act like qprev/qnext

hgweb: add web.descend configuration variable

help: align columns "hg help templates" output

Merge with crew-stable

help: show results of all date filters

help: document isodatesec and rfc3339 filters (issue1799)

Merge with crew-stable

iss: make mfc*.dll and msvc*.dll optional mfc71.dll was only needed for Python2.4 msvc*.dll is similarly optional Do not bail installer build if not found

iss: take version from iscc command line or __version__.py Requires InnoSetup Preprocessor to be installed.

inotify: remove unused import

Merge with crew-stable

osutil: fix compilation with -ansi

inotify: repo is not referenced from server, remove the weakref

inotify: client: no repo use

inotify: server: use dirstate instead of repo

inotify: server: use wprefix everywhere, introduce prefixlen self.wprefix = self.repo.root + '/' = self.repo.wjoin('') + '/' Since we'll eventually get rid of self.repo, keep only the first form. use self.prefixlen to compute only once the root prefix size.

inotify: server._updatestatus: simplify control flow

url: add support for custom handlers in extensions

patchbomb: add --flag to put flags in subject prefixes --flag foo uses: [PATCH foo] or [PATCH M of N foo] depending on the number of patches. Multiple flags are supported: --flag foo --flag bar gives [PATCH foo bar]

Merge with stable

Merge with i18n-stable

Merge with i18n

merge with i18n-stable

i18n-pt_BR: miscellaneous fixes