hgweb coal/paper: Restore IE compatibility hack

Backed out changeset a1f8ad3c1821

add test-fncache

merge with mpm

Allow per-file shadowing of static directory in templatepath

hgweb: handle subdirectories within static directory

coal: remove dead CSS code

url: detect scheme with a regexp instead of urlsplit() The latter says 'c' is a scheme in 'c:\foo\bar'

url: fix file:// URL handling

bookmarks: fix strip handling

fix zeroconf handling for hgwebdir (error found by pychecker)

fix missing import, spotted by pychecker

remove unused variables

Fix https availability checking thanks to Augie Fackler for noticing it.

rebase: avoid redundant merges (issue1301)

Make contrib/buildrpm work on Fedora 9. mercurial.spec had bitrotted. These changes makes it possible to build an rpm that is usable. Only minimal changes has been made, and there is plenty of room for improvement.

help: Refine a bit the help text of "hg update" Parts of the original text were submitted by Hubert Kauker (Hubert dot Kauker at travelbasys.de). This is a slightly revised version of Hubert's original text.

add new test-hybridencode.py

statichttprepo: cleanups, use url.py (proxy, password support) - unify httprangereader.py and statichttprepo.py:rangegreader() - build the opener from url.py, that allows use to puse username and password in the url, to follow the proxy settings from hgrc, etc.

'\' should be escaped twice, for the shell, and for tr

merge with crew

use our urlopener (proxy handling, etc) instead of urllib

factor out the url handling from httprepo Create url.py to handle all the url handling: - proxy handling - workaround various python bugs - handle username/password embedded in the url

httprepo: factor out proxy handling

test-http-proxy: hide logged URL port number, works with--jobs

patch: rewrite diffstat with util.filter() Simpler and works under Windows.

test-mq-qimport: fix URL generation under windows

test-patchbomb: write in binary mode, force non-interactive mode (win32)

test-http-proxy: print the log from the proxy

merge with dsop

bookmarks: do nothing if commit was not successful.

bookmarks: Add tests

bookmarks: Strip bookmark names of whitespace, just like tag names

bookmarks: Correctly reject newlines in bookmark names Without this fix, a single newline is a valid bookmark name since strip() removes it.

bookmarks: Require a bookmark name when a revision is specified

bookmarks: Improve documentation

bookmarks: Avoid unconditional forwarding of bookmarks for the null revision This patch fixes the following minor problem: % hg bookmark -r null test % hg bookmarks test -1:000000000000 [...] % hg commit % hg bookmarks * test 17:861ce7a241f9 That is: Bookmarks referring to the null revision are always forwarded to the current revision.

bookmarks: Rename --move to --rename To me, --move sounds like "make an existing bookmark refer to another revision", but --move currently means "rename an existing bookmark". This patch renames the switch to --rename to make it easier to understand.

bookmarks: Require new bookmark name when renaming

bookmarks: Only save undo.bookmarks if bookmarks exist Otherwise the command will abort when there is no .hg/bookmarks file.

bookmarks: Avoid long lines

bookmarks: Fix spelling and grammar

bookmarks: Remove trailing space

test-init: add test with format.usefncache=false

merge with crew

patch: fix patched files records in externalpatcher()

Merge with crew-stable

merge with crew