merge: use repo.ui directly instead local variable The non-standard 'u = repo.ui' shorthand was only used two times and there were many other full references to repo.ui.

win32: msvcr71.dll should be used for python 2.4 and 2.5 Following is list of C-Runtime for versions of CPython on windows: - python 2.4.5 => MSVCR71.dll - python 2.5.4 => MSVCR71.dll - python 2.6.6 => MSVCR90.dll - python 2.7 => MSVCR90.dll - python 3.1.2 => MSVCR90.dll

minirst: add a helper function to build an RST table from an array

minirst: drop debug code This standalone mode no longer works due to the mechanics of import and util. When run not as part of a package, the import of util causes an import of the built-in posix module, which doesn't contain the expected symbols. This is difficult to fix in Py2.4.

minirst: add simple table support This adds a subset of the 'simple table' support from RST to allow formatting of options lists through RST. Table columns are automatically sized based on contents, with line wrapping in the last column.

minirst: only strip leading newlines, not indentation

ui: allow alternatives for config options

merge with stable

parsers: avoid pointer aliasing Newer versions of GCC have aggressive pointer alias optimizations that might get fooled by our pointer manipulations. These issues shouldn't be encountered in practice because distutils compiles extensions with -fno-strict-alias but the code was not valid according to the standard.

graphlog: attempt to fix index overrun (issue2912) This bug may be caused by file subgraphs have more than two parents per node. I have no idea if this fix is correct as the graphlog code is mysterious, but it seems to be fine on the available test case.