Merge with crew

email: add References field in the header This hopefully helps clients get the threading right.

coal/paper: link to shortlog instead of log from error pages

coal/paper: move actual templates from coal to paper

coal/paper: show branch name in changeset view

coal/paper: display tags and branch in filelog page

coal/paper/monoblue: show branch names in hgweb graph

coal/paper: display branch names in log

hgweb: support broken IIS 5 behavior with .cgi in PATH_INFO

manifest: fix _search() corner-case It failed when searching the empty string in the null revision.

Improved error message for log --follow Mads Kiilerich notes that the existing message was unclear when a nonexistent file was supplied.

Improve the monoblue theme for hgwebdir

import: add similarity option (issue295)

mq: recover more gracefully from interrupted qrefresh (issue1216)

mq: use atomictempfiles during patch refresh

mq: create patch header class to abstract header manipulation

mq: gracefully abort qpush/qgoto to guarded patch (issue1186)

More verbose logging when filemerge searches for merge-tool Previously it was very hard to find out what was going on when the expected merge tool wasn't used. This patch tries to improve that. hg merge -v now shows which tools were searched for but not found.

templater: return data in increasing chunk sizes Currently hgweb is not streaming its output -- it accumulates the entire response before sending it. This patch restores streaming behaviour. To avoid having to synchronously write many tiny fragments, this patch also adds buffering to the template generator. Local testing of a fetch of a 100,000 line file with wget produces a slight slowdown overall (up from 6.5 seconds to 7.2 seconds), but instead of waiting 6 seconds for headers to arrive, output begins immediately.

tests: fix tests broken by 03b60f2f90bf

hgweb (coal/paper): make file, diff and annotate easier to render This patch removes tables altogether for file and diff, and removes one column from annotate, making firefox's incremental renderer much faster for large files.

inotify: fix status . in repo.root

patch: isolate patchfile filesystem calls into methods This is a first step toward an svn-like patch driver and makes patchfile monkeypatching much easier. The latter is currently required to support in-memory patching until the code is refactored.

patch: pass an opener to patchfile

util_win32: implement posixfile_nt.readlines()

patch: remove useless unlink() call

dispatch: generalize signature checking for extension command wrapping

update help on git diffs

zsh: make resolve with no options only complete unresolved files

mergetools: add pointer to the usual filemerge path

zsh: support for resolve

graphlog: fix regression with filelogs introduced by 7bc62ebe7693

Merge with crew-stable

convert: be even more tolerant when detecting svn tags Former code failed when tracking child directories we assumed were renamed with their parents but were really created in the tags directory. This happens in jQuery repository with /tags/ui/1.5b4/release@5455.

test-pull-branch: make it executable

graphlog: fix python2.3 incompatibility (used genexp, sorted())

keyword: move common code out of commit condition

lookup: fast-paths for int and 'tip'

doc: handle shortened command synopses

keyword: be more efficient about ctx usage

graphlog: kill whitespace from earlier refactoring

extensions: copy __module__ for wrapped commands

pull: update to branch tip if there is only one head on the current branch On pull, if the current named branch has only one head, update to it.

graphlog: use built-in log output buffering

graphlog: refactor common grapher code Extracts the column and edge determination code into a separate function usable on generic DAGs with at most 2 parents per node. grapher() is very similar to graphmod.graph(). I shall look into merging them when I try visualizing patch branches in hgweb. Started using contexts and renamed a bunch of variables (fewer underscores).

cmdutil: use change contexts for cset-printer and cset-templater

context: use descriptors to speed up lazy attributes

context: special-case changectx setup for integer changeid

Add contrib/perf.py for performance testing

lookup: speed up partial lookup

help: remove redundant 'hg <command>' from command synopses

revlog: speed up parents()

revlog: remove delta function

linkrev: take a revision number rather than a hash

patchbomb: add option to send intro email for a single patch (issue1120)

patchbomb: fix patch name generation in patch series

patchbomb: add tests for diffstat, inline, and attach options

patchbomb: make test markers more syntax highlighter friendly

graphlog: add assertion for allowed n_column_diff range

graphlog: drop redundant comment (see docstring)

patchbomb: extract a bunch of nested functions - clarifies dependencies on variables - extracts potentially useful utility functions - no need for separate confirm() function - error message style conformance - PEP 8 conformance

patchbomb: make `hg email` reusable for other patch sources Adds two internal options, patches and patchnames, which allow other extensions to email a given set of patches. The pbranch extension needs this to send its patches which are diffs between topic branches.

patchbomb: make options to email command reusable Makes the option set that controls the actual emailing of the patches available as patchbomb.emailopts.

Backed out changeset c5dbe86b0fee (issue1375)