merge with crew

bundle: add test for Issue1704 Original version by Greg Ward.

bundle: don't send too many changesets (Issue1704) The fast path in changegroupsubset can send too many csets. This happens because it uses the parents of all bases as common nodes and then goes forward from this again. If a base has a parent that has another child, which is -not- a base, then this other child will nevertheless end up in the changegroup. The fix is to not use findmissing(), but use nodesbetween() instead, as do the slow path and incoming/outgoing. The change to test-notify.out is correct, because it actually hits this bug, as can be seen by glog'ing the two repos: @ 22c88 |\ | o 0a184 | | o | 0647d |/ o cb9a9 and o 0647d | @ cb9a9 It used to pull 0647d again, which is unnecessary.

convert: reenable SVN support after license issue solved

patchbomb: normalize date format in generated mboxes mbox format should use time.asctime(). Unfortunately, this function writes 2-characters day of week on Windows while unix one writes a single character. Normalize to Windows version since the other one can hardly be written with strftime().

hghave: be more tolerant to rst2html output On Windows, rst2html.bat calls rst2html.py, printing something like: "rst2html.py (Docutils" (notice the extra ".py")

test-convert-hg-svn: fix test output

rebase: make sure the newancestor is used during the whole update (issue1561) Before this change, newancestor was used only once as a replacement for ancestor.ancestor, but merge.update calls ancestor.ancestor several times, so it ends up with the "wrong" ancestor (the real ancestor, but we want the parent of the rebased changeset for all but the first rebased changeset). Added a new test case for this: test-rebase-newancestor. Also, in one scenario in test-rebase-collapse, there was a spurious conflict caused by the same issue, so that test case was fixed by removing the now unneeded conflict resolution and the output was adapted accordingly.

buildrpm: enhance changelog of the RPM file Now the changelog is different depending if the parent is tagged: - for tags, keep the previous content, i.e. changelog of the tags. - for nightly build, changelog of the changesets since the latest tag As RPM is expecting strictly descending dates, I have used a python script to reorder the mercurial changelog.

buildrpm: build full RPM package including sources

buildrpm: cleanup script

buildrpm: enable to start the script from anywhere Previously the script worked only from the hg root.

buildrpm: warn if there is outstanding uncommitted changes

buildrpm: build from working dir parent and use hg version for RPM versioning Previous, RPMs was always built from tip, and the release number did not match the 'hg version' put in place for 1.4. This will enable also to this script to be able to build official tag and not only nightly build.

doc: fix language in CSS comments (by timeless)

setup: fix f51d1822d6fd refactoring, propagate env to runcmd

clone: simplify help text

Merge with main

i18n-zh: updated Chinese translation

i18n-da: synchronized with 6cb1808e5ae7

test-extension: Solaris grep don't know [[:digit:]]

merge with hg-stable

fix test-patchbomb on solaris

fix test-diffstat on solaris

doc: uppercase first letter in HTML man pages

Merge with crew

merge with crew

merge with stable

doc: styles for man page, which suit with the mercurial website designed loosely based on: http://mercurial.selenic.com/css/styles.css with some modifications by intention: * visited links are colored differently * no fixed size * works without typeface.js we keep most styles, which is from docutils, untouched. tested with: * MSIE 6.0 on Windows * Firefox 3.5 on Linux

rst2man: more robust uppercasing of section titles This handles section titles with child elements such as emphasis or inline literals.