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

templater: remove node import

patchbomb: undo backout and fix bugs in the earlier patch

added an entry about the prefix option inside the hgrc man page

tests for hg serve prefix option

hgweb: fixes to make hg serve prefix handling more robust

Merge with -stable

graphlog: skip filectx parents in other filelogs

Provide better context for custom Python encode/decode filters. While some can function with just some text and an optional command name, others may want a repository object, a ui object, and a file path. Use the enhanced information to good effect in win32text.dumbdecode's warning.

Register data filters in a localrepo instead of util - Changing data filters implementation is easier, adddatafilter() can rewrap filter after inspecting their prototype - Custom data filters really belongs to localrepo, mixing them with generic wrapper like "pipefilter" or "tempfilter" looks wrong. - util.filtertable should not be accessed from extensions

hgweb: forgot to centralize the req.write() calls in hgwebdir

hgweb: centralize req.write() calls

hgweb: explicitly check if requested command exists

hgweb: get rid of raw-related code in hgweb.filerevision()

keyword: detect restricted commands thru variable

webcommands: add missing hg import

Merge with crew-stable

convert: follow svn module parent moves

convert: prevent svn branches to leave the root module tree

convert: checkout svn root revisions Using changed files is enough if whole history is converted. Checkouts are required to restrict the conversion to user-supplied subtree.

convert: fix svn_source.latest()

convert: display source revision id with --verbose

Permitting the import command to accept a --user option. The prose section of the help text for the command already said that -u and -m are accepted, but -u was not listed in the table of options, and did not work. Useful when accepting patches from other people made by hg diff rather than hg export. For completeness, also accepting -d DATE. [CHANGES: rebased against d8878742a924, --no-commit option.]

Merge with crew

Simplify test-paths

merge with crew

Permit glob patterns to use nested curly braces.

Merge after backout

Backed out changeset dc6ed2736c81

keyword: improve use of dicts - actually use iteritems() when we iter over items of a dictionary - store commit hooks in dictionary (safe, as hook.hook() sorts before execution)

keyword: no expansion on qfold (bugfix)

Merge with crew

Ensure that absolutized paths from hgrc do not contain ../ segments.

glog shows at most one file: correct synopsis

Update usage message in test-glog.out AKA: Remind Thomas to run tests even after trivial changes.

Add back elipsis to [OPTION] that was stolen by 56e8a54bf71d

graphlog: add test for filelog graph

graphlog: add filelog revision grapher Graph a filelog's DAG, e.g.: hg glog mercurial/util.py

Test case for hg import --no-commit

Add --no-commit option to import command

win32: remove excessive flushing Our Windows file code was flushing buffers from the operating system to disk, rather than from the application to the operating system.

convert: hg.clonebranches must pull missing parents (issue941)

qrecord: add tests

qrecord: record complements commit, so qrecord should complement qnew Also there is an idea flying around to create something that will complement qrefresh: - maybe 'qammend'? or - 'qrefresh --interactive'? If we settle on '--interactive', then it would be conveniet to add this flag to 'commit' and 'qnew' as well.

Remove unneeded "import os.path"

send conservatively capitalized HTTP headers

demandimport: handling new relative imports Mercurial does not work on python2.6 because __import__ takes an additional argument called level. This patch merely calls the built-in __import__ when level is passed.

hgweb: move HTTP content types out of header templates This removes the ability for templates to add custom HTTP headers, which can easily be re-added if someone needs it. Thanks to asak for repeatedly reviewing this patch and helping to iron out the quirks.

hgweb: revert to showing file instead of offering for download

hgweb: be sure to send a valid content-type for raw files

hgweb: use ErrorResponse instead of custom response

better error reporting for hg serve errors in tests

hgweb: fix a stupid KeyError introduced in a0e20a5eba3c Thanks to Christian Ebert for finding this. Also added a test to prevent this from happening again.

hgweb: cleanup buglet introduced in 956afc025c0f

merge with crew-stable

CVS convert: Find correct parent for new branch (issue704) Previously the parent was determined by the last changeset where the branched file was changed even if the branch is based on an earlier revision. Fix written by mpm.

Test for converting a CVS branch

convert: mercurial sink must be local

Fix double import of 're'.

convert: Do not abort with TypeError if svn commit message is None (issue934)

Prefer i in d over d.has_key(i)