convert: try to be smarter about CVS branching Better handles this case: The output from cvsps -A -u --cvs-direct -q: --------------------- PatchSet 1 Date: 2008/02/08 20:33:28 Author: fk Branch: HEAD Tag: (none) Log: initial Members: file_one:INITIAL->1.1 --------------------- PatchSet 2 Date: 2008/02/08 20:33:32 Author: fk Branch: branch_name Ancestor branch: HEAD Tag: (none) Log: new file on branch Members: file_two:1.1->1.1.2.1

filemerge: more backwards compatible behavior for ui.merge if ui.merge matches a tool in [merge-tools], it is used as the default tool selection but may be rejected by binary or gui or other checks. If ui.merge does not match a merge tool, it is used unconditionally.

filemerge: add 'checkchanged' merge tool property

ignore: split up huge patterns Some versions of Python silently mishandle large regexes, so split them up at a conservative 20k.

Use chmod 0770 and g+s instead of 02770 which does't work on Solaris 8.

keyword: no expansion in web diffs Expansion in hgweb view of changesets and diffs is not needed and only distracting. Expansion stays enable in file and archive requests where it makes sense.

keyword: make restrict entirely a kwtemplater attribute

keyword: declare globals in a more compact way

keyword: avoid os import by using util.splitpath

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