convert: do not skip some lines in gnu arch summaries

Merge with crew

Merge with crew

mq.py: add -U option to hg qdiff command

commands.py, patch.py: add -U option to hg diff command

Update help output of test-convert for GNU arch entry.

Merge with crew-stable

convert: add full description for gnu arch revisions

merge with main

convert: added GNU Arch source converter

qinit -c: add ^\.hg and ^\.mq to .hgignore

dirstate.status: avoid putting ignored files in the unknown list If list_ignored was false, we would blindly add files not in the dirstate to the unknown list. This should finish fixing issue886.

dirstate: don't walk ignored directories With a pattern like '^directory$' in .hgignore, a "hg status directory" would still walk "directory" and all its subdirs. This is the first half of a fix for issue886.

revert: don't assume ignored files will be returned in the unknown list That's just an artifact of the current implementation, and I'll change that soon. Bonus points: - we don't care about the unknown list at all - we don't print an extra message if we try to revert a removed file that is not present in the target revision

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