Automated merge with http://hg.west.spy.net/hg/hacks/hg

Option to log to only show changesets within a specified branch.

Strip filter name from command before passing to filter function. The new registration of in-process data filters (introduced in f8ad3b76e923 & 11af38a592ae) failed to correctly strip the filter name from its arguments before passing the "command" to the filter function. Thus a registration such as [decode] *.gz = compress: -9 would result in the associated filter function being called with the argument 'compress: -9' rather than just '-9' as expected.

make the journal/undo files from transactions inherit the mode from .hg/store

add test-inherit-mode

hghave: detect unix-style permissions By "unix-style" I mean: - user/group/other permissions - umask determines original permissions

Make files in .hg inherit the permissions from .hg/store

test-keyword: make it run under Windows - don't cat symlink, content differs - rewrite OS specific messages - generate symlink with a bundle

keyword: fix symlink detection under Windows

keyword: fix mq repository detection under Windows

Do not abort rollback if undo.branch isn't available, but warn.

Remove trailing ! from two error messages as this was confusing.

Print less scary warning when invalidating the branch cache.

convert: support binary files, link to files (viceversa) in gnu arch

convert: Don't decode unicode strings This does not work with python2.3 and is probably not useful anyway with 2.4.

convert: Compatibility fixes for python2.3 set -> util.set sort(reverse=True) -> sort(); reverse()

keyword: monkeypatch dispatch._parse to avoid redundant run Inspired by Thomas Arendsen Hein.

keyword: safeguards against erroneous behaviour or aborts prevent issues due to global [keyword] filename patterns: - add email to nokwcommands - protect everything under .hg from expansion (tested with qcommit) - exclude everything starting with .hg* just in case prevent abort when pulling from bundlerepo: - do not set up kwrepo for bundlerepo expansion inside a bundle is nonsense bundlerepo issue spotted and test case provided by pmezard.

keyword: fix pychecker warning about shadowed variable Also no underscore prefix for restricted switch inside reposetup.

convert: improve gnu arch source performance and other fixes - Improve performance by reading 'replay' output instead of calling 'delta' command after 'replay'. This increases speed significantly. - Some times 'replay' command might fail with conflicts (don't know why), a new get from that revision just fixes it. So, if something fails, get a fresh copy from that revision and try from there.

Merge with crew-stable

fix syntax in coverage.py, fixing run-tests.py -C d0576d065993 accidentally broke things.

fix to let test-hgwebdir pass fixes a regression introduced in changeset f25070ecf334

merge with crew-stable

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

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