color: do all setup in uisetup Now that extensions are loaded in phases, we are guaranteed to always find mq in uisetup with extensions.find and we know that the mq commands are not yet copied into commands.table.

extensions: pass ui arguement to extsetup if accepted

extensions: load and configure extensions in well-defined phases Extensions are now loaded with a call-graph like this: dispatch._dispatch extensions.loadall extensions.load # add foo module to extensions._extensions extensions.load # add bar module to extensions._extensions foo.uisetup(ui) bar.uisetup(ui) foo.extsetup() bar.extsetup() commands.table.update(foo.cmdtable) commands.table.update(bar.cmdtable) hg.repository foo.reposetup(ui, repo) bar.reposetup(ui, repo) The uisetup calls could easily be moved out to dispatch._dispatch, but have been kept in extensions.loadall since at least TortoiseHg calls extensions.loadall and expects it to call uisetup. The extensions.load function called uisetup. It now has an unused ui argument which has been kept for backwards compatibility.

highlight: move code from module top-level into extsetup

run-tests: standardize on --foo instead of -f/--foo We write -f/--foo in Mercurial help texts (docstrings), but I think it looks strange in error messages.

run-tests: use parser.error for cmdline option errors

doc/README: rst2man is now in Docutils proper

doc/Makefile: detect the right name for rst2man and rst2html docutils uses the .py extension on the commands, and so do their installer. Distribution packages might strip the .py, but the official name should work too.

Merge with crew-stable

test-keyword: update output to match 5d49fdef6fd0

hgweb: show diff header line in raw diffs

doc/Makefile: Don't show Makefile comments in output The comments makes sense when editing Makefile, but not when watching its output where it looks too much like error messages.

doc/Makefile: detect rst2man errors Make couldn't detect rst2man errors when it wasn't the last command, so empty man page files would be installed.

test-hooks: Don't hide the value of HG_PENDING Hiding the value of HG_PENDING made it less obvious what was going on in case of test failure

ui: fix NameError in ui.progress due to unit/units typo

util: quicker fspath, do not lower names when the length is different

test-casefolding: fix wrong case on hfs on linux on linux hfs keeps the old case of the file stored force it by renameing to another name and back

hghave: check for case insensitive filesystem in current dir check was done on TEMP

run-tests: expand --tmpdir and create it if needed

patch: remove the unused, broken reverse() function

patch: readgitpatch: remove unused variable 'src'

use 'x in dict' instead of 'dict.has_key(x)' "in" is faster, and has_key will be removed in py3k

churn: use genexps now that we dropped 2.3 compatibility

merge with crew-stable

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