revert: revert clean files when only a change of flags is needed

Revert e82dd2dd6276 Those files are supposed to be HTML 4.01, not XML.

make static-http work with empty repos (issue965)

mq: qimport must read patches in binary mode

keyword: fix my string pasting thinko Spotted by Maxim Dounin

filemerge: wrap quotes around tool path

keyword: nokwcommands, restricted string variables at top level - prettier syntax conforming eg. to commands.norepo - possibly easier to hook from outside

keyword: split line continuation in 2 steps (style)

keyword: add empty_ok argument to kwrepo.commit

keyword: allow keyword expansion on clone If [keyword] filename patterns are specified in a global hgrc keywords will be expanded in clone. This behaviour is more consistent but also more dangerous. Specifying global, and thus more complicted, [keyword] patterns might slow things down as well. Mention this in help?

merge with crew-stable

cleanly abort on unknown archive type (issue966)

merge with crew-stable

hgweb: fix search skipping tip

filemerge: fix pattern matching

filemerge: fix path to working file when fixeol is enabled

mergetools: correct vim typo

filemerge: handle missing regappend

util_win32: add missing valname param to query_val function

filemerge: two fixes for kdiff3 example configuration

add merge sections to hgrc.5

filemerge: remove the hgmerge script This is now better handled using [merge-tools] and [merge-patterns] in hgrc.

filemerge: add an example set of global settings for common merge tools

filemerge: add config item for GUI tools <tool>.gui indicates whether a tool requires a GUI to run

merge: add registry look up bits to tool search

merge: add support for tool EOL fixups specified with merge-tools:<tool>.fixeol=True

merge: allow smarter tool configuration Add [merge-tool] hgrc section with: <tool>.executable = name or path (<tool>) <tool>.args = args with $local/base/other/output ($local $base $other) <tool>.priority = priority (default 0) <tool>.binary = handles binary (False) <tool>.symlink = handles symlinks (False) <tool>.checkconflict = check for conflict markers (False) <tool>.premerge = try internal simplemerge (True if not binary or symlink) Four built-in tools: internal:{merge,local,other,fail} Add [merge-patterns] section of the form: <pattern> = <tool> Priority of settings is: HGMERGE merge-patterns ui:merge merge-tools by priority hgmerge, if it can be found Changes: unsuccessful merges leave .orig files

filemerge: pull file-merging code into its own module

merge: move the bulk of simplemerge into core - keep existing simplemerge command in contrib - clean up test interface

merge with crew-stable

test-serve: wait before killing to always hide the "killed!" message. Without the sleeps slower systems never display never display "killed!" while faster systems sometimes or nearly always display it.

Mention 'hg update' to switch branches in help for branch and branches.

Clarify help for hg status and make it consistent.

profile: expand PID in output file name

convert: allow synthetic history to be spliced in. Useful for recreating history in the face of SVN lossage.

profiling: allow CGI and FastCGI to be profiled

update copyright notice in version output

hgweb: explicit response status

updating lsprof.py from remote repository

highlight: update according to latest hgweb_mod changes Also move encoding workaround completely into non binary condition.

Fixed typo: Gnerating -> Generating

added \r for progress counting in churn extension

update the branch cache at the end of addchangegroup This should avoid a bad performance problem when the branch cache is not up-to-date, and hgweb can't write an updated version because it lacks permissions.

qpop/qrefresh: update self.applied before calling strip This will be important for the next patch, which may end up using this variable during an addchangegroup caused by strip.

hg import: write the dirstate after every commit This allows the transaction system to backup the correct file, so that a future rollback can do the right thing. This should fix issue963.

localrepo._tag: add a seek before writing the new tag Some systems require a seek (or flush) between read and write operations on the same file object. This should fix issue838.

convert: use 'unknown' and '0 0' if commit author or date weren't specified Closes issue873.

httprepo: use separate handlers for HTTP and HTTPS This is needed to keep the code in keepalive.py from sharing the same connection between HTTP and HTTPS. 52ce0d6bc375 explains why we were using a single handler. This should fix issue892.

move __del__ from httprepository to basehttphandler This should prevent the next patch from reopening an issue fixed by 0d94e4a3ddb4.

mq: don't allow patches with some reserved names The current list of reserved names includes only mq control files. Also, reserve names starting with ".hg" (to avoid troubles with e.g. .hgignore and .hgtags), and with ".mq" (to allow future extensions). This should fix issue841.

mq: pop/refresh: avoid losing revisions not managed by mq We already disallow committing on top of an mq revision exactly to avoid losing this new revision during a qpop/qrefresh, so this can be seen as an additional safety check. If this is not enough to fix issue844, it should at least prevent it from happening.

mqrepo: don't abort if the status file has an unknown node

sshrepo: be more careful while reading data This should avoid some tracebacks when the server sends some garbage.

fix markup of templates/{,old/}header.tmpl

templates: move filters to their own module This eliminates just about all Mercurial dependencies in templater.py

templater: move email function to util