Propagating changes back to working dirs when changing files in external

test-convert-baz: set username with baz, not tla

Define tla username locally in baz and tla tests Suggested by Alexis S. L. Carvalho.

convert: fix --datesort ordering Two branches a and b starting at root, with commits interleaved like: root a0 a1 b0 a2 a3 b1 were converted in the following order: root a0 b0 a1 b1 a2 a3 Replace depth based toposort with a more classic traversal method.

[RFC] convert: fix --datesort The problem is that previously commit.date was used for sorting, but it's a string like "1 Jan xxx 2007", so it it wrong to use it for sorting. Another problem is that why we are using depth for sorting -- I have no clear answer -- it seems to be plain wrong. This patch is just an RFC.

push: exit(1) if "push creates new remote branches!"

hgweb: Fix stray quote in logo img tag

hgweb: add new logos

Add the new "droplet" logo

cat --decode: Drop short option, use opts.get() instead of opts[] - hg archive --no-decode has no short option, too, and maybe both could use -d in the future to select revisions by date. - opts.get makes python scripts calling cat() happy, because they don't have to pass the new option.

Option --decode for hg cat to apply decode filters. (Does not trigger expansion of keyword arguments when using keyword extension, though that might be desirable as well.)

keyword: monkeypatch patch.diff for non-interactive diffs Avoid clobbering diffs with expanded keywords eg. for notify extension.

merge with main

merge with crew-stable

clone: make things work when source is a repo object

clone: expand the path before saving it in .hg/hgrc This should fix issue976

better handle errors with date parsing (issue983) Windows cannot always handle a 1970-01-01 parameter to time.mktime().

better handle errors with date parsing (issue983) Windows cannot always handle a 1970-01-01 parameter to time.mktime().

hgweb: disable cgitb by default in hgwebdir.fcgi too

Document and fix tla/baz conversion tests

convert: detect baz before tla The former seems to handle repositories built by the latter, the opposite is not true.

keyword: add glog to nokwcommands

keyword: enable all monkey patches using _kwtemplater at reposetup - no need for try-except block - underscore prefix for private methods - add doc strings

hgweb: disable cgitb by default

convert: added GNU Arch (tla) tests and related fixes

convert: added gnu arch (baz) tests

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.